mcconnell 2003/08/31 07:37:48
Modified: merlin maven.xml project.properties
merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
DefaultAppliance.java
merlin/activation-spi project.xml
Log:
Housekeeping.
Revision Changes Path
1.50 +71 -85 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- maven.xml 30 Aug 2003 20:43:01 -0000 1.49
+++ maven.xml 31 Aug 2003 14:37:48 -0000 1.50
@@ -1,15 +1,18 @@
<project default="jar:install-snapshot" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
- <ant:property file="${basedir}/../build.properties"/>
- <ant:property file="${basedir}/../project.properties"/>
<ant:property file="project.properties"/>
+ <ant:property name="maven.docs.src" value="${basedir}/merlin-platform/xdocs"/>
<ant:property name="merlin.build.inst" value="merlin"/>
- <ant:property name="merlin.build.inst.dir"
value="${maven.build.dir}/${merlin.build.inst}"/>
+ <ant:property name="merlin.build.inst.dir"
+ value="${maven.build.dir}/${merlin.build.inst}"/>
<ant:property name="maven.jar.manifest.extensions.add" value="true"/>
-
<ant:property name="maven.checkstyle.format" value="avalon"/>
<ant:property name="pom.organization.identifier" value="ASF"/>
<ant:property name="pom.specificationVersion" value="1.0"/>
+ <ant:property name="maven.license.licenseFile" value="${basedir}/LICENSE.txt"/>
+ <ant:property name="maven.javadoc.stylesheet"
+ value="${basedir}/merlin-platform/src/etc/stylesheet.css"/>
+
<ant:property environment="env"/>
<ant:property name="merlin.home" value="${env.MERLIN_HOME}"/>
@@ -17,6 +20,7 @@
<attainGoal name="merlin:clean"/>
<attainGoal name="merlin:dist"/>
<attainGoal name="merlin:site"/>
+ <attainGoal name="merlin:tutorials"/>
<attainGoal name="merlin:package"/>
<attainGoal name="merlin:replicate"/>
</goal>
@@ -50,7 +54,6 @@
into the user's local repository and put a copy in the
build target install directory.
-->
-
<maven:reactor
basedir="${basedir}"
includes="**/project.xml"
@@ -58,6 +61,7 @@
goals="jar:install-snapshot"
banner="Installing:"
ignoreFailures="false" />
+ <attainGoal name="merlin:plugin"/>
<maven:reactor
basedir="${basedir}"
@@ -70,13 +74,13 @@
toDir="${merlin.build.inst.dir}/bin/lib"/>
<!--
- Import the dependent jar files referenced by the SMP
- subproject into the install directory.
+ Import the dependent jar files referenced by platform.xml
+ into the install directory.
-->
<maven:reactor
basedir="${basedir}"
- includes="merlin-platform/project.xml"
- goals="merlin-import-external-jars"
+ includes="platform.xml"
+ goals="ximport"
banner="Resolving dependencies:"
ignoreFailures="false"/>
@@ -96,8 +100,6 @@
toDir="${merlin.build.inst.dir}/ext"/>
<delete dir="${merlin.build.inst.dir}/repository/xerces"/>
- <attainGoal name="merlinx-install-plugin"/>
-
<!--
Add the supporting resources.
-->
@@ -122,7 +124,15 @@
<include name="INSTALLATION.TXT"/>
</fileset>
</ant:copy>
+ </goal>
+ <goal name="merlin:plugin">
+ <maven:reactor
+ basedir="${basedir}"
+ includes="merlin-plugin/project.xml"
+ goals="plugin:install"
+ banner="Installing plugin:"
+ ignoreFailures="false"/>
</goal>
<goal name="merlin:package">
@@ -147,76 +157,84 @@
<j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>
<ant:echo>Building doc kit: ${docs.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
- <zipfileset dir="${basedir}/merlin-platform/target/docs" prefix="docs"/>
+ <zipfileset dir="${maven.build.dir}/docs" prefix="docs"/>
</ant:zip>
<j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
<ant:echo>Building tutorial kit: ${tutorial.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
- <zipfileset dir="${basedir}/merlin-platform/target/tutorials"
prefix="tutorial"/>
+ <zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
</ant:zip>
</goal>
<!--
- Import the jar files declared as dependecies of the smp project. This
+ Import the jar files declared as dependecies from platform.xml. This
includes all of the external jar files needed to run merlin. Dependent
jar files are copied from the user's local repository to the merlin
- install system library.
+ install repository.
-->
- <goal name="merlin-import-external-jars">
+ <goal name="ximport">
<j:forEach var="dep" items="${pom.dependencies}">
- <mkdir
dir="${basedir}/../target/${merlin.build.inst}/repository/${dep.artifactDirectory}/jars"/>
+ <mkdir
dir="${maven.build.dir}/${merlin.build.inst}/repository/${dep.artifactDirectory}/jars"/>
<copy
-
todir="${basedir}/../target/${merlin.build.inst}/repository/${dep.artifactDirectory}/jars/"
+
todir="${maven.build.dir}/${merlin.build.inst}/repository/${dep.artifactDirectory}/jars/"
file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
</j:forEach>
</goal>
<!--
- The site goal is called by the merlin-install goal and handles the generation
- of the documetation for the entire Merlin project including the related sub-
- projects.
+ Generation of the documentation for the entire Merlin project including the
+ related subprojects.
-->
<goal name="merlin:site"
description="Build the Merlin site.">
<maven:reactor
basedir="${basedir}"
- includes="merlin-platform/project.xml"
- goals="xjavadoc,site"
- banner="Building site."
+ includes="platform.xml"
+ goals="xjavadoc,license,site"
+ banner="Building site:"
ignoreFailures="false"/>
</goal>
- <!-- convinience docs generation within runing javadoc -->
- <goal name="merlin-site-xdocs"
- description="Build the Merlin site.">
+ <!--
+ The the tuturials.
+ -->
+ <goal name="merlin:tutorials"
+ description="Build tutorials.">
<maven:reactor
basedir="${basedir}"
- includes="merlin-platform/project.xml"
- goals="site"
- banner="Building site."
+ includes="platform.xml"
+ goals="xtutorials"
+ banner="Building tutorials:"
ignoreFailures="false"/>
</goal>
- <!-- convinience javadoc generation within runing xdocs -->
- <goal name="merlin-site-javadoc"
- description="Build the Merlin site.">
- <maven:reactor
- basedir="${basedir}"
- includes="merlin-platform/project.xml"
- goals="xjavadoc"
- banner="Building site."
- ignoreFailures="false"/>
+ <goal name="xtutorials">
+ <ant:mkdir dir="${basedir}/target/tutorials"/>
+ <ant:copy todir="${basedir}/target/tutorials">
+ <fileset dir="${basedir}/merlin-platform/tutorials">
+ <include name="README.TXT"/>
+ <include name="project.xml"/>
+ <include name="maven.xml"/>
+ <include name="hello/**"/>
+ <include name="configuration/**"/>
+ <include name="context/**"/>
+ <include name="composition/**"/>
+ <include name="dependencies/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/*.log"/>
+ </fileset>
+ </ant:copy>
</goal>
<goal name="xjavadoc">
- <ant:mkdir dir="${basedir}/target/docs/api" />
+ <ant:mkdir dir="${maven.build.dir}/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"/>
- <ant:javadoc destdir="${basedir}/target/docs/api"
+ <ant:javadoc destdir="${maven.build.dir}/docs/api"
doctitle="<h1>Merlin Service Management API</h1>"
noindex="false" author="true" use="true"
windowtitle="${title}"
@@ -226,17 +244,18 @@
<j:forEach var="packageGroup" items="${pom.packageGroups}">
<group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
</j:forEach>
- <sourcepath path="${basedir}/../repository/spi/src/java"/>
- <sourcepath path="${basedir}/../repository/impl/src/java"/>
- <sourcepath path="${basedir}/../extension-spi/src/java"/>
- <sourcepath path="${basedir}/../extension/src/java"/>
- <sourcepath path="${basedir}/../composition-spi/src/java"/>
- <sourcepath path="${basedir}/../composition/src/java"/>
- <sourcepath path="${basedir}/../activation-api/src/java"/>
- <sourcepath path="${basedir}/../activation-spi/src/java"/>
- <sourcepath path="${basedir}/../activation/src/java"/>
- <sourcepath path="${basedir}/../kernel/spi/src/java"/>
- <sourcepath path="${basedir}/../kernel/impl/src/java"/>
+ <sourcepath path="${basedir}/repository/spi/src/java"/>
+ <sourcepath path="${basedir}/repository/impl/src/java"/>
+ <sourcepath path="${basedir}/extension-spi/src/java"/>
+ <sourcepath path="${basedir}/extension/src/java"/>
+ <sourcepath path="${basedir}/composition/api/src/java"/>
+ <sourcepath path="${basedir}/composition/spi/src/java"/>
+ <sourcepath path="${basedir}/composition/impl/src/java"/>
+ <sourcepath path="${basedir}/activation-api/src/java"/>
+ <sourcepath path="${basedir}/activation-spi/src/java"/>
+ <sourcepath path="${basedir}/activation/src/java"/>
+ <sourcepath path="${basedir}/kernel/spi/src/java"/>
+ <sourcepath path="${basedir}/kernel/impl/src/java"/>
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
@@ -251,39 +270,6 @@
<link href="${excalibur.event.link}" />
</ant:javadoc>
</goal>
-
- <!--
- The site goal is called by the merlin-install goal and handles the generation
- of the documetation for the entire Merlin project including the related sub-
- projects.
- -->
- <goal name="merlin-site-deploy"
- description="Deploy the Merlin site.">
- <maven:reactor
- basedir="${basedir}"
- includes="merlin-platform/project.xml"
- goals="site:fsdeploy"
- banner="Deploying site."
- ignoreFailures="false"/>
- </goal>
-
- <!--
- Install the merlin plugin into the Maven plugin suite.
- -->
- <goal name="merlin-install-plugin" prereqs="merlin:dist"
- description="Install Merlin Maven plugin.">
- <attainGoal name="merlinx-install-plugin"/>
- </goal>
-
- <goal name="merlinx-install-plugin">
- <maven:reactor
- basedir="${basedir}"
- includes="merlin-plugin/project.xml"
- goals="plugin:install"
- banner="Installing plugin:"
- ignoreFailures="false"/>
- </goal>
-
<!--
==============================================================================
1.5 +2 -2 avalon-sandbox/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 27 Jul 2003 03:15:36 -0000 1.4
+++ project.properties 31 Aug 2003 14:37:48 -0000 1.5
@@ -5,8 +5,8 @@
maven.ui.banner.background = #fff
maven.ui.banner.foreground = #000
-maven.xdoc.jsl = file:/${basedir}/../merlin-platform/src/etc/site.jsl
-maven.javadoc.stylesheet =${basedir}/../merlin-platform/src/etc/stylesheet.css
+maven.xdoc.jsl = file:/${basedir}/merlin-platform/src/etc/site.jsl
+maven.javadoc.stylesheet =${basedir}/merlin-platform/src/etc/stylesheet.css
#
1.9 +51 -2
avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultAppliance.java 30 Aug 2003 18:36:54 -0000 1.8
+++ DefaultAppliance.java 31 Aug 2003 14:37:48 -0000 1.9
@@ -66,9 +66,11 @@
import org.apache.avalon.activation.lifestyle.impl.ThreadLifestyleHandler;
import org.apache.avalon.activation.lifestyle.impl.PooledLifestyleHandler;
import org.apache.avalon.activation.lifestyle.impl.TransientLifestyleHandler;
-import org.apache.avalon.activation.lifecycle.LifecycleException;
import org.apache.avalon.activation.lifecycle.ContextualizationHandler;
import org.apache.avalon.activation.lifecycle.Factory;
+import org.apache.avalon.activation.lifecycle.LifecycleException;
+import org.apache.avalon.activation.lifecycle.LifecycleCreateExtension;
+import org.apache.avalon.activation.lifecycle.LifecycleDestroyExtension;
import org.apache.avalon.composition.data.ContextDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
import org.apache.avalon.composition.model.ContextModel;
@@ -874,6 +876,53 @@
}
else
{
+ getLogger().warn( error, e );
+ }
+ }
+ finally
+ {
+ provider.release( this, handler );
+ }
+ }
+
+ if( flag && LifecycleCreateExtension.class.isAssignableFrom( c ) )
+ {
+ LifecycleCreateExtension handler =
+ (LifecycleCreateExtension) provider.resolve( this );
+ try
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ int id = System.identityHashCode( instance );
+ getLogger().debug( "applying model create stage to: " + id
);
+ }
+ handler.create( m_model, stage, instance );
+ }
+ finally
+ {
+ provider.release( this, handler );
+ }
+ }
+ else if( !flag && LifecycleDestroyExtension.class.isAssignableFrom( c )
)
+ {
+ LifecycleDestroyExtension handler =
+ (LifecycleDestroyExtension) provider.resolve( this );
+
+ try
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ int id = System.identityHashCode( instance );
+ getLogger().debug( "applying model destroy stage to: " + id
);
+ }
+ handler.destroy( m_model, stage, instance );
+ }
+ catch( Throwable e )
+ {
+ if( getLogger().isWarnEnabled() )
+ {
+ final String error =
+ "Ignoring destroy stage error";
getLogger().warn( error, e );
}
}
1.5 +1 -1 avalon-sandbox/merlin/activation-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation-spi/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 21 Aug 2003 00:52:47 -0000 1.4
+++ project.xml 31 Aug 2003 14:37:48 -0000 1.5
@@ -43,7 +43,7 @@
<dependency>
<groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-spi</artifactId>
+ <artifactId>avalon-composition-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
