mcconnell 2004/05/08 11:24:18
Modified: activation maven.xml
composition maven.xml
framework maven.xml
logging maven.xml
maven-plugins/artifact project.xml
maven-plugins maven.xml
. maven.xml project.xml
merlin INSTALL.TXT external.xml maven.xml
merlin/plugin .cvsignore
merlin/servlet .cvsignore
meta/api .cvsignore project.xml
meta/impl .cvsignore project.xml
meta maven.xml
meta/plugin .cvsignore project.xml
meta/spi .cvsignore project.xml
meta/tools .cvsignore project.xml
repository/api .cvsignore project.xml
repository/cli .cvsignore project.xml
repository/impl .cvsignore project.xml
repository/main .cvsignore project.xml
repository maven.xml
repository/spi .cvsignore project.xml
repository/test .cvsignore project.xml
repository/util .cvsignore project.xml
util/criteria project.xml
util/defaults .cvsignore project.xml
util/env .cvsignore project.xml
util/exception .cvsignore project.xml
util/extension/api project.xml
util/extension/impl project.xml
util/i18n .cvsignore project.xml
util maven.xml
versioning avalon-framework.ent avalon-merlin.ent
Log:
Housekeeping.
Revision Changes Path
1.3 +5 -26 avalon/activation/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/activation/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 23 Apr 2004 07:29:19 -0000 1.2
+++ maven.xml 8 May 2004 18:24:16 -0000 1.3
@@ -23,40 +23,19 @@
goals="jar:install"
banner="Building:"
ignoreFailures="false"
- postProcessing="true" />
+ postProcessing="true"/>
<ant:copy todir="${maven.build.dir}/jars">
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path"
- value="${child.artifactId}-${child.currentVersion}.jar"/>
- <checksum file="${maven.build.dir}/jars/${path}" fileext=".md5"/>
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/jars/${path}"/>
- </ant:exec>
- </j:if>
- <util:file var="metaFile"
name="${maven.build.dir}/jars/${path}.jar.meta"/>
- <j:if test="${metaFile.exists()}">
- <checksum file="${metaFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${metaFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- </j:forEach>
+
</goal>
<goal name="avalon:dist" prereqs="avalon:build"/>
1.3 +2 -14 avalon/composition/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/composition/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 22 Apr 2004 02:45:42 -0000 1.2
+++ maven.xml 8 May 2004 18:24:16 -0000 1.3
@@ -24,27 +24,15 @@
banner="Building:"
ignoreFailures="false"
postProcessing="true" />
-
<ant:copy todir="${maven.build.dir}/jars">
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path"
- value="${child.artifactId}-${child.currentVersion}.jar"/>
- <checksum file="${maven.build.dir}/jars/${path}" fileext=".md5"/>
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/jars/${path}"/>
- </ant:exec>
- </j:if>
- </j:forEach>
</goal>
<goal name="avalon:dist" prereqs="avalon:build"/>
1.13 +3 -16 avalon/framework/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/framework/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 30 Apr 2004 15:14:41 -0000 1.12
+++ maven.xml 8 May 2004 18:24:16 -0000 1.13
@@ -46,25 +46,12 @@
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
-
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
- <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
- <j:if test="${jarFile.exists()}">
- <checksum file="${jarFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${jarFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- </j:forEach>
<!-- Add composite jar -->
<ant:jar jarfile="${maven.build.dir}/jars/${maven.final.name}.jar"
1.13 +2 -27 avalon/logging/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/logging/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 1 May 2004 17:03:44 -0000 1.12
+++ maven.xml 8 May 2004 18:24:16 -0000 1.13
@@ -86,37 +86,12 @@
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
- <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
- <j:if test="${jarFile.exists()}">
- <checksum file="${jarFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${jarFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- <util:file var="metaFile"
name="${maven.build.dir}/jars/${path}.jar.meta"/>
- <j:if test="${metaFile.exists()}">
- <checksum file="${metaFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${metaFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- </j:forEach>
<maven:reactor basedir="${basedir}"
includes="test/project.xml"
1.2 +1 -1 avalon/maven-plugins/artifact/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 22 Apr 2004 00:55:57 -0000 1.1
+++ project.xml 8 May 2004 18:24:16 -0000 1.2
@@ -4,7 +4,7 @@
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-plugin-id;</id>
1.6 +22 -1 avalon/maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 23 Apr 2004 04:28:31 -0000 1.5
+++ maven.xml 8 May 2004 18:24:17 -0000 1.6
@@ -35,7 +35,28 @@
banner="Installing:"
goals="plugin:install"
ignoreFailures="false"
- postProcessing="false" />
+ postProcessing="true" />
+
+ <ant:copy todir="${maven.build.dir}/plugins">
+ <j:forEach var="child" items="${reactorProjects}">
+ <ant:fileset dir="${child.file.parentFile}/target">
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ </ant:fileset>
+ </j:forEach>
+ </ant:copy>
+ <j:forEach var="child" items="${reactorProjects}">
+ <j:set var="path"
+ value="${child.artifactId}-${child.currentVersion}.jar"/>
+ <checksum file="${maven.build.dir}/plugins/${path}" fileext=".md5"/>
+ <j:if test="${maven_gpg_exe != null}">
+ <ant:exec executable="${maven_gpg_exe}">
+ <ant:arg value="-a"/>
+ <ant:arg value="--yes"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.build.dir}/plugins/${path}"/>
+ </ant:exec>
+ </j:if>
+ </j:forEach>
</goal>
<goal name="avalon:dist" prereqs="avalon:build"/>
1.23 +38 -0 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 30 Apr 2004 11:36:30 -0000 1.22
+++ maven.xml 8 May 2004 18:24:17 -0000 1.23
@@ -193,4 +193,42 @@
</j:if>
</postGoal>
+ <postGoal name="jar:jar">
+ <j:set var="path"
+ value="${pom.artifactId}-${pom.currentVersion}.jar"/>
+ <checksum file="${maven.build.dir}/${path}" fileext=".md5"/>
+ <j:if test="${maven_gpg_exe != null}">
+ <ant:exec executable="${maven_gpg_exe}">
+ <ant:arg value="-a"/>
+ <ant:arg value="--yes"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.build.dir}/${path}"/>
+ </ant:exec>
+ </j:if>
+ </postGoal>
+
+ <postGoal name="jar:install">
+ <j:set var="path"
+ value="${pom.artifactId}-${pom.currentVersion}.jar"/>
+ <ant:copy todir="${maven.repo.local}/${pom.groupId}/jars"
preserveLastModified="true">
+ <ant:fileset dir="${maven.build.dir}">
+ <ant:include name="${path}.meta"/>
+ <ant:include name="${path}.asc"/>
+ <ant:include name="${path}.md5"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+ <postGoal name="plugin:install">
+ <j:set var="path"
+ value="${pom.artifactId}-${pom.currentVersion}.jar"/>
+ <ant:copy todir="${maven.repo.local}/${pom.groupId}/plugins"
preserveLastModified="true">
+ <ant:fileset dir="${maven.build.dir}">
+ <ant:include name="${path}.meta"/>
+ <ant:include name="${path}.asc"/>
+ <ant:include name="${path}.md5"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
</project>
1.11 +1 -1 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 30 Apr 2004 05:50:39 -0000 1.10
+++ project.xml 8 May 2004 18:24:17 -0000 1.11
@@ -240,7 +240,7 @@
<include>**/*TestCase.*</include>
</includes>
<excludes>
- <include>**/Abstract*.*</include>
+ <exclude>**/Abstract*.*</exclude>
</excludes>
<resources>
<resource>
1.23 +96 -96 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- INSTALL.TXT 5 May 2004 19:54:29 -0000 1.22
+++ INSTALL.TXT 8 May 2004 18:24:17 -0000 1.23
@@ -1,96 +1,96 @@
-
-PROJECT: Merlin @VERSION@
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.TXT
-
-Available development tools related to the maven build system include:
-
- @META_PLUGIN_JAR@
- @MERLIN_PLUGIN_JAR@
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Under Linux you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME/repository where AVALON_HOME defaults to
-${user.home}/.avalon. To override the AVALON_HOME location you can
-either define a AVALON_HOME environment variable or you can add a
-merlin.properties file to ${user.home} containing the
-"merlin.repository" property key and a value point to you preferred
-repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
- $ merlin -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the
supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JVM argument under the
-MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+
+Available development tools related to the maven build system include:
+
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Linux you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME/repository where AVALON_HOME defaults to
+${user.home}/.avalon. To override the AVALON_HOME location you can
+either define a AVALON_HOME environment variable or you can add a
+merlin.properties file to ${user.home} containing the
+"merlin.repository" property key and a value point to you preferred
+repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+ $ merlin -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the
supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
1.15 +125 -2 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- external.xml 23 Apr 2004 07:29:19 -0000 1.14
+++ external.xml 8 May 2004 18:24:17 -0000 1.15
@@ -14,9 +14,30 @@
<dependencies>
<dependency>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-impl-id;</artifactId>
+ <version>&avalon-framework-impl-version;</version>
+ </dependency>
+
+ <dependency>
<groupId>&avalon-repository-id;</groupId>
- <artifactId>&avalon-repository-impl-id;</artifactId>
- <version>&avalon-repository-impl-version;</version>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-spi-id;</artifactId>
+ <version>&avalon-repository-spi-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
<dependency>
<groupId>&avalon-repository-id;</groupId>
@@ -28,6 +49,11 @@
<artifactId>&avalon-repository-cli-id;</artifactId>
<version>&avalon-repository-cli-version;</version>
</dependency>
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-impl-id;</artifactId>
+ <version>&avalon-repository-impl-version;</version>
+ </dependency>
<dependency>
<groupId>&avalon-logging-id;</groupId>
@@ -36,6 +62,11 @@
</dependency>
<dependency>
<groupId>&avalon-logging-id;</groupId>
+ <artifactId>&avalon-logging-spi-id;</artifactId>
+ <version>&avalon-logging-spi-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-logging-id;</groupId>
<artifactId>&avalon-logging-impl-id;</artifactId>
<version>&avalon-logging-impl-version;</version>
</dependency>
@@ -67,6 +98,37 @@
</dependency>
<dependency>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-spi-id;</artifactId>
+ <version>&avalon-composition-spi-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-impl-id;</artifactId>
+ <version>&avalon-composition-impl-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-spi-id;</artifactId>
+ <version>&avalon-meta-spi-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-impl-id;</artifactId>
+ <version>&avalon-meta-impl-version;</version>
+ </dependency>
+ <dependency>
<groupId>&avalon-meta-id;</groupId>
<artifactId>&avalon-meta-plugin-id;</artifactId>
<version>&avalon-meta-plugin-version;</version>
@@ -75,9 +137,70 @@
<dependency>
<groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-criteria-id;</artifactId>
+ <version>&avalon-util-criteria-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-defaults-id;</artifactId>
+ <version>&avalon-util-defaults-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-env-id;</artifactId>
+ <version>&avalon-util-env-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-exception-id;</artifactId>
+ <version>&avalon-util-exception-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-plugin-id;</artifactId>
<version>&avalon-util-plugin-version;</version>
<type>plugin</type>
+ </dependency>
+
+ <dependency>
+ <groupId>excalibur-configuration</groupId>
+ <artifactId>excalibur-configuration</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-lifecycle</groupId>
+ <artifactId>excalibur-lifecycle-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
</dependency>
</dependencies>
1.86 +53 -96 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- maven.xml 6 May 2004 14:24:25 -0000 1.85
+++ maven.xml 8 May 2004 18:24:17 -0000 1.86
@@ -105,7 +105,8 @@
-->
<goal name="avalon:build" description="Build Merlin."
- prereqs="xmain,xkernel,xplugin,xexternals,xinstall"/>
+ prereqs="xmain,xkernel,xplugin,xexternals,xinstall">
+ </goal>
<goal name="xmain" description="Build Merlin.">
@@ -116,36 +117,17 @@
ignoreFailures="false"
postProcessing="true" />
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="dir" value="${maven.build.dir}/merlin/system"/>
- <j:set var="path"
-
value="${dir}/${child.groupId}/jars/${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:copy todir="${dir}/${child.groupId}/jars"
- preserveLastModified="true">
+ <ant:copy todir="${maven.build.dir}/jars">
+ <j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
- </ant:copy>
- <checksum file="${path}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${path}"/>
- </ant:exec>
- </j:if>
- <j:set var="deps" value="${child.dependencies}"/>
- <j:forEach var="dep" items="${deps}">
- <ant:copy todir="${maven.build.dir}/merlin/system"
- preserveLastModified="true">
- <ant:fileset dir="${maven.repo.local}">
- <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
- </ant:fileset>
- </ant:copy>
</j:forEach>
- </j:forEach>
+ </ant:copy>
+
</goal>
<goal name="xkernel">
@@ -155,69 +137,57 @@
banner="Installing:"
ignoreFailures="false"
postProcessing="true" />
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="dir"
- value="${maven.build.dir}/merlin/system"/>
- <j:set var="path"
-
value="${dir}/${child.groupId}/jars/${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:copy todir="${dir}/${child.groupId}/jars"
- preserveLastModified="true">
+
+ <ant:copy todir="${maven.build.dir}/jars">
+ <j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
- </ant:copy>
- <checksum file="${path}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${path}"/>
- </ant:exec>
- </j:if>
- <!-- FIXME update the cli scripts to reference cli under the
merlin.system repo -->
- <j:if test="${child.artifactId == 'merlin-cli'}">
- <ant:copy todir="${maven.build.dir}/merlin/bin/lib"
- preserveLastModified="true">
- <ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- </ant:fileset>
- </ant:copy>
- </j:if>
- </j:forEach>
+ </j:forEach>
+ </ant:copy>
</goal>
<goal name="xexternals">
+
<maven:reactor basedir="${basedir}"
includes="external.xml"
banner="Installing:"
ignoreFailures="false"
postProcessing="true" />
+ <ant:copy todir="${maven.build.dir}/merlin/system/${pom.groupId}/jars">
+ <ant:fileset dir="${maven.build.dir}/jars"/>
+ </ant:copy>
+ <ant:copy
todir="${maven.build.dir}/merlin/plugins/${pom.groupId}/plugins">
+ <ant:fileset dir="${maven.build.dir}/plugins"/>
+ </ant:copy>
+
<j:forEach var="child" items="${reactorProjects}">
<echo>${child}</echo>
<j:set var="deps" value="${child.dependencies}"/>
- <j:forEach var="dep" items="${deps}">
-
<echo>${maven.repo.local}/${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}</echo>
- <j:if test="${dep.getType()=='jar'}">
- <j:set var="destination" value="system"/>
- </j:if>
- <j:if test="${dep.getType()=='plugin'}">
- <j:set var="destination" value="plugins"/>
- </j:if>
- <ant:copy todir="${maven.build.dir}/merlin/${destination}"
- preserveLastModified="true">
- <ant:fileset dir="${maven.repo.local}">
- <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
- <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}.meta"/>
- </ant:fileset>
- </ant:copy>
- </j:forEach>
+ <j:forEach var="dep" items="${deps}">
+
<echo>${maven.repo.local}/${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}</echo>
+ <j:if test="${dep.getType()=='jar'}">
+ <j:set var="destination" value="system"/>
+ </j:if>
+ <j:if test="${dep.getType()=='plugin'}">
+ <j:set var="destination" value="plugins"/>
+ </j:if>
+ <ant:copy todir="${maven.build.dir}/merlin/${destination}"
+ preserveLastModified="true">
+ <ant:fileset dir="${maven.repo.local}">
+ <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
+ <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}.meta"/>
+ <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}.asc"/>
+ <ant:include
name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}.md5"/>
+ </ant:fileset>
+ </ant:copy>
+ </j:forEach>
</j:forEach>
+
</goal>
<goal name="xplugin">
@@ -227,30 +197,17 @@
goals="plugin:install"
ignoreFailures="false"
postProcessing="true" />
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="dir"
- value="${maven.build.dir}/merlin/plugins"/>
- <j:set var="path"
-
value="${dir}/${child.groupId}/plugins/${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:copy todir="${dir}/${child.groupId}/plugins"
- preserveLastModified="true">
+
+ <ant:copy todir="${maven.build.dir}/plugins">
+ <j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
- </ant:copy>
- <checksum file="${path}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${path}"/>
- </ant:exec>
- </j:if>
- </j:forEach>
+ </j:forEach>
+ </ant:copy>
</goal>
<!--
1.3 +1 -0 avalon/merlin/plugin/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/merlin/plugin/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Nov 2003 01:30:49 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -4,3 +4,4 @@
snapshot.properties
.classpath
.project
+build.properties
1.2 +1 -0 avalon/merlin/servlet/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/merlin/servlet/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Dec 2003 01:43:47 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.2
@@ -3,3 +3,4 @@
velocity.log
.classpath
.project
+build.properties
1.2 +1 -0 avalon/meta/api/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/meta/api/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Nov 2003 23:16:05 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.2
@@ -1,3 +1,4 @@
target
.classpath
.project
+build.properties
1.9 +1 -3 avalon/meta/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/api/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 8 Apr 2004 14:16:27 -0000 1.8
+++ project.xml 8 May 2004 18:24:17 -0000 1.9
@@ -5,17 +5,15 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-api-id;</id>
<currentVersion>&avalon-meta-api-version;</currentVersion>
- <id>avalon-meta-api</id>
<name>Avalon Meta Model API</name>
<package>org.apache.avalon.meta</package>
- <!--<currentVersion>1.3</currentVersion>-->
<inceptionYear>2002</inceptionYear>
<shortDescription>Meta Model API</shortDescription>
1.3 +1 -0 avalon/meta/impl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/meta/impl/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Nov 2003 05:45:42 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -2,3 +2,4 @@
.project
maven.log
target
+build.properties
1.11 +1 -1 avalon/meta/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 8 Apr 2004 14:16:27 -0000 1.10
+++ project.xml 8 May 2004 18:24:17 -0000 1.11
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-impl-id;</id>
1.20 +4 -13 avalon/meta/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/meta/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 30 Apr 2004 15:53:37 -0000 1.19
+++ maven.xml 8 May 2004 18:24:17 -0000 1.20
@@ -55,22 +55,13 @@
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path"
- value="${child.artifactId}-${child.currentVersion}.jar"/>
- <checksum file="${maven.build.dir}/jars/${path}" fileext=".md5"/>
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/jars/${path}"/>
- </ant:exec>
- </j:if>
- </j:forEach>
+
</goal>
<goal name="avalon:build-snapshot">
1.2 +1 -0 avalon/meta/plugin/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jan 2004 23:32:30 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.2
@@ -1,3 +1,4 @@
target
.classpath
.project
+build.properties
1.16 +1 -1 avalon/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 26 Apr 2004 05:25:35 -0000 1.15
+++ project.xml 8 May 2004 18:24:17 -0000 1.16
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-plugin-id;</id>
1.2 +1 -0 avalon/meta/spi/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/meta/spi/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Nov 2003 23:18:44 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.2
@@ -1,3 +1,4 @@
target
.classpath
.project
+build.properties
1.8 +1 -1 avalon/meta/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/spi/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 8 Apr 2004 14:16:27 -0000 1.7
+++ project.xml 8 May 2004 18:24:17 -0000 1.8
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-spi-id;</id>
1.2 +1 -0 avalon/meta/tools/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/meta/tools/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jan 2004 23:32:30 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.2
@@ -1,3 +1,4 @@
target
.classpath
.project
+build.properties
1.12 +1 -1 avalon/meta/tools/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/tools/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 Apr 2004 14:16:27 -0000 1.11
+++ project.xml 8 May 2004 18:24:17 -0000 1.12
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-meta-id;</groupId>
<id>&avalon-meta-tools-id;</id>
1.3 +1 -1 avalon/repository/api/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/api/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -3,4 +3,4 @@
target
.classpath
.project
-
+build.properties
1.6 +1 -1 avalon/repository/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 9 Apr 2004 06:52:02 -0000 1.5
+++ project.xml 8 May 2004 18:24:17 -0000 1.6
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-api-id;</id>
1.3 +1 -1 avalon/repository/cli/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/cli/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -3,4 +3,4 @@
target
.classpath
.project
-
+build.properties
1.5 +1 -1 avalon/repository/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/cli/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 9 Apr 2004 06:52:02 -0000 1.4
+++ project.xml 8 May 2004 18:24:17 -0000 1.5
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-cli-id;</id>
1.3 +1 -0 avalon/repository/impl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/impl/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -3,4 +3,5 @@
target
.classpath
.project
+build.properties
1.10 +1 -1 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 9 Apr 2004 06:52:02 -0000 1.9
+++ project.xml 8 May 2004 18:24:17 -0000 1.10
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-impl-id;</id>
1.3 +1 -0 avalon/repository/main/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/main/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:17 -0000 1.3
@@ -3,4 +3,5 @@
target
.classpath
.project
+build.properties
1.9 +1 -1 avalon/repository/main/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 9 Apr 2004 06:52:02 -0000 1.8
+++ project.xml 8 May 2004 18:24:17 -0000 1.9
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-main-id;</id>
1.23 +2 -27 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 1 May 2004 17:03:44 -0000 1.22
+++ maven.xml 8 May 2004 18:24:17 -0000 1.23
@@ -73,37 +73,12 @@
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
- <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
- <j:if test="${jarFile.exists()}">
- <checksum file="${jarFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${jarFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- <util:file var="metaFile"
name="${maven.build.dir}/jars/${path}.jar.meta"/>
- <j:if test="${metaFile.exists()}">
- <checksum file="${metaFile}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${metaFile}"/>
- </ant:exec>
- </j:if>
- </j:if>
- </j:forEach>
</goal>
1.3 +1 -0 avalon/repository/spi/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/spi/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.3
@@ -3,4 +3,5 @@
target
.classpath
.project
+build.properties
1.7 +1 -1 avalon/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/spi/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 9 Apr 2004 06:52:02 -0000 1.6
+++ project.xml 8 May 2004 18:24:18 -0000 1.7
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-spi-id;</id>
1.3 +1 -0 avalon/repository/test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/test/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.3
@@ -3,3 +3,4 @@
target
.classpath
.project
+build.properties
1.7 +1 -1 avalon/repository/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/test/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 9 Apr 2004 06:52:02 -0000 1.6
+++ project.xml 8 May 2004 18:24:18 -0000 1.7
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-test-id;</id>
1.3 +1 -0 avalon/repository/util/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/repository/util/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Mar 2004 11:42:31 -0000 1.2
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.3
@@ -3,4 +3,5 @@
target
.classpath
.project
+build.properties
1.6 +1 -1 avalon/repository/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/util/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 9 Apr 2004 06:52:02 -0000 1.5
+++ project.xml 8 May 2004 18:24:18 -0000 1.6
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-util-id;</id>
1.6 +1 -1 avalon/util/criteria/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/criteria/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 8 Apr 2004 12:57:19 -0000 1.5
+++ project.xml 8 May 2004 18:24:18 -0000 1.6
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-criteria-id;</id>
1.2 +1 -0 avalon/util/defaults/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/util/defaults/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Nov 2003 22:25:49 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.2
@@ -2,3 +2,4 @@
.project
target
maven.log
+build.properties
1.7 +1 -1 avalon/util/defaults/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/defaults/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 8 Apr 2004 12:57:19 -0000 1.6
+++ project.xml 8 May 2004 18:24:18 -0000 1.7
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-defaults-id;</id>
1.2 +2 -0 avalon/util/env/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/util/env/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Nov 2003 22:25:51 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.2
@@ -2,3 +2,5 @@
.project
target
maven.log
+build.properties
+
\ No newline at end of file
1.7 +1 -1 avalon/util/env/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/env/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 8 Apr 2004 12:57:19 -0000 1.6
+++ project.xml 8 May 2004 18:24:18 -0000 1.7
@@ -4,7 +4,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-env-id;</id>
1.2 +1 -0 avalon/util/exception/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/util/exception/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Nov 2003 22:25:53 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.2
@@ -2,3 +2,4 @@
.project
target
maven.log
+build.properties
1.5 +1 -1 avalon/util/exception/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/exception/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 8 Apr 2004 12:57:19 -0000 1.4
+++ project.xml 8 May 2004 18:24:18 -0000 1.5
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-exception-id;</id>
1.5 +1 -1 avalon/util/extension/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 8 Apr 2004 13:41:29 -0000 1.4
+++ project.xml 8 May 2004 18:24:18 -0000 1.5
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-extension-api-id;</id>
1.5 +1 -1 avalon/util/extension/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/extension/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 8 Apr 2004 13:41:29 -0000 1.4
+++ project.xml 8 May 2004 18:24:18 -0000 1.5
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-extension-impl-id;</id>
1.2 +1 -0 avalon/util/i18n/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/util/i18n/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Mar 2004 10:39:58 -0000 1.1
+++ .cvsignore 8 May 2004 18:24:18 -0000 1.2
@@ -1 +1,2 @@
target
+build.properties
1.3 +1 -1 avalon/util/i18n/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/i18n/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 8 Apr 2004 12:57:19 -0000 1.2
+++ project.xml 8 May 2004 18:24:18 -0000 1.3
@@ -5,7 +5,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>&avalon-util-id;</groupId>
<id>&avalon-util-i18n-id;</id>
1.18 +4 -13 avalon/util/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven.xml 30 Apr 2004 15:53:37 -0000 1.17
+++ maven.xml 8 May 2004 18:24:18 -0000 1.18
@@ -51,26 +51,17 @@
banner="Building:"
ignoreFailures="false"
postProcessing="true" />
+
<ant:copy todir="${maven.build.dir}/jars">
<j:forEach var="child" items="${reactorProjects}">
<ant:fileset dir="${child.file.parentFile}/target">
<ant:include
name="${child.artifactId}-${child.currentVersion}.jar"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.asc"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.md5"/>
+ <ant:include
name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
</ant:fileset>
</j:forEach>
</ant:copy>
- <j:forEach var="child" items="${reactorProjects}">
- <j:set var="path"
- value="${child.artifactId}-${child.currentVersion}.jar"/>
- <checksum file="${maven.build.dir}/jars/${path}" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="--yes"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/jars/${path}"/>
- </ant:exec>
- </j:if>
- </j:forEach>
</goal>
<goal name="avalon:clean" prereqs="clean">
1.6 +1 -1 avalon/versioning/avalon-framework.ent
Index: avalon-framework.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-framework.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avalon-framework.ent 30 Apr 2004 15:14:42 -0000 1.5
+++ avalon-framework.ent 8 May 2004 18:24:18 -0000 1.6
@@ -1,6 +1,6 @@
<!ENTITY avalon-framework-id "avalon-framework">
-<!ENTITY avalon-framework-suffix "RC1">
+<!ENTITY avalon-framework-suffix "RC2">
<!ENTITY avalon-framework-version "4.2.0">
<!ENTITY avalon-framework-api-id "avalon-framework-api">
1.11 +1 -1 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- avalon-merlin.ent 6 May 2004 21:02:30 -0000 1.10
+++ avalon-merlin.ent 8 May 2004 18:24:18 -0000 1.11
@@ -47,7 +47,7 @@
<!ENTITY merlin-id "merlin">
<!ENTITY merlin-spec "3.3">
-<!ENTITY merlin-product-version "3.3-RC4">
+<!ENTITY merlin-product-version "3.3-RC5">
<!ENTITY merlin-api-id "merlin-api">
<!ENTITY merlin-api-version "3.3.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
