niclas 2004/01/04 04:06:29
Modified: merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultFactory.java
Log:
Changes to support generic Parameters for the kernel, via kernel.xml. One such
parameter 'DeploymentTimeout' exposed in the ContainmentModel for the new deployment
handling.
Revision Changes Path
1.8 +9 -1
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultFactory.java 14 Dec 2003 23:09:03 -0000 1.7
+++ DefaultFactory.java 4 Jan 2004 12:06:29 -0000 1.8
@@ -101,6 +101,8 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.avalon.merlin.Kernel;
import org.apache.avalon.merlin.KernelException;
import org.apache.avalon.merlin.KernelRuntimeException;
@@ -371,6 +373,11 @@
getLogger().debug(
"repository established: " + repository );
+ // create the <parameters>
+ Configuration paramsConfig = kernelConfig.getChild( "parameters" );
+ Parameters params = Parameters.fromConfiguration(
+ paramsConfig, "parameter" );
+
//
// create the system context
//
@@ -385,7 +392,8 @@
criteria.getTempDirectory(),
repository,
loggingDescriptor.getName(),
- criteria.isDebugEnabled() );
+ criteria.isDebugEnabled(),
+ params );
//
// create the system model and block
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
