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/09 21:29:50 UTC
cvs commit: avalon/merlin/web/http/impl/src/java/org/apache/avalon/merlin/http/example ExampleServiceImpl.java ExampleServlet.java ExampleSessionManager.java
mcconnell 2004/01/09 12:29:50
Modified: merlin Tag: Ver_3_4 INSTALL.TXT maven.xml platform.xml
project.properties project.xml
merlin/activation/impl Tag: Ver_3_4 project.xml
merlin/composition/api/src/java/org/apache/avalon/composition/data
Tag: Ver_3_4 BlockCompositionDirective.java
BlockIncludeDirective.java ContainmentProfile.java
DeploymentProfile.java Mode.java
ProfilePackage.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 ComponentContext.java
ContainmentModel.java ProfileSelector.java
TypeRepository.java
merlin/composition/impl Tag: Ver_3_4 project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
Tag: Ver_3_4 ProfilePackageBuilder.java
XMLContainmentProfileCreator.java
XMLProfilePackageCreator.java
XMLTargetsCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer
Tag: Ver_3_4 XMLContainmentProfileWriter.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultComponentContext.java
DefaultContainmentModel.java
DefaultProfileSelector.java
DefaultTypeRepository.java
merlin/kernel/impl Tag: Ver_3_4 project.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
Tag: Ver_3_4 DefaultFactory.java DefaultKernel.java
merlin/platform/installer/src/nsis Tag: Ver_3_4 merlin.nsi
merlin/platform/src/bin Tag: Ver_3_4 merlin merlin-server.sh
merlin.bat merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt Tag: Ver_3_4 wrapper.conf
merlin/platform/tutorials/hello Tag: Ver_3_4 project.xml
merlin/platform/tutorials/parameterization Tag: Ver_3_4
project.xml
Added: merlin/kernel/api/src/java/org/apache/avalon/merlin/event
Tag: Ver_3_4 KernelEvent.java
KernelEventListener.java package.html
merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx Tag:
Ver_3_4 DefaultKernelMBean.java package.html
Removed: merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
Tag: Ver_3_4 DefaultKernelMBean.java
merlin/web/http Tag: Ver_3_4 readme.html
merlin/web/http/api Tag: Ver_3_4 .cvsignore maven.xml
project.xml
merlin/web/http/api/src/java/org/apache/avalon/merlin/http
Tag: Ver_3_4 SessionManager.java WebServer.java
merlin/web/http/api/src/java/org/apache/avalon/merlin/http/example
Tag: Ver_3_4 ExampleService.java
merlin/web/http/impl Tag: Ver_3_4 .cvsignore maven.xml
project.xml
merlin/web/http/impl/conf Tag: Ver_3_4 avalon-http-1.3.block
block.xml
merlin/web/http/impl/src/java/org/apache/avalon/merlin/http
Tag: Ver_3_4 AvalonSessionManager.java
JettyWebServer.java
merlin/web/http/impl/src/java/org/apache/avalon/merlin/http/example
Tag: Ver_3_4 ExampleServiceImpl.java
ExampleServlet.java ExampleSessionManager.java
Log:
General update the synchronize the kernel with the activation/composition refactoring. This commit brings 3.4 to a buildable and runnable state although there is still of lot of updates to make to the kernel implementation including completion of a seperated kernel jmx adapter, exposure of a shutdown timeout parameter in the composition api, caching of timeout references, assembly and disassembly events, linking these events to runtime deployment and decommissioning cycles, probably extraction of the logging api and impl to a peer package, and incorporation of code level security policy handling.
Revision Changes Path
No revision
No revision
1.5.2.2 +1 -1 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- INSTALL.TXT 8 Jan 2004 10:40:53 -0000 1.5.2.1
+++ INSTALL.TXT 9 Jan 2004 20:29:48 -0000 1.5.2.2
@@ -1,5 +1,5 @@
-PROJECT: Merlin 3.2-dev
+PROJECT: Merlin @VERSION@
====================================================================
DESCRIPTION:
1.31.2.3 +28 -16 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -u -r1.31.2.2 -r1.31.2.3
--- maven.xml 8 Jan 2004 10:40:53 -0000 1.31.2.2
+++ maven.xml 9 Jan 2004 20:29:48 -0000 1.31.2.3
@@ -2,7 +2,8 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.cli.jar" value="merlin-cli-3.4-DEV.jar"/>
+ <ant:property name="merlin.cli.version" value="3.4-DEV"/>
+ <ant:property name="merlin.cli.jar" value="merlin-cli-${merlin.cli.version}.jar"/>
<ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0.jar"/>
<ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.3.1.jar"/>
<ant:property name="merlin.plugin.jar" value="merlin-plugin-3.4-DEV.jar"/>
@@ -113,12 +114,15 @@
ignoreFailures="false"/>
<!-- create a directory containing the plugins -->
+
+ <ant:mkdir dir="${maven.build.dir}/merlin/plugins"/>
+
<ant:copy
file="${merlin.build.inst.dir}/system/avalon-meta/jars/${meta.plugin.jar}"
- toDir="${maven.build.dir}/plugins"/>
+ toDir="${maven.build.dir}/merlin/plugins"/>
<delete file="${merlin.build.inst.dir}/system/avalon-meta/jars/${meta.plugin.jar}"/>
- <ant:mkdir dir="${maven.build.dir}/plugins"/>
- <ant:copy toDir="${maven.build.dir}/plugins">
+
+ <ant:copy toDir="${maven.build.dir}/merlin/plugins">
<fileset dir="${basedir}/kernel/plugin/target">
<include name="${merlin.plugin.jar}"/>
</fileset>
@@ -130,9 +134,9 @@
<include name="INSTALL.TXT"/>
</fileset>
<filterset>
- <filter token="@MERLIN_PLUGIN_JAR@" value="${merlin.plugin.jar}"/>
- <filter token="@META_PLUGIN_JAR@" value="${meta.plugin.jar}"/>
- <filter token="@VERSION@" value="${pom.currentVersion}"/>
+ <filter token="MERLIN_PLUGIN_JAR" value="${merlin.plugin.jar}"/>
+ <filter token="META_PLUGIN_JAR" value="${meta.plugin.jar}"/>
+ <filter token="VERSION" value="${pom.currentVersion}"/>
</filterset>
</ant:copy>
@@ -145,7 +149,9 @@
<include name="README.TXT"/>
</fileset>
<filterset>
- <filter token="@VERSION@" value="${pom.currentVersion}"/>
+ <filter token="VERSION" value="${pom.currentVersion}"/>
+ <filter token="MERLIN_CLI_JAR" value="${merlin.cli.jar}"/>
+ <filter token="MERLIN_CLI_VERSION" value="${merlin.cli.version}"/>
</filterset>
</ant:copy>
@@ -203,29 +209,33 @@
<goal name="merlin:package">
- <j:set var="package.name" value="${maven.final.name}-dist"/>
<!--
+ <j:set var="package.name" value="${maven.final.name}-dist"/>
+ -->
<maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-${timestamp}"/>
- -->
<ant:echo>Building distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
<zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <zipfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
<fileset dir="${basedir}">
<include name="INSTALL.TXT"/>
</fileset>
+ <fileset dir="${maven.build.dir}">
+ <include name="docs/**"/>
+ </fileset>
</ant:zip>
<checksum file="${maven.build.dir}/${package.name}.zip"/>
<ant:tar tarfile="${maven.build.dir}/${package.name}.tar">
<tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <tarfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
<fileset dir="${basedir}">
<include name="INSTALL.TXT"/>
</fileset>
+ <fileset dir="${maven.build.dir}">
+ <include name="docs/**"/>
+ </fileset>
</ant:tar>
<ant:gzip
zipfile="${maven.build.dir}/${package.name}.tar.gz"
@@ -234,6 +244,7 @@
<checksum file="${maven.build.dir}/${package.name}.tar.gz"/>
<!-- <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>-->
+ <!--
<j:set var="docs.name" value="${package.name}-docs"/>
<ant:echo>Building doc kit: ${docs.name}</ant:echo>
@@ -241,7 +252,7 @@
<zipfileset dir="${maven.build.dir}/docs" prefix="docs"/>
</ant:zip>
<checksum file="${maven.build.dir}/${docs.name}.zip"/>
- <ant:tar tarfile="${maven.build.dir}/${docs.name}.tar">
+ <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${docs.name}.tar">
<tarfileset dir="${maven.build.dir}/docs" prefix="docs"/>
</ant:tar>
<ant:gzip
@@ -249,9 +260,10 @@
src="${maven.build.dir}/${docs.name}.tar"/>
<ant:delete file="${maven.build.dir}/${docs.name}.tar"/>
<checksum file="${maven.build.dir}/${docs.name}.tar.gz"/>
+ -->
- <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>-->
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
+ <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>-->
<ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
@@ -346,7 +358,7 @@
</goal>
<goal name="xjavadoc">
- <ant:mkdir dir="${maven.build.dir}/docs/api" />
+ <ant:mkdir dir="${maven.build.dir}/merlin/docs/api" />
<ant:property name="copyright"
value="Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved." />
<ant:property name="title" value="${pom.name} ${pom.currentVersion} API"/>
1.20.2.2 +9 -0 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- platform.xml 3 Jan 2004 13:10:48 -0000 1.20.2.1
+++ platform.xml 9 Jan 2004 20:29:48 -0000 1.20.2.2
@@ -12,6 +12,7 @@
<!-- mx4j dependecies -->
+ <!--
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
@@ -22,6 +23,7 @@
<artifactId>mx4j-tools</artifactId>
<version>1.1.1</version>
</dependency>
+ -->
<!-- merlin dependecies -->
@@ -178,11 +180,13 @@
<version>1.0</version>
</dependency>
+ <!--
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-util-concurrent</artifactId>
<version>1.3.1</version>
</dependency>
+ -->
<dependency>
<id>excalibur-i18n</id>
@@ -192,6 +196,8 @@
<id>excalibur-configuration</id>
<version>1.1</version>
</dependency>
+
+ <!--
<dependency>
<id>excalibur-pool</id>
<version>1.2</version>
@@ -200,9 +206,11 @@
<id>excalibur-event</id>
<version>1.0.3</version>
</dependency>
+ -->
<!-- commons dependencies -->
+ <!--
<dependency>
<id>commons-collections</id>
<version>2.1</version>
@@ -211,6 +219,7 @@
<id>commons-cli</id>
<version>1.0</version>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
1.5.2.1 +1 -0 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.properties 5 Dec 2003 00:48:47 -0000 1.5
+++ project.properties 9 Jan 2004 20:29:48 -0000 1.5.2.1
@@ -8,6 +8,7 @@
maven.xdoc.jsl = ./platform/src/etc/site.jsl
maven.javadoc.stylesheet =${basedir}/platform/src/etc/stylesheet.css
maven.xdoc.poweredby.image=
+maven.docs.dest = ${maven.build.dir}/merlin/docs
#
# Declaration of the remote links to assign on javadoc generation.
1.18.2.2 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- project.xml 3 Jan 2004 13:10:48 -0000 1.18.2.1
+++ project.xml 9 Jan 2004 20:29:48 -0000 1.18.2.2
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.4-DEV</currentVersion>
+ <currentVersion>3.4</currentVersion>
<organization>
<name>Apache Software Foundation</name>
No revision
No revision
1.13.2.3 +5 -0 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- project.xml 8 Jan 2004 10:40:53 -0000 1.13.2.2
+++ project.xml 9 Jan 2004 20:29:48 -0000 1.13.2.3
@@ -149,6 +149,8 @@
<id>excalibur-configuration</id>
<version>1.1</version>
</dependency>
+
+ <!--
<dependency>
<id>excalibur-pool</id>
<version>1.2</version>
@@ -157,13 +159,16 @@
<id>excalibur-event</id>
<version>1.0.3</version>
</dependency>
+ -->
<!-- commons dependencies -->
+ <!--
<dependency>
<id>commons-collections</id>
<version>2.1</version>
</dependency>
+ -->
<!-- pre JDK 1.4 dependencies -->
No revision
No revision
1.1.1.1.2.1 +2 -2 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java
Index: BlockCompositionDirective.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- BlockCompositionDirective.java 24 Sep 2003 09:31:01 -0000 1.1.1.1
+++ BlockCompositionDirective.java 9 Jan 2004 20:29:48 -0000 1.1.1.1.2.1
@@ -58,7 +58,7 @@
* @author <a href="mailto:mcconnell@avalon.apache.org">Stephen McConnell</a>
* @version $Revision$ $Date$
*/
-public class BlockCompositionDirective extends Profile
+public class BlockCompositionDirective extends DeploymentProfile
{
/**
* The version identifier.
1.1.1.1.2.1 +2 -2 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java
Index: BlockIncludeDirective.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- BlockIncludeDirective.java 24 Sep 2003 09:31:01 -0000 1.1.1.1
+++ BlockIncludeDirective.java 9 Jan 2004 20:29:48 -0000 1.1.1.1.2.1
@@ -56,7 +56,7 @@
* @author <a href="mailto:mcconnell@avalon.apache.org">Stephen McConnell</a>
* @version $Revision$ $Date$
*/
-public class BlockIncludeDirective extends Profile
+public class BlockIncludeDirective extends DeploymentProfile
{
/**
* The include path.
1.2.2.1 +11 -11 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
Index: ContainmentProfile.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ContainmentProfile.java 28 Oct 2003 12:53:48 -0000 1.2
+++ ContainmentProfile.java 9 Jan 2004 20:29:48 -0000 1.2.2.1
@@ -67,7 +67,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class ContainmentProfile extends Profile
+public class ContainmentProfile extends DeploymentProfile
{
//========================================================================
// static
@@ -81,7 +81,7 @@
private static final ServiceDirective[] EMPTY_SERVICES =
new ServiceDirective[0];
- private static final Profile[] EMPTY_PROFILES = new Profile[0];
+ private static final DeploymentProfile[] EMPTY_PROFILES = new DeploymentProfile[0];
private static final CategoriesDirective EMPTY_CATEGORIES = new CategoriesDirective();
@@ -105,7 +105,7 @@
/**
* The profiles described within the scope of the containment profile.
*/
- private final Profile[] m_profiles;
+ private final DeploymentProfile[] m_profiles;
/**
* The assigned logging categories.
@@ -139,7 +139,7 @@
final String name, final ClassLoaderDirective classloader,
final ServiceDirective[] exports,
final CategoriesDirective categories,
- Profile[] profiles )
+ DeploymentProfile[] profiles )
{
super( name, true, Mode.EXPLICIT );
@@ -215,7 +215,7 @@
*
* @return the profiles nested in this containment profile
*/
- public Profile[] getProfiles()
+ public DeploymentProfile[] getProfiles()
{
if( m_profiles == null ) return EMPTY_PROFILES;
return m_profiles;
@@ -229,9 +229,9 @@
* {@link Mode#PACKAGED}, or {@link Mode#EXPLICIT}
* @return the profiles matching the supplied creation mode
*/
- public Profile[] getProfiles( Mode mode )
+ public DeploymentProfile[] getProfiles( Mode mode )
{
- Profile[] profiles = getProfiles();
+ DeploymentProfile[] profiles = getProfiles();
return selectProfileByMode( profiles, mode );
}
@@ -242,17 +242,17 @@
* @return the subset of the supplied profiles with a creation mode matching
* the supplied mode value
*/
- private Profile[] selectProfileByMode( Profile[] profiles, Mode mode )
+ private DeploymentProfile[] selectProfileByMode( DeploymentProfile[] profiles, Mode mode )
{
ArrayList list = new ArrayList();
for( int i = 0; i < profiles.length; i++ )
{
- Profile profile = profiles[ i ];
+ DeploymentProfile profile = profiles[ i ];
if( profile.getMode().equals( mode ) )
{
list.add( profile );
}
}
- return (Profile[])list.toArray( new Profile[0] );
+ return (DeploymentProfile[])list.toArray( new DeploymentProfile[0] );
}
}
1.7.2.1 +38 -289 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java
Index: DeploymentProfile.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- DeploymentProfile.java 1 Jan 2004 13:06:13 -0000 1.7
+++ DeploymentProfile.java 9 Jan 2004 20:29:48 -0000 1.7.2.1
@@ -50,216 +50,60 @@
package org.apache.avalon.composition.data;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.meta.info.InfoDescriptor;
+import java.io.Serializable;
/**
- * Definition of the criteria for an explicit component profile. A profile, when
- * included within the scope of a container declaration will be instantiated in
- * the model as an EXPLICIT component profile resulting in the initiation of
- * dependency resolution relative to the component as the target deployment
- * objective. Multiple supplementary profiles may be packaged in a .xprofiles
- * resources and will be assigned to the container automatically. In the absence
- * of explicit or packaged profile directives, an implicit profile will be created
- * for any component types declared under a jar manifest.
- *
- * <p><b>XML</b></p>
- * <p>A component element declares the profile to be applied during the instantiation
- * of a component type. It includes a name and class declaration, logging directives
- * (resolved relative to the component's container), context creation criteria,
- * together with configuration or parameters information.</p>
- *
- * <pre>
- <font color="gray"><i><!--
- Declaration of the services hosted by this container. Service container here
- will be managed relative to other provider components at the same level and
- may be serviced by components declared in parent container.
- --></i></font>
-
-<component name="<font color="darkred">complex</font>" class="<font color="darkred">org.apache.excalibur.playground.ComplexComponent</font>" activation="<font color="darkred">startup</font>">
-
- <font color="gray"><i><!--
- Priority and target assignments for component specific logging categrories.
- --></i></font>
-
- <categories priority="<font color="darkred">DEBUG</font>">
- <category name="<font color="darkred">init</font>" priority="<font color="darkred">DEBUG</font>" />
- </categories>
-
- <font color="gray"><i><!--
- Context entry directives are normally only required in the case where the component
- type declares a required context type and entry values. Generally speaking, a component
- will normally qualify it's instantiation criteria through a configuration declaration.
- Any context values defined at this level will override context values supplied by the
- container. The following two context directives for "location" and "home" demonstrate
- programatics creation of context values. The first entry declares that the context
- value to be assigned to the key "location" shall be the String value "Paris". The second
- context enty assignes the container's context value for "urn:avalon:home" to the component's
- context key of "home".
- --></i></font>
-
- <context>
- <entry key="<font color="darkred">location</font>"><font color="darkred">Paris</font></entry>
- <include name="<font color="darkred">urn:avalon:home</font>" key="<font color="darkred">home</font>"/>
- </context>
-
- <font color="gray"><i><!--
- Apply the following configuration when instantiating the component. This configuration
- will be applied as the primary configuration in a cascading configuration chain. A
- type may declare a default configuration under a "classname".xconfig file that will be
- used to dereference any configuration requests not resolvable by the configuration
- supplied here.
- --></i></font>
-
- <configuration>
- <message value="<font color="darkred">Hello</font>"/>
- </configuration>
-
- <font color="gray"><i><!--
- The parameterization criteria from this instance of the component type.
- --></i></font>
-
- <parameters/>
-
-</component>
-</pre>
- *
+ * Abstract base class for ComponentProfile and ContainmentProfile.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DeploymentProfile extends Profile
+public abstract class DeploymentProfile implements Serializable
{
- /**
- * The assigned logging categories.
- */
- private CategoriesDirective m_categories;
-
- /**
- * The collection policy override.
- */
- private int m_collection;
-
- /**
- * The component classname.
- */
- private String m_classname;
-
- /**
- * The parameters for component (if any).
- */
- private Parameters m_parameters;
-
- /**
- * The configuration for component (if any).
- */
- private Configuration m_configuration;
-
- /**
- * The configuration for component (if any).
- */
- private ContextDirective m_context;
+ //--------------------------------------------------------------------------
+ // state
+ //--------------------------------------------------------------------------
/**
- * The dependency directives.
+ * The name of the component profile. This is an
+ * abstract name used during assembly.
*/
- private DependencyDirective[] m_dependencies;
+ private String m_name;
/**
- * The stage directives.
+ * The activation policy.
*/
- private StageDirective[] m_stages;
+ private final boolean m_activation;
- /**
- * The creation mode.
- */
- private Mode m_mode;
+ /**
+ * The mode under which this profile was established.
+ */
+ private final Mode m_mode;
//--------------------------------------------------------------------------
// constructor
//--------------------------------------------------------------------------
- /**
- * Creation of a new profile using IMPLICT mode and LIBERAL collection
- * policies.
- *
- * @param name the name to assign to the component deployment scenario
- * @param classname the classname of the component type
- */
- public DeploymentProfile(
- final String name,
- final String classname )
- {
- this(
- name, false, InfoDescriptor.UNDEFINED, classname, null, null, null, null,
- null, null, Mode.IMPLICIT );
- }
-
- /**
- * Creation of a new deployment profile using a supplied template profile.
- * @param name the name to assign to the created profile
- * @param template the template deployment profile
- */
- public DeploymentProfile( String name, DeploymentProfile template )
- {
- this(
- name,
- template.getActivationPolicy(),
- template.getCollectionPolicy(),
- template.m_classname,
- template.m_categories,
- template.m_context,
- template.m_dependencies,
- template.m_stages,
- template.m_parameters,
- template.m_configuration,
- Mode.EXPLICIT );
- }
-
public DeploymentProfile(
- final String name,
- final boolean activation,
- final int collection,
- final String classname,
- final CategoriesDirective categories,
- final ContextDirective context,
- final DependencyDirective[] dependencies,
- final StageDirective[] stages,
- final Parameters parameters,
- final Configuration config,
- final Mode mode )
+ final String name, boolean activation, Mode mode )
{
- super( name, activation, mode );
-
- if( null == classname )
- {
- throw new NullPointerException( "classname" );
- }
-
- m_collection = collection;
- m_classname = classname;
- m_categories = categories;
- m_context = context;
- m_parameters = parameters;
- m_configuration = config;
-
- if( null == dependencies )
+ m_activation = activation;
+ if( mode != null )
{
- m_dependencies = new DependencyDirective[0];
+ m_mode = Mode.IMPLICIT;
}
else
{
- m_dependencies = dependencies;
+ m_mode = mode;
}
-
- if( null == stages )
+
+ if( name == null )
{
- m_stages = new StageDirective[0];
+ m_name = "untitled";
}
else
{
- m_stages = stages;
+ m_name = name;
}
}
@@ -268,125 +112,30 @@
//--------------------------------------------------------------------------
/**
- * Return the component type classname.
+ * Return the name of meta-data instance.
*
- * @return classname of the component type
+ * @return the name of the component.
*/
- public String getClassname()
+ public String getName()
{
- return m_classname;
+ return m_name;
}
- /**
- * Return the component collection policy. If null, the component
- * type collection policy will apply.
- *
- * @return a HARD, WEAK, SOFT or UNDEFINED
- */
- public int getCollectionPolicy()
- {
- return m_collection;
- }
-
- /**
- * Return the logging categories for the profile.
- *
- * @return the logger
- */
- public CategoriesDirective getCategories()
- {
- return m_categories;
- }
-
- /**
- * Return the context directive for the profile.
- *
- * @return the ContextDirective for the profile.
- */
- public ContextDirective getContext()
- {
- return m_context;
- }
-
- /**
- * Return the dependency directives.
- *
- * @return the set of DependencyDirective statements for the profile.
- */
- public DependencyDirective[] getDependencyDirectives()
- {
- return m_dependencies;
- }
-
- /**
- * Return the dependency directive for a supplied key.
- *
- * @return the matching DependencyDirective (possibly null if
- * no directive is declared for the given key)
- */
- public DependencyDirective getDependencyDirective( final String key )
- {
- DependencyDirective[] directives = getDependencyDirectives();
- for( int i=0; i<directives.length; i++ )
- {
- DependencyDirective directive = directives[i];
- if( directive.getKey().equals( key ) )
- {
- return directive;
- }
- }
- return null;
- }
-
- /**
- * Return the stage directives.
- *
- * @return the set of StageDirective statements for the profile.
- */
- public StageDirective[] getStageDirectives()
- {
- return m_stages;
- }
-
- /**
- * Return the dependency directive for a supplied key.
- *
- * @return the matching DependencyDirective (possibly null if
- * no directive is declared for the given key)
- */
- public StageDirective getStageDirective( final String key )
- {
- StageDirective[] directives = getStageDirectives();
- for( int i=0; i<directives.length; i++ )
- {
- StageDirective directive = directives[i];
- if( directive.getKey().equals( key ) )
- {
- return directive;
- }
- }
- return null;
- }
-
- /**
- * Return the Parameters for the profile.
- *
- * @return the Parameters for Component (if any).
- */
- public Parameters getParameters()
+ /**
+ * Get the activation policy for the profile.
+ */
+ public boolean getActivationPolicy()
{
- return m_parameters;
+ return m_activation;
}
/**
- * Return the base Configuration for the profile. The implementation
- * garantees that the supplied configuration is not null.
- *
- * @return the base Configuration for profile.
+ * Returns the creation mode for this profile.
+ * @return a value of EXPLICIT, PACKAGED or IMPLICIT
*/
- public Configuration getConfiguration()
+ public Mode getMode()
{
- return m_configuration;
+ return m_mode;
}
/**
1.1.1.1.2.1 +2 -2 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Mode.java
Index: Mode.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Mode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Mode.java 24 Sep 2003 09:31:08 -0000 1.1.1.1
+++ Mode.java 9 Jan 2004 20:29:48 -0000 1.1.1.1.2.1
@@ -55,7 +55,7 @@
/**
* The <code>Mode</code> class declares the EXPLICIT, PACKAGED or IMPLICIT mode of creation of a profile.
*
- * @see Profile
+ * @see DeploymentProfile
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
1.1.1.1.2.1 +6 -6 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java
Index: ProfilePackage.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ProfilePackage.java 24 Sep 2003 09:31:10 -0000 1.1.1.1
+++ ProfilePackage.java 9 Jan 2004 20:29:48 -0000 1.1.1.1.2.1
@@ -71,9 +71,9 @@
//--------------------------------------------------------------------------
/**
- * The set of deployment profiles contained within the package.
+ * The set of component profiles contained within the package.
*/
- private final DeploymentProfile[] m_profiles;
+ private final ComponentProfile[] m_profiles;
//--------------------------------------------------------------------------
// constructor
@@ -81,7 +81,7 @@
public ProfilePackage()
{
- this( new DeploymentProfile[0] );
+ this( new ComponentProfile[0] );
}
/**
@@ -89,7 +89,7 @@
*
* @param profiles the set of contained profiles
*/
- public ProfilePackage( final DeploymentProfile[] profiles )
+ public ProfilePackage( final ComponentProfile[] profiles )
{
m_profiles = profiles;
}
@@ -103,7 +103,7 @@
*
* @return the profiles
*/
- public DeploymentProfile[] getDeploymentProfiles()
+ public ComponentProfile[] getComponentProfiles()
{
return m_profiles;
}
No revision
No revision
1.1.2.4 +3 -3 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ComponentContext.java
Index: ComponentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ComponentContext.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ComponentContext.java 6 Jan 2004 23:16:49 -0000 1.1.2.3
+++ ComponentContext.java 9 Jan 2004 20:29:48 -0000 1.1.2.4
@@ -52,7 +52,7 @@
import java.io.File;
-import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.logger.Logger;
@@ -128,7 +128,7 @@
*
* @return the profile
*/
- DeploymentProfile getProfile();
+ ComponentProfile getProfile();
/**
* Return the component type.
1.9.2.8 +3 -3 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -r1.9.2.7 -r1.9.2.8
--- ContainmentModel.java 8 Jan 2004 12:51:16 -0000 1.9.2.7
+++ ContainmentModel.java 9 Jan 2004 20:29:48 -0000 1.9.2.8
@@ -52,7 +52,7 @@
import java.net.URL;
-import org.apache.avalon.composition.data.Profile;
+import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.composition.data.TargetDirective;
@@ -148,7 +148,7 @@
* @return the model based on the supplied profile
* @exception ModelException if an error occurs during model establishment
*/
- DeploymentModel addModel( Profile profile ) throws ModelException;
+ DeploymentModel addModel( DeploymentProfile profile ) throws ModelException;
/**
* Removal of a named model for the containment model.
1.1.1.1.2.1 +4 -4 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java
Index: ProfileSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- ProfileSelector.java 24 Sep 2003 09:31:20 -0000 1.1.1.1
+++ ProfileSelector.java 9 Jan 2004 20:29:48 -0000 1.1.1.1.2.1
@@ -52,7 +52,7 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
-import org.apache.avalon.composition.data.Profile;
+import org.apache.avalon.composition.data.DeploymentProfile;
/**
* Interface defining the contract for profile selection.
@@ -71,7 +71,7 @@
* @return the preferred profile or null if no satisfactory profile
* can be established
*/
- Profile select( Profile[] profiles, DependencyDescriptor dependency );
+ DeploymentProfile select( DeploymentProfile[] profiles, DependencyDescriptor dependency );
/**
* Returns the preferred profile from an available selection of
@@ -82,5 +82,5 @@
* @return the preferred extension provider profile or null if
* no satisfactory profile can be established
*/
- Profile select( Profile[] profiles, StageDescriptor stage );
+ DeploymentProfile select( DeploymentProfile[] profiles, StageDescriptor stage );
}
1.2.2.1 +4 -4 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java
Index: TypeRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TypeRepository.java 4 Oct 2003 11:53:04 -0000 1.2
+++ TypeRepository.java 9 Jan 2004 20:29:48 -0000 1.2.2.1
@@ -50,7 +50,7 @@
package org.apache.avalon.composition.model;
-import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.model.ProfileUnknownException;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -120,7 +120,7 @@
* @return a profile array containing at least one deployment profile
* @exception TypeUnknownException if the supplied type is unknown
*/
- DeploymentProfile[] getProfiles( Type type ) throws TypeUnknownException;
+ ComponentProfile[] getProfiles( Type type ) throws TypeUnknownException;
/**
* Return a deployment profile for the supplied type and key.
@@ -130,7 +130,7 @@
* @exception TypeUnknownException if the supplied type is unknown
* @exception ProfileUnknownException if the supplied key is unknown
*/
- DeploymentProfile getProfile( Type type, String key )
+ ComponentProfile getProfile( Type type, String key )
throws TypeUnknownException, ProfileUnknownException;
No revision
No revision
1.12.2.2 +5 -0 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- project.xml 3 Jan 2004 13:10:48 -0000 1.12.2.1
+++ project.xml 9 Jan 2004 20:29:49 -0000 1.12.2.2
@@ -103,11 +103,13 @@
<!-- excalibur dependecies -->
+ <!--
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-util-concurrent</artifactId>
<version>1.3.1</version>
</dependency>
+ -->
<dependency>
<groupId>excalibur-lifecycle</groupId>
@@ -122,6 +124,8 @@
<id>excalibur-configuration</id>
<version>1.1</version>
</dependency>
+
+ <!--
<dependency>
<id>excalibur-pool</id>
<version>1.2</version>
@@ -130,6 +134,7 @@
<id>excalibur-event</id>
<version>1.0.3</version>
</dependency>
+ -->
<!-- commons dependencies -->
No revision
No revision
1.2.2.1 +5 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java
Index: ProfilePackageBuilder.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ProfilePackageBuilder.java 28 Oct 2003 20:21:00 -0000 1.2
+++ ProfilePackageBuilder.java 9 Jan 2004 20:29:49 -0000 1.2.2.1
@@ -55,7 +55,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.meta.ConfigurationBuilder;
import org.apache.avalon.composition.data.ProfilePackage;
-import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.xml.sax.InputSource;
@@ -100,9 +100,9 @@
clazz.getClassLoader().getResourceAsStream( xprofile );
if( stream == null )
{
- DeploymentProfile profile =
- new DeploymentProfile( name, classname );
- return new ProfilePackage( new DeploymentProfile[]{ profile } );
+ ComponentProfile profile =
+ new ComponentProfile( name, classname );
+ return new ProfilePackage( new ComponentProfile[]{ profile } );
}
else
{
1.3.2.1 +13 -13 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
Index: XMLContainmentProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- XMLContainmentProfileCreator.java 28 Oct 2003 20:21:00 -0000 1.3
+++ XMLContainmentProfileCreator.java 9 Jan 2004 20:29:49 -0000 1.3.2.1
@@ -67,8 +67,8 @@
import org.apache.avalon.composition.data.IncludeDirective;
import org.apache.avalon.composition.data.LibraryDirective;
import org.apache.avalon.composition.data.MetaDataException;
-import org.apache.avalon.composition.data.NamedDeploymentProfile;
-import org.apache.avalon.composition.data.Profile;
+import org.apache.avalon.composition.data.NamedComponentProfile;
+import org.apache.avalon.composition.data.DeploymentProfile;
import org.apache.avalon.composition.data.RepositoryDirective;
import org.apache.avalon.composition.data.ResourceDirective;
import org.apache.avalon.composition.data.ServiceDirective;
@@ -92,8 +92,8 @@
private static final XMLTypeCreator TYPE_CREATOR =
new XMLTypeCreator();
- private static final XMLDeploymentProfileCreator DEPLOYMENT_CREATOR =
- new XMLDeploymentProfileCreator();
+ private static final XMLComponentProfileCreator DEPLOYMENT_CREATOR =
+ new XMLComponentProfileCreator();
private static final XMLTargetsCreator TARGETS_CREATOR =
new XMLTargetsCreator();
@@ -165,7 +165,7 @@
// build nested profiles
//
- final Profile[] profiles = createProfiles( implementation );
+ final DeploymentProfile[] profiles = createProfiles( implementation );
//
// return the containment profile
@@ -373,7 +373,7 @@
* @param config a container or implementation configutation
* @return the set of profile
*/
- protected Profile[] createProfiles( Configuration config )
+ protected DeploymentProfile[] createProfiles( Configuration config )
throws Exception
{
ArrayList list = new ArrayList();
@@ -391,12 +391,12 @@
{
if( child.getAttribute( "profile", null ) != null )
{
- list.add( createNamedDeploymentProfile( child ) );
+ list.add( createNamedComponentProfile( child ) );
}
else
{
list.add(
- DEPLOYMENT_CREATOR.createDeploymentProfile( child ) );
+ DEPLOYMENT_CREATOR.createComponentProfile( child ) );
}
}
else if( child.getName().equals( "include" ) )
@@ -405,7 +405,7 @@
}
}
}
- return (Profile[]) list.toArray( new Profile[0] );
+ return (DeploymentProfile[]) list.toArray( new DeploymentProfile[0] );
}
/**
@@ -413,14 +413,14 @@
* @param config the component configuration
* @return the named profile
*/
- private NamedDeploymentProfile createNamedDeploymentProfile( Configuration config )
+ private NamedComponentProfile createNamedComponentProfile( Configuration config )
throws Exception
{
final String name = config.getAttribute( "name" );
final String classname = config.getAttribute( "class" );
final String key = config.getAttribute( "profile" );
final boolean activation = getActivationPolicy( config );
- return new NamedDeploymentProfile( name, classname, key, activation );
+ return new NamedComponentProfile( name, classname, key, activation );
}
/**
@@ -483,7 +483,7 @@
* @param the include description
* @return the containment directive
*/
- private Profile createFromInclude( Configuration config )
+ private DeploymentProfile createFromInclude( Configuration config )
throws MetaDataException, ConfigurationException
{
final String name = getBlockIncludeName( config );
1.1.1.1.2.1 +6 -6 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java
Index: XMLProfilePackageCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- XMLProfilePackageCreator.java 24 Sep 2003 09:31:42 -0000 1.1.1.1
+++ XMLProfilePackageCreator.java 9 Jan 2004 20:29:49 -0000 1.1.1.1.2.1
@@ -55,7 +55,7 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.composition.data.MetaDataException;
-import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.data.ProfilePackage;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.excalibur.configuration.ConfigurationUtil;
@@ -70,8 +70,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( XMLProfilePackageCreator.class );
- private static final XMLDeploymentProfileCreator DEPLOYMENT_CREATOR =
- new XMLDeploymentProfileCreator();
+ private static final XMLComponentProfileCreator DEPLOYMENT_CREATOR =
+ new XMLComponentProfileCreator();
/**
* Creation of a {@link ProfilePackage} from an XML configuration.
@@ -94,7 +94,7 @@
try
{
list.add(
- DEPLOYMENT_CREATOR.createDeploymentProfile(
+ DEPLOYMENT_CREATOR.createComponentProfile(
base, classname, child ) );
}
catch( Throwable e )
@@ -115,6 +115,6 @@
}
return new ProfilePackage(
- (DeploymentProfile[]) list.toArray( new DeploymentProfile[0] ) );
+ (ComponentProfile[]) list.toArray( new ComponentProfile[0] ) );
}
}
1.2.2.1 +2 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java
Index: XMLTargetsCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- XMLTargetsCreator.java 28 Oct 2003 20:21:00 -0000 1.2
+++ XMLTargetsCreator.java 9 Jan 2004 20:29:49 -0000 1.2.2.1
@@ -67,7 +67,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class XMLTargetsCreator extends XMLDeploymentProfileCreator
+public class XMLTargetsCreator extends XMLComponentProfileCreator
{
/**
* Create a set of target directives from the confiugration.
No revision
No revision
1.2.2.1 +9 -9 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java
Index: XMLContainmentProfileWriter.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- XMLContainmentProfileWriter.java 28 Oct 2003 20:21:00 -0000 1.2
+++ XMLContainmentProfileWriter.java 9 Jan 2004 20:29:49 -0000 1.2.2.1
@@ -56,9 +56,9 @@
import org.apache.avalon.composition.data.BlockIncludeDirective;
import org.apache.avalon.composition.data.BlockCompositionDirective;
-import org.apache.avalon.composition.data.Profile;
-import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ContainmentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.data.ClassLoaderDirective;
import org.apache.avalon.composition.data.ClasspathDirective;
import org.apache.avalon.composition.data.LibraryDirective;
@@ -74,7 +74,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class XMLContainmentProfileWriter extends XMLDeploymentProfileWriter
+public class XMLContainmentProfileWriter extends XMLComponentProfileWriter
{
/**
* Write out a containment profile to xml.
@@ -372,23 +372,23 @@
* @throws IOException if unable to write xml
*/
private void writeProfiles(
- final Writer writer, final Profile[] profiles, String pad )
+ final Writer writer, final DeploymentProfile[] profiles, String pad )
throws Exception
{
for( int i=0; i<profiles.length; i++ )
{
- Profile profile = profiles[i];
+ DeploymentProfile profile = profiles[i];
if( profile instanceof ContainmentProfile )
{
ContainmentProfile container = (ContainmentProfile) profile;
writer.write( "\n" );
writeContainmentProfile( writer, container, pad );
}
- else if( profile instanceof DeploymentProfile )
+ else if( profile instanceof ComponentProfile )
{
- DeploymentProfile component = (DeploymentProfile) profile;
+ ComponentProfile component = (ComponentProfile) profile;
writer.write( "\n" );
- writeDeploymentProfile( writer, component, pad );
+ writeComponentProfile( writer, component, pad );
}
else if( profile instanceof BlockIncludeDirective )
{
No revision
No revision
1.1.2.5 +5 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentContext.java
Index: DefaultComponentContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentContext.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DefaultComponentContext.java 8 Jan 2004 12:51:17 -0000 1.1.2.4
+++ DefaultComponentContext.java 9 Jan 2004 20:29:49 -0000 1.1.2.5
@@ -62,7 +62,7 @@
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.SystemContext;
-import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
@@ -101,7 +101,7 @@
private final ContainmentContext m_context;
- private final DeploymentProfile m_profile;
+ private final ComponentProfile m_profile;
private final Type m_type;
@@ -139,7 +139,7 @@
*/
public DefaultComponentContext(
Logger logger, String name, ContainmentContext context,
- ContainmentModel model, DeploymentProfile profile,
+ ContainmentModel model, ComponentProfile profile,
Type type, Class clazz,
File home, File temp, String partition )
{
@@ -256,7 +256,7 @@
*
* @return the profile
*/
- public DeploymentProfile getProfile()
+ public ComponentProfile getProfile()
{
return m_profile;
}
1.13.2.13 +35 -34 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.13.2.12
retrieving revision 1.13.2.13
diff -u -r1.13.2.12 -r1.13.2.13
--- DefaultContainmentModel.java 8 Jan 2004 12:51:17 -0000 1.13.2.12
+++ DefaultContainmentModel.java 9 Jan 2004 20:29:49 -0000 1.13.2.13
@@ -66,9 +66,9 @@
import org.apache.avalon.composition.data.BlockIncludeDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.composition.data.ContainmentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
+import org.apache.avalon.composition.data.NamedComponentProfile;
import org.apache.avalon.composition.data.DeploymentProfile;
-import org.apache.avalon.composition.data.NamedDeploymentProfile;
-import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.ResourceDirective;
import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.TargetDirective;
@@ -205,7 +205,7 @@
+ DeploymentModel.SEPARATOR;
}
- Profile[] profiles = context.getContainmentProfile().getProfiles();
+ DeploymentProfile[] profiles = context.getContainmentProfile().getProfiles();
for( int i=0; i<profiles.length; i++ )
{
addModel( profiles[i] );
@@ -485,9 +485,9 @@
// we could use to construct the model
//
- Profile[] profiles = findDependencyProfiles( dependency );
+ DeploymentProfile[] profiles = findDependencyProfiles( dependency );
ProfileSelector profileSelector = new DefaultProfileSelector();
- Profile profile = profileSelector.select( profiles, dependency );
+ DeploymentProfile profile = profileSelector.select( profiles, dependency );
if( profile != null )
{
try
@@ -565,9 +565,9 @@
// we could use to construct the model
//
- Profile[] profiles = findExtensionProfiles( stage );
+ DeploymentProfile[] profiles = findExtensionProfiles( stage );
ProfileSelector profileSelector = new DefaultProfileSelector();
- Profile profile = profileSelector.select( profiles, stage );
+ DeploymentProfile profile = profileSelector.select( profiles, stage );
if( profile != null )
{
try
@@ -604,7 +604,7 @@
}
}
- private Profile[] findExtensionProfiles( StageDescriptor stage )
+ private DeploymentProfile[] findExtensionProfiles( StageDescriptor stage )
{
TypeRepository repository = getClassLoaderModel().getTypeRepository();
Type[] types = repository.getTypes( stage );
@@ -620,7 +620,7 @@
}
}
- private Profile[] findDependencyProfiles( DependencyDescriptor dependency )
+ private DeploymentProfile[] findDependencyProfiles( DependencyDescriptor dependency )
{
TypeRepository repository = getClassLoaderModel().getTypeRepository();
Type[] types = repository.getTypes( dependency );
@@ -636,20 +636,20 @@
}
}
- private Profile[] getProfiles( TypeRepository repository, Type[] types )
+ private DeploymentProfile[] getProfiles( TypeRepository repository, Type[] types )
throws TypeUnknownException
{
ArrayList list = new ArrayList();
for( int i=0; i<types.length; i++ )
{
- Profile[] profiles =
+ DeploymentProfile[] profiles =
repository.getProfiles( types[i] );
for( int j=0; j<profiles.length; j++ )
{
list.add( profiles[j] );
}
}
- return (Profile[]) list.toArray( new Profile[0] );
+ return (DeploymentProfile[]) list.toArray( new DeploymentProfile[0] );
}
/**
@@ -793,7 +793,7 @@
return model;
}
- public DeploymentModel addModel( Profile profile ) throws ModelException
+ public DeploymentModel addModel( DeploymentProfile profile ) throws ModelException
{
if( null == profile )
throw new NullPointerException( "profile" );
@@ -805,15 +805,15 @@
ContainmentProfile containment = (ContainmentProfile) profile;
model = createContainmentModel( containment );
}
- else if( profile instanceof DeploymentProfile )
+ else if( profile instanceof ComponentProfile )
{
- DeploymentProfile deployment = (DeploymentProfile) profile;
+ ComponentProfile deployment = (ComponentProfile) profile;
model = createComponentModel( deployment );
}
- else if( profile instanceof NamedDeploymentProfile )
+ else if( profile instanceof NamedComponentProfile )
{
- DeploymentProfile deployment =
- createDeploymentProfile( (NamedDeploymentProfile) profile );
+ ComponentProfile deployment =
+ createComponentProfile( (NamedComponentProfile) profile );
model = createComponentModel( deployment );
}
else if( profile instanceof BlockIncludeDirective )
@@ -939,7 +939,7 @@
* @param profile a containment profile
* @return the composition model
*/
- private ComponentModel createComponentModel( final DeploymentProfile profile )
+ private ComponentModel createComponentModel( final ComponentProfile profile )
throws ModelException
{
if( null == profile )
@@ -1372,7 +1372,7 @@
}
}
- private String getName( String name, Profile profile )
+ private String getName( String name, DeploymentProfile profile )
{
if( name != null ) return name;
return profile.getName();
@@ -1588,7 +1588,7 @@
Type[] types = repository.getTypes( dependency );
for( int i=0; i<types.length; i++ )
{
- Profile[] profiles =
+ DeploymentProfile[] profiles =
repository.getProfiles( types[i] );
for( int j=0; j<profiles.length; j++ )
{
@@ -1604,9 +1604,9 @@
// DependencyDirective instead of the descriptor.
//
- Profile[] collection = (Profile[]) list.toArray( new Profile[0] );
+ DeploymentProfile[] collection = (DeploymentProfile[]) list.toArray( new DeploymentProfile[0] );
ProfileSelector selector = new DefaultProfileSelector();
- Profile profile = selector.select( collection, dependency );
+ DeploymentProfile profile = selector.select( collection, dependency );
if( profile != null )
{
return addModel( profile );
@@ -1666,7 +1666,7 @@
Type[] types = repository.getTypes( stage );
for( int i=0; i<types.length; i++ )
{
- Profile[] profiles =
+ DeploymentProfile[] profiles =
repository.getProfiles( types[i] );
for( int j=0; j<profiles.length; j++ )
{
@@ -1682,10 +1682,11 @@
// DependencyDirective instead of the descriptor.
//
- Profile[] collection = (Profile[]) list.toArray( new Profile[0] );
+ DeploymentProfile[] collection =
+ (DeploymentProfile[]) list.toArray( new DeploymentProfile[0] );
ProfileSelector selector = new DefaultProfileSelector();
- Profile profile = selector.select( collection, stage );
- if( profile != null )
+ DeploymentProfile profile = selector.select( collection, stage );
+ if( profile != null )
{
return addModel( profile );
}
@@ -1756,22 +1757,22 @@
* @exception ModelException if an error occurs during
* profile creation
*/
- private DeploymentProfile createDeploymentProfile(
- NamedDeploymentProfile profile )
+ private ComponentProfile createComponentProfile(
+ NamedComponentProfile profile )
throws ModelException
{
try
{
- NamedDeploymentProfile holder =
- (NamedDeploymentProfile) profile;
+ NamedComponentProfile holder =
+ (NamedComponentProfile) profile;
final String classname = holder.getClassname();
final String key = holder.getKey();
TypeRepository repository =
m_context.getClassLoaderModel().getTypeRepository();
Type type = repository.getType( classname );
- DeploymentProfile template =
+ ComponentProfile template =
repository.getProfile( type, key );
- return new DeploymentProfile( profile.getName(), template );
+ return new ComponentProfile( profile.getName(), template );
}
catch( Throwable e )
{
1.2.2.1 +5 -5 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java
Index: DefaultProfileSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- DefaultProfileSelector.java 28 Oct 2003 20:21:00 -0000 1.2
+++ DefaultProfileSelector.java 9 Jan 2004 20:29:49 -0000 1.2.2.1
@@ -59,7 +59,7 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.composition.data.Mode;
-import org.apache.avalon.composition.data.Profile;
+import org.apache.avalon.composition.data.DeploymentProfile;
/**
* Default profile selector class. The default selector selects profiles based
@@ -85,7 +85,7 @@
* @return the preferred profile or null if no satisfactory profile
* can be established
*/
- public Profile select( Profile[] profiles, DependencyDescriptor dependency )
+ public DeploymentProfile select( DeploymentProfile[] profiles, DependencyDescriptor dependency )
{
return select( profiles );
}
@@ -99,7 +99,7 @@
* @return the preferred extension provider profile or null if
* no satisfactory profile can be established
*/
- public Profile select( Profile[] profiles, StageDescriptor stage )
+ public DeploymentProfile select( DeploymentProfile[] profiles, StageDescriptor stage )
{
return select( profiles );
}
@@ -118,7 +118,7 @@
* @return the preferred profile or null if no satisfactory
* provider can be established
*/
- private Profile select( Profile[] profiles )
+ private DeploymentProfile select( DeploymentProfile[] profiles )
{
if( profiles.length == 0 )
{
1.3.2.2 +10 -10 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
Index: DefaultTypeRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- DefaultTypeRepository.java 6 Jan 2004 23:16:49 -0000 1.3.2.1
+++ DefaultTypeRepository.java 9 Jan 2004 20:29:49 -0000 1.3.2.2
@@ -62,8 +62,8 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.data.ProfilePackage;
-import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.DeploymentProfile;
+import org.apache.avalon.composition.data.ComponentProfile;
import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ReferenceDescriptor;
@@ -173,7 +173,7 @@
ProfilePackage pack =
PACKAGE_BUILDER.createProfilePackage( name, clazz );
m_profiles.put( classname, pack );
- int n = pack.getDeploymentProfiles().length;
+ int n = pack.getComponentProfiles().length;
m_types.put( classname, type );
if( getLogger().isDebugEnabled() )
@@ -362,14 +362,14 @@
* @return a profile array containing at least one deployment profile
* @exception TypeUnknownException if the supplied type is unknown
*/
- public DeploymentProfile[] getProfiles( Type type )
+ public ComponentProfile[] getProfiles( Type type )
throws TypeUnknownException
{
final String classname = type.getInfo().getClassname();
ProfilePackage profiles = (ProfilePackage) m_profiles.get( classname );
if( profiles != null )
{
- return profiles.getDeploymentProfiles();
+ return profiles.getComponentProfiles();
}
else
{
@@ -394,13 +394,13 @@
* @exception TypeUnknownException if the supplied type is unknown
* @exception ProfileUnknownException if the supplied key is unknown
*/
- public DeploymentProfile getProfile( Type type, String key )
+ public ComponentProfile getProfile( Type type, String key )
throws TypeUnknownException, ProfileUnknownException
{
- DeploymentProfile[] profiles = getProfiles( type );
+ ComponentProfile[] profiles = getProfiles( type );
for( int i=0; i<profiles.length; i++ )
{
- DeploymentProfile profile = profiles[i];
+ ComponentProfile profile = profiles[i];
final String name = getProfileName( type, key );
if( profile.getName().equals( name ) ) return profile;
}
@@ -411,9 +411,9 @@
* Return the set of local profiles.
* @return a profile or null if a profile connot be resolve
*/
- private Profile[] getProfiles()
+ private DeploymentProfile[] getProfiles()
{
- return (Profile[]) m_profiles.values().toArray( new Profile[0] );
+ return (DeploymentProfile[]) m_profiles.values().toArray( new DeploymentProfile[0] );
}
/**
No revision
No revision
1.1.2.1 +98 -0 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/Attic/KernelEvent.java
1.1.2.1 +78 -0 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/Attic/KernelEventListener.java
1.1.2.1 +7 -0 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/Attic/package.html
No revision
No revision
1.16.2.2 +13 -6 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- project.xml 3 Jan 2004 13:10:48 -0000 1.16.2.1
+++ project.xml 9 Jan 2004 20:29:49 -0000 1.16.2.2
@@ -26,7 +26,7 @@
<artifactId>merlin-api</artifactId>
<version>3.4-DEV</version>
<properties>
- <avalon.classloader>api</avalon.classloader>
+ <avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
@@ -37,7 +37,7 @@
<artifactId>avalon-activation-api</artifactId>
<version>2.0-DEV</version>
<properties>
- <avalon.classloader>api</avalon.classloader>
+ <avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
<artifactId>avalon-repository-api</artifactId>
<version>1.2</version>
<properties>
- <avalon.classloader>api</avalon.classloader>
+ <avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
@@ -76,7 +76,7 @@
<artifactId>avalon-composition-api</artifactId>
<version>2.0-DEV</version>
<properties>
- <avalon.classloader>api</avalon.classloader>
+ <avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
@@ -98,7 +98,7 @@
<artifactId>avalon-meta-api</artifactId>
<version>1.3</version>
<properties>
- <avalon.classloader>api</avalon.classloader>
+ <avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
@@ -168,7 +168,7 @@
<dependency>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
- <version>1.2</version>
+ <version>1.2.2</version>
</dependency>
<!-- excalibur dependecies -->
@@ -189,6 +189,8 @@
<id>excalibur-configuration</id>
<version>1.1</version>
</dependency>
+
+ <!--
<dependency>
<id>excalibur-event</id>
<version>1.0.3</version>
@@ -198,9 +200,11 @@
<artifactId>excalibur-util-concurrent</artifactId>
<version>1.3.1</version>
</dependency>
+ -->
<!-- mx4j dependecies -->
+ <!--
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
@@ -211,14 +215,17 @@
<artifactId>mx4j-tools</artifactId>
<version>1.1.1</version>
</dependency>
+ -->
<!-- commons dependencies -->
+ <!--
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
</dependency>
+ -->
<!-- pre JDK 1.4 dependencies -->
No revision
No revision
1.7.2.5 +3 -3 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.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- DefaultFactory.java 7 Jan 2004 16:07:17 -0000 1.7.2.4
+++ DefaultFactory.java 9 Jan 2004 20:29:49 -0000 1.7.2.5
@@ -68,7 +68,7 @@
import org.apache.avalon.composition.data.ContainmentProfile;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.data.builder.XMLTargetsCreator;
-import org.apache.avalon.composition.data.builder.XMLDeploymentProfileCreator;
+import org.apache.avalon.composition.data.builder.XMLComponentProfileCreator;
import org.apache.avalon.composition.data.builder.XMLContainmentProfileCreator;
import org.apache.avalon.composition.logging.LoggingManager;
import org.apache.avalon.composition.logging.LoggingDescriptor;
@@ -132,8 +132,8 @@
private static Resources REZ =
ResourceManager.getPackageResources( DefaultFactory.class );
- private static final XMLDeploymentProfileCreator CREATOR =
- new XMLDeploymentProfileCreator();
+ private static final XMLComponentProfileCreator CREATOR =
+ new XMLComponentProfileCreator();
private static final XMLContainmentProfileCreator CONTAINER_CREATOR =
new XMLContainmentProfileCreator();
1.1.2.4 +7 -173 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DefaultKernel.java 7 Jan 2004 20:34:42 -0000 1.1.2.3
+++ DefaultKernel.java 9 Jan 2004 20:29:49 -0000 1.1.2.4
@@ -52,9 +52,6 @@
import java.net.URL;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.AttributeChangeNotification;
-
import org.apache.avalon.merlin.Kernel;
import org.apache.avalon.merlin.KernelCriteria;
import org.apache.avalon.merlin.KernelException;
@@ -81,8 +78,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DefaultKernel extends NotificationBroadcasterSupport
- implements Kernel, DefaultKernelMBean
+public class DefaultKernel implements Kernel
{
//--------------------------------------------------------------
// static
@@ -176,168 +172,6 @@
}
//--------------------------------------------------------------
- // DefaultKernelMBean
- //--------------------------------------------------------------
-
- /**
- * Return the state of the kernel.
- * @return a string representing the kernel state
- */
- public String getKernelState()
- {
- return m_stateString;
- }
-
- /**
- * Return an approximation to the total amount of memory currently
- * available for future allocated objects, measured in bytes.
- * @return the number of bytes of estimated free memory
- */
- public long getMemoryFree()
- {
- return Runtime.getRuntime().freeMemory();
- }
-
- /**
- * Returns the total amount of memory in the Java virtual machine. The value
- * returned by this method may vary over time, depending on the host environment.
- *
- * @return the total amount of memory currently available for current and future
- * objects, measured in bytes.
- */
- public long getMemoryTotal()
- {
- return Runtime.getRuntime().totalMemory();
- }
-
- /**
- * Return the percentage of free memory available.
- * @return the free memory percentage
- */
- public int getMemoryVariableRatio()
- {
- return (int) ((Runtime.getRuntime().freeMemory() * 100) /
- Runtime.getRuntime().totalMemory());
- }
-
- /**
- * Return the number of active threads.
- * @return the active thread count
- */
- public int getThreadCount()
- {
- return Thread.activeCount();
- }
-
- /**
- * Return the root directory to the shared repository.
- * @return the avalon home root repository directory
- */
- public String getRepositoryDirectory()
- {
- return m_criteria.getRepositoryDirectory().toString();
- }
-
- /**
- * Return the root directory to the merlin installation
- * @return the merlin home directory
- */
- public String getHomePath()
- {
- return m_criteria.getHomeDirectory().toString();
- }
-
- /**
- * Return the root directory to the merlin system repository
- * @return the merlin system repository directory
- */
- public String getSystemPath()
- {
- return m_criteria.getSystemDirectory().toString();
- }
-
- /**
- * Return the root directory to the merlin configurations
- * @return the merlin configuration directory
- */
- public String getConfigPath()
- {
- return m_criteria.getConfigDirectory().toString();
- }
-
- /**
- * Return the url to the kernel confiuration
- * @return the kernel configuration url
- */
- public String getKernelPath()
- {
- return m_criteria.getKernelURL().toString();
- }
-
- /**
- * Return the working client directory.
- * @return the working directory
- */
- public String getWorkingPath()
- {
- return m_criteria.getWorkingDirectory().toString();
- }
-
- /**
- * Return the temporary directory.
- * @return the temp directory
- */
- public String getTempPath()
- {
- return m_criteria.getTempDirectory().toString();
- }
-
- /**
- * Return the context directory from which relative
- * runtime home directories will be established for
- * components referencing urn:avalon:home
- *
- * @return the working directory
- */
- public String getContextPath()
- {
- return m_criteria.getContextDirectory().toString();
- }
-
- /**
- * Return the anchor directory to be used when resolving
- * library declarations in classload specifications.
- *
- * @return the anchor directory
- */
- public String getAnchorPath()
- {
- return m_criteria.getAnchorDirectory().toString();
- }
-
- /**
- * Return info generation policy. If TRUE the parameters
- * related to deployment will be listed on startup.
- *
- * @return the info policy
- */
- public boolean isInfoEnabled()
- {
- return m_criteria.isInfoEnabled();
- }
-
- /**
- * Return debug policy. If TRUE all logging channels will be
- * set to debug level (useful for debugging).
- *
- * @return the debug policy
- */
- public boolean isDebugEnabled()
- {
- return m_criteria.isDebugEnabled();
- }
-
- //--------------------------------------------------------------
// Kernel
//--------------------------------------------------------------
@@ -530,11 +364,11 @@
String old = m_stateString;
m_stateString = state;
long id = m_stateChangeSequenceId++;
- AttributeChangeNotification notification =
- new AttributeChangeNotification(
- this, id, System.currentTimeMillis(),
- "State change", "state", "string", old, state );
- sendNotification( notification );
+ //AttributeChangeNotification notification =
+ // new AttributeChangeNotification(
+ // this, id, System.currentTimeMillis(),
+ // "State change", "state", "string", old, state );
+ //sendNotification( notification );
}
private class DefaultState
No revision
No revision
1.1.2.1 +172 -0 avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/Attic/DefaultKernelMBean.java
1.1.2.1 +22 -0 avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/Attic/package.html
No revision
No revision
1.1.2.1 +65 -51 avalon/merlin/platform/installer/src/nsis/merlin.nsi
Index: merlin.nsi
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/installer/src/nsis/merlin.nsi,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- merlin.nsi 28 Dec 2003 22:04:18 -0000 1.1
+++ merlin.nsi 9 Jan 2004 20:29:50 -0000 1.1.2.1
@@ -1,61 +1,78 @@
;NSIS Modern User Interface version 1.63
;Welcome/Finish Page Example Script
-;Written by Joost Verburg
+;Written by Stephen McConnell
-!define MUI_PRODUCT "Merlin"
-!define MUI_VERSION "3.2"
+;--------------------------------
+;Include Modern UI
+
+ !include "MUI.nsh"
+
+;--------------------------------
+;Include Environment Handler
+
+ !include path.nsh
-!include "MUI.nsh"
-
;--------------------------------
;Configuration
;General
- OutFile "..\..\target\merlin-install-3.2.exe"
+ Name "Merlin Service Management"
+
+ ;General
+ OutFile "..\..\..\..\target\merlin-install-3.4-dev.exe"
;Folder selection page
- InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
+ InstallDir "$PROGRAMFILES\Merlin"
;Remember install folder
- InstallDirRegKey HKCU "Software\${MUI_PRODUCT}" ""
+ InstallDirRegKey HKCU "Software\Merlin" ""
;--------------------------------
-;Modern UI Configuration
+;Interface Settings
- !define MUI_WELCOMEPAGE
- !define MUI_LICENSEPAGE
- !define MUI_COMPONENTSPAGE
- !define MUI_DIRECTORYPAGE
- !define MUI_FINISHPAGE
-
!define MUI_ABORTWARNING
-
- !define MUI_UNINSTALLER
- !define MUI_UNCONFIRMPAGE
+;--------------------------------
+;Pages
+
+ !insertmacro MUI_PAGE_WELCOME
+ !insertmacro MUI_PAGE_LICENSE "./../etc/license.txt"
+ !insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MUI_PAGE_DIRECTORY
+ !insertmacro MUI_PAGE_INSTFILES
+ !insertmacro MUI_PAGE_FINISH
+
+ !insertmacro MUI_UNPAGE_WELCOME
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+ !insertmacro MUI_UNPAGE_FINISH
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Language Strings
-
- ;Description
- LangString DESC_SecCopyUI ${LANG_ENGLISH} "Merlin core system resources."
;--------------------------------
-;Data
-
- LicenseData "./../etc/license.txt"
-
-;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only useful for BZIP2 compression
- !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
+ ;!insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
+
+;--------------------------------
+Section ""
+
+ Push "MERLIN_HOME"
+ CreateDirectory $INSTDIR
+ GetFullPathName /SHORT $R1 $INSTDIR
+ Push $R1
+ Call WriteEnvStr
+
+ Push "%MERLIN_HOME%\bin"
+ Call AddToPath
+
+SectionEnd
+
;--------------------------------
;Installer Sections
@@ -70,36 +87,35 @@
File /r "..\..\..\..\target\merlin\**"
;Store install folder
- WriteRegStr HKCU "Software\${MUI_PRODUCT}" "" $INSTDIR
+ WriteRegStr HKCU "Software\Merlin" "" $INSTDIR
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
SectionEnd
-Section "Start Menu Shortcuts"
+Section ""
- CreateDirectory "$SMPROGRAMS\${MUI_PRODUCT}"
- CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-
- CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Readme.lnk" "$INSTDIR\README.txt" "" "$INSTDIR\README.txt" 0
+ CreateDirectory "$SMPROGRAMS\Merlin"
+ CreateShortCut "$SMPROGRAMS\Merlin\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+ CreateShortCut "$SMPROGRAMS\Merlin\Merlin Documentation.lnk" "$INSTDIR\docs\index.html"
+ CreateShortCut "$SMPROGRAMS\Merlin\Tutorials.lnk" "$INSTDIR\docs\starting\tutorial\index.html"
+ CreateShortCut "$SMPROGRAMS\Merlin\System Properties.lnk" "$INSTDIR\docs\merlin\kernel\properties.html"
+ CreateShortCut "$SMPROGRAMS\Merlin\XML Descriptors.lnk" "$INSTDIR\docs\meta\index.html"
+ CreateShortCut "$SMPROGRAMS\Merlin\Tools.lnk" "$INSTDIR\docs\tools\index.html"
SectionEnd
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
-
;--------------------------------
-;Uninstaller Section
+;Uninstaller
Section "Uninstall"
- ;Add your stuff here
+ Push "%MERLIN_HOME%\bin"
+ Call un.RemoveFromPath
+
+ Push "MERLIN_HOME"
+ Call un.DeleteEnvStr
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\INSTALL.TXT"
@@ -112,11 +128,9 @@
RMDir "$INSTDIR"
; remove shortcuts, if any
- Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.*"
- RMDir "$SMPROGRAMS\${MUI_PRODUCT}"
-
- DeleteRegKey /ifempty HKCU "Software\${MUI_PRODUCT}"
+ Delete "$SMPROGRAMS\Merlin\*.*"
+ RMDir "$SMPROGRAMS\Merlin"
- !insertmacro MUI_UNFINISHHEADER
+ DeleteRegKey /ifempty HKCU "Software\Merlin"
SectionEnd
No revision
No revision
1.6.2.1 +1 -1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- merlin 1 Jan 2004 23:34:45 -0000 1.6
+++ merlin 9 Jan 2004 20:29:50 -0000 1.6.2.1
@@ -1,7 +1,7 @@
#!/bin/sh
#
-export MERLIN_VERSION="3.2.2"
+export MERLIN_VERSION="@MERLIN_CLI_VERSION@"
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
1.9.2.1 +1 -1 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- merlin-server.sh 1 Jan 2004 23:34:45 -0000 1.9
+++ merlin-server.sh 9 Jan 2004 20:29:50 -0000 1.9.2.1
@@ -107,7 +107,7 @@
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Djava.ext.dirs=$JVM_EXT_DIRS"
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_BOOTSTRAP_JAR $ARGS"
1.10.2.1 +1 -1 avalon/merlin/platform/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.bat,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- merlin.bat 1 Jan 2004 23:34:45 -0000 1.10
+++ merlin.bat 9 Jan 2004 20:29:50 -0000 1.10.2.1
@@ -1,7 +1,7 @@
@echo off
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\@MERLIN_CLI_JAR@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
1.13.2.1 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- merlin.sh 1 Jan 2004 23:34:45 -0000 1.13
+++ merlin.sh 9 Jan 2004 20:29:50 -0000 1.13.2.1
@@ -42,7 +42,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
echo "Starting Merlin."
echo "================"
1.12.2.1 +1 -1 avalon/merlin/platform/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.bat,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- merlinx.bat 1 Jan 2004 23:34:45 -0000 1.12
+++ merlinx.bat 9 Jan 2004 20:29:50 -0000 1.12.2.1
@@ -5,7 +5,7 @@
set WORKING_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
:DoneMerlinSystem
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\@MERLIN_CLI_JAR@
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system %WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
1.12.2.1 +1 -1 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- merlinx.sh 1 Jan 2004 23:34:45 -0000 1.12
+++ merlinx.sh 9 Jan 2004 20:29:50 -0000 1.12.2.1
@@ -53,7 +53,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/@MERLIN_CLI_JAR@
echo "Starting Merlin."
echo "================"
No revision
No revision
1.9.2.1 +1 -1 avalon/merlin/platform/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/wrapper.conf,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- wrapper.conf 1 Jan 2004 23:34:45 -0000 1.9
+++ wrapper.conf 9 Jan 2004 20:29:50 -0000 1.9.2.1
@@ -10,7 +10,7 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/merlin-cli-3.2.2.jar
+wrapper.java.classpath.2=../lib/@MERLIN_CLI_JAR@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
No revision
No revision
1.11.2.1 +1 -1 avalon/merlin/platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- project.xml 29 Dec 2003 22:56:19 -0000 1.11
+++ project.xml 9 Jan 2004 20:29:50 -0000 1.11.2.1
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.7</version>
+ <version>3.4-DEV</version>
</dependency>
</dependencies>
No revision
No revision
1.5.2.1 +1 -1 avalon/merlin/platform/tutorials/parameterization/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project.xml 29 Dec 2003 22:56:19 -0000 1.5
+++ project.xml 9 Jan 2004 20:29:50 -0000 1.5.2.1
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.7</version>
+ <version>3.4-DEV</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org