[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet ConfigInfo.java,1.2,1.3 IdrsController.java,1.4,1.5

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/core/servlet

Modified Files:
	ConfigInfo.java IdrsController.java 
Log Message:
First pass at integration with Axis

Index: ConfigInfo.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/ConfigInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigInfo.java	17 Mar 2003 14:05:00 -0000	1.2
--- ConfigInfo.java	22 Aug 2004 05:17:39 -0000	1.3
***************
*** 463,466 ****
--- 463,479 ----
  		this.vars = handle.getVars();
  	}
+ 	
+ 	public void loadFromConfigPath(String loadFrom,String parseClass) throws Exception {
+ 		
+ 		InputSource in = new InputSource(new FileReader(new File(loadFrom)));
+ 		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: IdrsController.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IdrsController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IdrsController.java	19 Apr 2003 03:13:49 -0000	1.4
--- IdrsController.java	22 Aug 2004 05:17:39 -0000	1.5
***************
*** 528,532 ****
  				secure.getUserName()),
  			init.digestPassword() ? init.getDigestType() : "NONE",
! 			servletContext);
  
  		//send content to the client
--- 528,534 ----
  				secure.getUserName()),
  			init.digestPassword() ? init.getDigestType() : "NONE",
! 			servletContext,
! 			null,
! 			null);
  
  		//send content to the client