[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet ConfigInfo.java,1.1,1.2 MultiPartR
Brought to you by:
bigman921
Menu
▾
▴
[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet ConfigInfo.java,1.1,1.2 MultiPartRequest.java,1.2,1.3 IdrsConfigHandler.java,1.1,1.2 IdrsController.java,1.1,1.2 Init.java,1.11,1.12
|
From: Marc B. <big...@us...> - 2003-03-17 14:05:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv25653/dev/src/net/sourceforge/idrs/core/servlet
Modified Files:
ConfigInfo.java MultiPartRequest.java IdrsConfigHandler.java
IdrsController.java Init.java
Log Message:
Added Initial EJB Support
Index: ConfigInfo.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/ConfigInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConfigInfo.java 6 Feb 2003 20:13:43 -0000 1.1
--- ConfigInfo.java 17 Mar 2003 14:05:00 -0000 1.2
***************
*** 48,58 ****
String errorLog;
String reportPoolClass;
!
int resetPort;
String resetAllowedHost;
String securityImp;
-
-
/**
* Constructor for ConfigInfo.
--- 48,56 ----
String errorLog;
String reportPoolClass;
!
int resetPort;
String resetAllowedHost;
String securityImp;
/**
* Constructor for ConfigInfo.
***************
*** 309,319 ****
this.digestType = svg.getInitParameter("digestType");
this.scriptPoolClass = svg.getInitParameter("scriptPool");
! this.scriptPoolMin = Integer.parseInt(svg.getInitParameter("minReports"));
! this.scriptPoolMax = Integer.parseInt(svg.getInitParameter("maxReports"));
! this.scriptDaysOpen = Integer.parseInt(svg.getInitParameter("daysReportsOpen"));
this.errorLog = svg.getInitParameter("errorLog");
this.scriptClass = svg.getInitParameter("scriptClass");
! // System.out.println("getting vars");
this.vars = new HashMap();
int numVars = Integer.parseInt(svg.getInitParameter("numVars"));
--- 307,320 ----
this.digestType = svg.getInitParameter("digestType");
this.scriptPoolClass = svg.getInitParameter("scriptPool");
! this.scriptPoolMin =
! Integer.parseInt(svg.getInitParameter("minReports"));
! this.scriptPoolMax =
! Integer.parseInt(svg.getInitParameter("maxReports"));
! this.scriptDaysOpen =
! Integer.parseInt(svg.getInitParameter("daysReportsOpen"));
this.errorLog = svg.getInitParameter("errorLog");
this.scriptClass = svg.getInitParameter("scriptClass");
! // System.out.println("getting vars");
this.vars = new HashMap();
int numVars = Integer.parseInt(svg.getInitParameter("numVars"));
***************
*** 340,346 ****
this.dbs = new HashMap();
!
! // System.out.println("num dbs : " + numDBs);
!
for (int i = 1; i <= numDBs; i++) {
cur = new JDBCInfo();
--- 341,347 ----
this.dbs = new HashMap();
!
! // System.out.println("num dbs : " + numDBs);
!
for (int i = 1; i <= numDBs; i++) {
cur = new JDBCInfo();
***************
*** 373,386 ****
cur.setLogPath(
svg.getInitParameter("logPath" + Integer.toString(i)));
!
! // System.out.println("in load config : " + cur.getPoolname());
this.dbs.put(cur.getPoolname(), cur);
}
!
this.resetPort = Integer.parseInt(svg.getInitParameter("resetPort"));
this.resetAllowedHost = svg.getInitParameter("resetAllowedHost");
!
}
--- 374,387 ----
cur.setLogPath(
svg.getInitParameter("logPath" + Integer.toString(i)));
!
! // System.out.println("in load config : " + cur.getPoolname());
this.dbs.put(cur.getPoolname(), cur);
}
!
this.resetPort = Integer.parseInt(svg.getInitParameter("resetPort"));
this.resetAllowedHost = svg.getInitParameter("resetAllowedHost");
!
}
***************
*** 432,446 ****
this.resetPort = resetPort;
}
!
! public void loadFromConfigXml(ServletConfig svg) throws Exception {
! String loadFrom = svg.getServletContext().getRealPath("WEB-INF") + "/" + svg.getInitParameter("configFile");
! InputSource in = new InputSource(new FileReader(new File(loadFrom)));
! IdrsConfigHandler handle = new IdrsConfigHandler(this);
! XMLReader parser = XMLReaderFactory.createXMLReader(svg.getInitParameter("parseClass"));
! parser.setContentHandler(handle);
! parser.parse(in);
!
! this.dbs = handle.getDBs();
! this.vars = handle.getVars();
}
--- 433,465 ----
this.resetPort = resetPort;
}
!
! public void loadFromConfigXml(ServletConfig svg) throws Exception {
! String loadFrom =
! svg.getServletContext().getRealPath("WEB-INF")
! + "/"
! + svg.getInitParameter("configFile");
! InputSource in = new InputSource(new FileReader(new File(loadFrom)));
! IdrsConfigHandler handle = new IdrsConfigHandler(this);
! XMLReader parser =
! XMLReaderFactory.createXMLReader(
! svg.getInitParameter("parseClass"));
! parser.setContentHandler(handle);
! parser.parse(in);
!
! this.dbs = handle.getDBs();
! this.vars = handle.getVars();
! }
!
! public void loadFromConfigXmlSrc(String src, String parseClass) throws Exception {
! InputSource in = new InputSource(new StringReader(src));
! IdrsConfigHandler handle = new IdrsConfigHandler(this);
! XMLReader parser =
! XMLReaderFactory.createXMLReader(
! parseClass);
! parser.setContentHandler(handle);
! parser.parse(in);
!
! this.dbs = handle.getDBs();
! this.vars = handle.getVars();
}
Index: MultiPartRequest.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/MultiPartRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiPartRequest.java 17 Feb 2003 02:48:48 -0000 1.2
--- MultiPartRequest.java 17 Mar 2003 14:05:00 -0000 1.3
***************
*** 333,337 ****
! if (val instanceof String[]) {
sval = ((String[])val)[0];
}
--- 333,340 ----
! if (val == null) {
! return null;
! }
! else if (val instanceof String[]) {
sval = ((String[])val)[0];
}
Index: IdrsConfigHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IdrsConfigHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IdrsConfigHandler.java 6 Feb 2003 20:13:43 -0000 1.1
--- IdrsConfigHandler.java 17 Mar 2003 14:05:00 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
public static final String authDB = "authDB";
public static final String dbPoolClass = "dbPoolClass";
+ public static final String reportPoolClass = "reportPoolClass";
public static final String errorLog = "errorLog";
public static final String resetPort = "resetPort";
***************
*** 114,118 ****
} else if (localName.equalsIgnoreCase(this.dbPoolClass)) {
cfg.setDbPoolClass(val);
! } else if (localName.equalsIgnoreCase(this.digestType)) {
cfg.setDigestType(val);
} else if (localName.equalsIgnoreCase(this.docsDB)) {
--- 115,124 ----
} else if (localName.equalsIgnoreCase(this.dbPoolClass)) {
cfg.setDbPoolClass(val);
! }
! else if (localName.equalsIgnoreCase(this.reportPoolClass)) {
! cfg.setReportPoolClass(val) ;
! }
!
! else if (localName.equalsIgnoreCase(this.digestType)) {
cfg.setDigestType(val);
} else if (localName.equalsIgnoreCase(this.docsDB)) {
Index: IdrsController.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IdrsController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IdrsController.java 6 Feb 2003 20:13:44 -0000 1.1
--- IdrsController.java 17 Mar 2003 14:05:00 -0000 1.2
***************
*** 30,52 ****
*/
public class IdrsController {
private PoolInfo poolInfo;
! private String IDRSName;
! private String dbName, dbDriver, dbUser, dbPass, contextPath, logPath;
!
! private boolean toLower;
!
!
!
[...1194 lines suppressed...]
class PoolInfo implements Cloneable {
! IDRSScriptLanguage idrss;
! IDRSRep rep;
! IDRSSecurity secure;
! HashMap conns;
! String docName;
! Connection authDB;
!
}
--- 672,681 ----
class PoolInfo implements Cloneable {
! IDRSScriptLanguage idrss;
! IDRSRep rep;
! IDRSSecurity secure;
! HashMap conns;
! String docName;
! Connection authDB;
!
}
Index: Init.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/Init.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Init.java 6 Feb 2003 20:13:44 -0000 1.11
--- Init.java 17 Mar 2003 14:05:00 -0000 1.12
***************
*** 183,186 ****
--- 183,187 ----
*/
public DbPool getDBPool(String name) {
+ //System.out.println("getDBPool " + name);
return (DbPool) dbs.get(name);
}
***************
*** 208,211 ****
--- 209,213 ----
*/
protected HashMap getConnsInfo(String conns) throws Exception {
+ //System.out.println("in getConnsInfo " + conns);
StringTokenizer tok = new StringTokenizer(conns, ",", false);
HashMap tmp = new HashMap();
***************
*** 213,216 ****
--- 215,219 ----
while (tok.hasMoreTokens()) {
key = tok.nextToken();
+ //System.out.println("key : " + key);
tmp.put(key, ((DbPool) dbs.get(key)).getInfo());
}
***************
*** 478,481 ****
--- 481,485 ----
public void retrieveDocDBs() throws Exception {
log.println("Retrieving Doc Dbs");
+ Connection con;
String dbPool;
int i;
***************
*** 498,502 ****
while (it.hasNext()) {
tmpAlias = (String) it.next();
! // System.out.println("DB Loaded : " + tmpAlias);
cur = (JDBCInfo) cfg.getDbs().get(tmpAlias);
--- 502,506 ----
while (it.hasNext()) {
tmpAlias = (String) it.next();
! //System.out.println("DB Loaded : " + tmpAlias);
cur = (JDBCInfo) cfg.getDbs().get(tmpAlias);
***************
*** 527,532 ****
2000L,
tmpLog);
! // System.out.println("Adding " + tmpName);
dbs.put(tmpAlias, tmpDB);
} catch (Exception e) {
e.printStackTrace(System.out);
--- 531,540 ----
2000L,
tmpLog);
! //System.out.println("Adding " + tmpName);
! //System.out.println("Adding " + tmpAlias);
dbs.put(tmpAlias, tmpDB);
+ //con = tmpDB.getConnection();
+ //System.out.println(tmpAlias + " " + con);
+ //tmpDB.returnConnection(con);
} catch (Exception e) {
e.printStackTrace(System.out);
|
