You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/15 13:23:05 UTC
cvs commit: avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet package.html
mcconnell 2004/01/15 04:23:05
Modified: merlin STRUCTURE.TXT project.xml
merlin/composition/api/src/java/org/apache/avalon/composition/model
DeploymentModel.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultComponentModel.java
DefaultDeploymentModel.java
merlin/facilities/http/api/src/java/org/apache/avalon/http
package.html
merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl
package.html
merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener
package.html
Added: merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet
package.html
Log:
Improving timeout value control by enabling type level overrides, updatating of several package docs.
Revision Changes Path
1.3 +25 -12 avalon/merlin/STRUCTURE.TXT
Index: STRUCTURE.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/STRUCTURE.TXT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- STRUCTURE.TXT 17 Oct 2003 03:30:56 -0000 1.2
+++ STRUCTURE.TXT 15 Jan 2004 12:23:04 -0000 1.3
@@ -46,10 +46,10 @@
----------------
The Merlin project requires the Maven project management tool.
-The merlin:install goal builds a Merlin installation directory under the
+The avalon:install goal builds a Merlin installation directory under the
default /target/merlin.
- $ maven merlin:install
+ $ maven avalon:install
Following the creation of an installation you need to declare the environment
variable MERLIN_HOME with a value corresponding to the directory in which you
@@ -64,20 +64,33 @@
Support for the installation and execution of Merlin as an NT process is
now included in the package (refer bin directory) - special thanks to Leif
for helping to set this up. When updating an existing installation, the
-maven goal merlin:update invokes the classic merlin:install and updates your local
-merlin repository. This is often convinient if you are frequently updating
-the merlin core.
+maven goal avalon:update invokes the classic avalon:install and updates your
+local merlin repository. This is often convinient if you are frequently
+updating the merlin core.
For additional information please check the documentation and also use the
-Avalon Users list (subscription details in the doc). The merlin:site goal
+Avalon Users list (subscription details in the doc). The avalon:site goal
aggregates the sources from across the main Merlin sub-projects to build a
consolidated project presentation. The goal should be invoked from the
-root merlin directory.
+root merlin cvs directory.
- $ maven merlin:site
+ $ maven avalon:site
-Finally, please keep in mind that while Merlin is nearing completion and
-readiness for a first release, it should be considered as beta software as
-APIs are changing, and documentation is evolving.
+Finally, a note concerning product status.
-SJM 1 September 2003
+The client contract concerns the interaction between a component
+and the Merlin containment system. This deals with the description
+of deployment directives (such as <container>, <component>), standard
+names for context entries, standard attribute names, etc. At this level
+the Merlin platform has been very stable and functioning reliably in
+production applications. And changes in this area will be dealt with
+a very high sensitivity to end-user impact and best-effort will be
+applied to ensure backward compatibility.
+
+Product APIs and implementations are evolving and no gaurantees are
+provided concerning backward compatability at this time. Refactoring and
+class renaming is ongoing under the 3.3 with the objective of establishing
+a stable 3.4 release. This aspect should only be of concern to developers
+engaged in the embedding of Merlin within another application.
+
+SJM 15 January 2004
1.24 +6 -2 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 15 Jan 2004 10:27:31 -0000 1.23
+++ project.xml 15 Jan 2004 12:23:04 -0000 1.24
@@ -215,8 +215,8 @@
<packageGroups>
<packageGroup>
- <title>Merlin Service Management Platform</title>
- <packages>org.apache.avalon.merlin,org.apache.avalon.merlin.*</packages>
+ <title>Kernel</title>
+ <packages>org.apache.avalon.merlin,org.apache.avalon.merlin.impl,org.apache.avalon.merlin.event</packages>
</packageGroup>
<packageGroup>
<title>Activation</title>
@@ -233,6 +233,10 @@
<packageGroup>
<title>Facilities</title>
<packages>org.apache.avalon.http,org.apache.avalon.http.*</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Embedded</title>
+ <packages>org.apache.avalon.merlin.cli,org.apache.avalon.merlin.unit,org.apache.avalon.merlin.tools,org.apache.avalon.merlin.servlet</packages>
</packageGroup>
</packageGroups>
1.9 +3 -1 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
Index: DeploymentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeploymentModel.java 13 Jan 2004 11:41:24 -0000 1.8
+++ DeploymentModel.java 15 Jan 2004 12:23:04 -0000 1.9
@@ -68,6 +68,8 @@
{
String SEPARATOR = "/";
+ String DEPLOYMENT_TIMEOUT_KEY = "urn:composition:deployment.timeout";
+
/**
* Return the name of the model.
* @return the name
1.3 +36 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java
Index: DefaultComponentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultComponentModel.java 13 Jan 2004 11:41:26 -0000 1.2
+++ DefaultComponentModel.java 15 Jan 2004 12:23:04 -0000 1.3
@@ -309,7 +309,7 @@
*/
public void assemble() throws AssemblyException
{
- return;
+ // nothing to do
}
/**
@@ -317,6 +317,7 @@
*/
public void disassemble()
{
+ // nothing to do
}
/**
@@ -839,6 +840,39 @@
}
return (Class[]) list.toArray( new Class[0] );
+ }
+
+ /**
+ * Return the deployment timeout value for the component.
+ *
+ * @return the default deployment timeout value
+ */
+ public long getDeploymentTimeout()
+ {
+ String value =
+ m_context.getType().getInfo().getAttribute(
+ DEPLOYMENT_TIMEOUT_KEY, null );
+ if( null != value )
+ {
+ try
+ {
+ return Long.paseLong( value );
+ }
+ catch( NumberFormatException nfe )
+ {
+ final String error =
+ "Invalid timout parameter ["
+ + value
+ + "] in component type ["
+ + m_context.getType()
+ + "].";
+ throw new IllegalStateException( error, nfe );
+ }
+ }
+ else
+ {
+ return super.getDeploymentTimeout();
+ }
}
//==============================================================
1.11 +11 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
Index: DefaultDeploymentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultDeploymentModel.java 13 Jan 2004 11:41:26 -0000 1.10
+++ DefaultDeploymentModel.java 15 Jan 2004 12:23:04 -0000 1.11
@@ -215,15 +215,21 @@
}
/**
- * Return the maximum allowable duration for the deployment
- * of the component represented by this model.
+ * Return the default deployment timeout value declared in the
+ * kernel configuration. The implementation looks for a value
+ * assigned under the property key "urn:composition:deployment.timeout"
+ * and defaults to 1000 msec if undefined.
*
- * @return the maximum time expressed in millisecond
+ * @return the default deployment timeout value
*/
public long getDeploymentTimeout()
{
SystemContext sc = m_context.getSystemContext();
Parameters params = sc.getSystemParameters();
- return params.getParameterAsLong( "deployment-timeout", 1000 );
+ return params.getParameterAsLong(
+ DEPLOYMENT_TIMEOUT_KEY,
+ params.getParameterAsLong(
+ "deployment-timeout", // legacy
+ 1000 ) );
}
}
1.2 +1 -3 avalon/merlin/facilities/http/api/src/java/org/apache/avalon/http/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/api/src/java/org/apache/avalon/http/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 13 Jan 2004 12:46:54 -0000 1.1
+++ package.html 15 Jan 2004 12:23:04 -0000 1.2
@@ -1,7 +1,5 @@
<body>
<p>
- The <code>template/api</code> package contains an
- service defintion class that will normally be
- replaced by a real service defintion.
+ Definition of the service interface to an HTTP server.
</p>
</body>
1.2 +1 -3 avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 13 Jan 2004 12:46:54 -0000 1.1
+++ package.html 15 Jan 2004 12:23:04 -0000 1.2
@@ -1,7 +1,5 @@
<body>
<p>
- The <code>template/impl</code> package contains an
- component implementation class that will normally be
- replaced by a real component implementation.
+ HTTP server component implementation.
</p>
</body>
1.2 +1 -3 avalon/merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 13 Jan 2004 12:46:54 -0000 1.1
+++ package.html 15 Jan 2004 12:23:04 -0000 1.2
@@ -1,7 +1,5 @@
<body>
<p>
- The <code>template/impl</code> package contains an
- component implementation class that will normally be
- replaced by a real component implementation.
+ Model listener used to associate components as servlet implementations.
</p>
</body>
1.1 avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/package.html
Index: package.html
===================================================================
<body>
<p>
Servlet containing an embedded merlin kernel.
</p>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org