openamf/src/java/org/openamf DefaultGateway.java,1.41,1.42

Update of /cvsroot/openamf/openamf/src/java/org/openamf
In directory sc8-pr-cvs1:/tmp/cvs-serv11990/src/java/org/openamf

Modified Files:
	DefaultGateway.java 
Log Message:
added support for multiple config files

Index: DefaultGateway.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/DefaultGateway.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** DefaultGateway.java	15 Aug 2003 00:20:45 -0000	1.41
--- DefaultGateway.java	15 Aug 2003 15:56:22 -0000	1.42
***************
*** 24,27 ****
--- 24,28 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.apache.commons.lang.StringUtils;
  import org.openamf.config.OpenAMFConfig;
  import org.openamf.config.ConfigDigester;
***************
*** 277,291 ****
  		OpenAMFConfig config = OpenAMFConfig.getInstance();
  
- 		String configLocation =
- 			getServletConfig().getInitParameter(OPENAMF_CONFIG);
- 		InputStream inputStream =
- 			getServletContext().getResourceAsStream(configLocation);
- 
  		ConfigDigester configDigester = new ConfigDigester();
- 		configDigester.push(config);
  		configDigester.setUseContextClassLoader(true);
  
  		try {
! 			configDigester.parse(inputStream);
  		} catch (Exception e) {
  			log.error(e);
--- 278,297 ----
  		OpenAMFConfig config = OpenAMFConfig.getInstance();
  
  		ConfigDigester configDigester = new ConfigDigester();
  		configDigester.setUseContextClassLoader(true);
  
+ 		String configParam =
+ 			getServletConfig().getInitParameter(OPENAMF_CONFIG);
+ 		String[] configLocations = StringUtils.split(configParam, ",");
+ 
  		try {
! 			for (int i = 0; i < configLocations.length; i++) {
! 				String configLocation = configLocations[i];
! 				InputStream inputStream =
! 					getServletContext().getResourceAsStream(configLocation);		
! 				configDigester.clear();
! 				configDigester.push(config);
! 				configDigester.parse(inputStream);				
! 			}
  		} catch (Exception e) {
  			log.error(e);




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01