mcconnell 2004/01/09 04:00:36
Modified:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultContainmentModel.java
merlin/platform/src/config debug.xml kernel.xml
Log:
Change the system property from "deployment-timeout" to
urn:avalon:composition.deployment.timeout", increase the default timeout value, and
add example kernel confiuration to the bundles kernel definitions.
Revision Changes Path
1.15 +7 -3
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultContainmentModel.java 4 Jan 2004 12:05:21 -0000 1.14
+++ DefaultContainmentModel.java 9 Jan 2004 12:00:36 -0000 1.15
@@ -153,6 +153,8 @@
}
}
+ private static final long DEFAULT_DEPLOYMENT_TIMEOUT = 10000;
+
//==============================================================
// state
//==============================================================
@@ -227,9 +229,11 @@
{
SystemContext sc = m_context.getSystemContext();
Parameters params = sc.getSystemParameters();
- return params.getParameterAsLong( "deployment-timeout", 1000 );
+ return params.getParameterAsLong(
+ "urn:avalon:composition.deployment.timeout",
+ DEFAULT_DEPLOYMENT_TIMEOUT );
}
-
+
/**
* Return the set of services produced by the model.
* @return the services
1.2 +5 -0 avalon/merlin/platform/src/config/debug.xml
Index: debug.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/debug.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debug.xml 24 Sep 2003 09:33:38 -0000 1.1
+++ debug.xml 9 Jan 2004 12:00:36 -0000 1.2
@@ -5,6 +5,11 @@
<!-- logging system parameters -->
<logging priority="DEBUG" name="kernel"/>
+ <parameters>
+ <parameter name="urn:avalon:composition.deployment.timeout"
+ value="10000" />
+ </parameters>
+
<repository>
<hosts>
<host path="http://dpml.net/"/>
1.2 +5 -0 avalon/merlin/platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/kernel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel.xml 24 Sep 2003 09:33:38 -0000 1.1
+++ kernel.xml 9 Jan 2004 12:00:36 -0000 1.2
@@ -6,6 +6,11 @@
<category name="/logger" priority="WARN"/>
</logging>
+ <parameters>
+ <parameter name="urn:avalon:composition.deployment.timeout"
+ value="10000" />
+ </parameters>
+
<repository>
<hosts>
<host path="http://dpml.net/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
