mcconnell 2003/08/20 17:52:47
Modified: merlin maven.xml project.xml
merlin/activation project.xml
merlin/activation-api project.xml
merlin/activation-spi project.xml
merlin/composition project.xml
merlin/composition-spi project.xml
merlin/kernel/bootstrap project.xml
merlin/merlin-extensions/merlin-servlet project.xml
merlin/merlin-platform maven.xml project.xml
merlin/repository/impl project.xml
merlin/repository/spi project.xml
Log:
Global commit.
Revision Changes Path
1.41 +44 -0 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- maven.xml 20 Aug 2003 09:55:12 -0000 1.40
+++ maven.xml 21 Aug 2003 00:52:46 -0000 1.41
@@ -63,11 +63,14 @@
<ant:copy
file="${merlin.build.inst.dir}/repository/xml-apis/jars/xml-apis-1.0.b2.jar"
toDir="${merlin.build.inst.dir}/ext"/>
+ <delete dir="${merlin.build.inst.dir}/repository/xml-apis"/>
<ant:copy
file="${merlin.build.inst.dir}/repository/xerces/jars/xerces-2.2.1.jar"
toDir="${merlin.build.inst.dir}/ext"/>
+ <delete dir="${merlin.build.inst.dir}/repository/xerces"/>
<attainGoal name="merlinx-install-plugin"/>
+
<!--<ant:copy
file="${basedir}/merlin-plugin/target/merlin-plugin-1.0.jar"
toDir="${merlin.build.inst.dir}/repository/merlin/jars"/>-->
@@ -91,6 +94,46 @@
</goal>
+ <goal name="merlin-package">
+ <attainGoal name="merlin-clean"/>
+ <attainGoal name="merlin-dist"/>
+ <attainGoal name="merlin-site"/>
+ <attainGoal name="package"/>
+ </goal>
+
+ <goal name="package">
+ <maven:snapshot project="${pom}"/>
+ <j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
+ <j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
+
+ <ant:echo>Building distribution: ${package.name}.zip</ant:echo>
+ <ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
+ <zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
+ <fileset dir="${basedir}">
+ <include name="INSTALLATION.TXT"/>
+ </fileset>
+ <fileset dir="${basedir}/merlin-plugin/target">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/../meta/plugin/target">
+ <include name="*.jar"/>
+ </fileset>
+ </ant:zip>
+
+ <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"/>
+ </ant:zip>
+
+ <ant:echo>Building tutorial kit: ${tutorial.name}.zip</ant:echo>
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
+ <ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
+ <zipfileset dir="${basedir}/merlin-platform/target/tutorials"
prefix="tutorial"/>
+ </ant:zip>
+
+ </goal>
+
<!--
Import the jar files declared as dependecies of the smp project. This
includes all of the external jar files needed to run merlin. Dependent
@@ -120,6 +163,7 @@
banner="Building site."
ignoreFailures="false"/>
</goal>
+
<!-- convinience docs generation within runing javadoc -->
<goal name="merlin-site-xdocs"
1.31 +1 -1 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- project.xml 19 Aug 2003 08:32:32 -0000 1.30
+++ project.xml 21 Aug 2003 00:52:46 -0000 1.31
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Merlin POM</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>3.0</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.5 +1 -0 avalon-sandbox/merlin/activation/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 19 Aug 2003 03:51:23 -0000 1.4
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.5
@@ -8,6 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>
1.2 +1 -0 avalon-sandbox/merlin/activation-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation-api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Aug 2003 03:29:50 -0000 1.1
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.2
@@ -8,6 +8,7 @@
<id>avalon-activation-api</id>
<name>Avalon Activation API</name>
<package>org.apache.avalon.activation</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation API</shortDescription>
1.4 +1 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Aug 2003 03:51:23 -0000 1.3
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.4
@@ -8,6 +8,7 @@
<id>avalon-activation-spi</id>
<name>Avalon Activation SPI</name>
<package>org.apache.avalon.activation</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation Service Provider Interface</shortDescription>
1.8 +1 -0 avalon-sandbox/merlin/composition/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Aug 2003 22:58:49 -0000 1.7
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.8
@@ -8,6 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>
1.8 +1 -0 avalon-sandbox/merlin/composition-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition-spi/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Aug 2003 22:58:50 -0000 1.7
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.8
@@ -8,6 +8,7 @@
<id>avalon-composition-spi</id>
<name>Avalon Composition SPI</name>
<package>org.apache.avalon.assembly</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Service Provider Interface</shortDescription>
1.3 +1 -0 avalon-sandbox/merlin/kernel/bootstrap/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 17 Aug 2003 00:51:57 -0000 1.2
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.3
@@ -6,6 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-bootstrap</id>
<name>Merlin Kernel CLI</name>
+ <currentVersion>1.0</currentVersion>
<package>*</package>
<currentVersion>1.0</currentVersion>
1.10 +1 -0
avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 7 Aug 2003 17:23:00 -0000 1.9
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.10
@@ -7,6 +7,7 @@
<id>merlin-servlet</id>
<name>Merlin Kernel Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2003</inceptionYear>
<shortDescription>Merlin Kernel Servlet</shortDescription>
1.3 +21 -1 avalon-sandbox/merlin/merlin-platform/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 24 Jun 2003 22:04:44 -0000 1.2
+++ maven.xml 21 Aug 2003 00:52:47 -0000 1.3
@@ -1,4 +1,4 @@
-<project default="site" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="site" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<property name="maven.license.licenseFile"
value="${basedir}/../LICENSE.txt"/>
@@ -8,5 +8,25 @@
<preGoal name="site">
<attainGoal name="license"/>
</preGoal>
+
+ <postGoal name="site">
+ <attainGoal name="tutorials"/>
+ </postGoal>
+
+ <goal name="tutorials">
+ <ant:mkdir dir="${basedir}/target/tutorials"/>
+ <ant:copy todir="${basedir}/target/tutorials">
+ <fileset dir="${basedir}/tutorials">
+ <include name="README.TXT"/>
+ <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>
</project>
1.19 +0 -2 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 20 Aug 2003 11:57:13 -0000 1.18
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.19
@@ -6,8 +6,6 @@
<name>Merlin Platform</name>
<package>org.apache.avalon</package>
- <currentVersion>1.0</currentVersion>
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Service Management Platform</shortDescription>
<dependencies>
1.2 +1 -0 avalon-sandbox/merlin/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/repository/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 11 Aug 2003 22:37:14 -0000 1.1
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.2
@@ -8,6 +8,7 @@
<id>avalon-repository-impl</id>
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
+ <currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>
1.2 +3 -3 avalon-sandbox/merlin/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/repository/spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 11 Aug 2003 22:37:16 -0000 1.1
+++ project.xml 21 Aug 2003 00:52:47 -0000 1.2
@@ -7,11 +7,11 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-spi</id>
<name>Avalon Repository SPI</name>
+ <currentVersion>1.0</currentVersion>
+
<package>org.apache.avalon.repository</package>
<inceptionYear>2002</inceptionYear>
- <shortDescription>
-Merlin SMP Kernel SPI
- </shortDescription>
+ <shortDescription>Avalon Repository SPI</shortDescription>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
