leif 02/02/08 04:13:57
Modified:
examples/jdbcdatasource/src/java/org/apache/avalon/examples/jdbcdatasource
Main.java
Log:
Simplified the code for loading configurations thanks to Mark Woon.
Revision Changes Path
1.2 +4 -22
jakarta-avalon-excalibur/examples/jdbcdatasource/src/java/org/apache/avalon/examples/jdbcdatasource/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/examples/jdbcdatasource/src/java/org/apache/avalon/examples/jdbcdatasource/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 7 Feb 2002 07:15:42 -0000 1.1
+++ Main.java 8 Feb 2002 12:13:57 -0000 1.2
@@ -33,7 +33,7 @@
* Note, this code ignores exceptions to keep the code simple.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/02/07 07:15:42 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/02/08 12:13:57 $
* @since 4.1
*/
public class Main
@@ -47,24 +47,6 @@
* Methods
*-------------------------------------------------------------*/
/**
- * Loads a Configuration object given a config filename.
- */
- private static Configuration loadConfiguration(
DefaultConfigurationBuilder builder,
- String file )
- throws Exception
- {
- FileInputStream is = new FileInputStream( file );
- try
- {
- return builder.build( is );
- }
- finally
- {
- is.close();
- }
- }
-
- /**
* Creates and initializes the component manager using config files.
*/
private static ExcaliburComponentManager createComponentManager()
@@ -79,9 +61,9 @@
DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
// Load in the configuration files
- Configuration logKitConfig = loadConfiguration( builder,
"../conf/logkit.xml" );
- Configuration rolesConfig = loadConfiguration( builder,
"../conf/roles.xml" );
- Configuration componentsConfig = loadConfiguration( builder,
"../conf/components.xml" );
+ Configuration logKitConfig = builder.build( "../conf/logkit.xml"
);
+ Configuration rolesConfig = builder.build( "../conf/roles.xml"
);
+ Configuration componentsConfig = builder.build(
"../conf/components.xml" );
// Setup the LogKitManager
DefaultLogKitManager logManager = new DefaultLogKitManager();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
