mcconnell 2004/04/18 07:21:32
Modified: . maven.xml project.xml
merlin maven.xml project.properties project.xml
versioning avalon-logkit.ent
Log:
Housekeeping.
Revision Changes Path
1.3 +0 -146 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 18 Apr 2004 11:27:16 -0000 1.2
+++ maven.xml 18 Apr 2004 14:21:32 -0000 1.3
@@ -186,50 +186,6 @@
</j:forEach>
</goal>
- <goal name="avalon:build-plugin">
- <maven:reactor basedir="${basedir}"
- includes="kernel/plugin/project.xml"
- goals="plugin:install"
- 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:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- <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>
- <ant:copy todir="${maven.build.dir}/merlin/plugins/"
- preserveLastModified="true">
- <ant:fileset dir="${child.file.parentFile}/target">
- <ant:include
- name="${child.artifactId}-${child.currentVersion}.jar"/>
- </ant:fileset>
- </ant:copy>
- </j:forEach>
- <ant:copy file="${maven.plugin.dir}/${meta.plugin.jar}"
- toDir="${maven.build.dir}/merlin/plugins"/>
- <ant:copy file="${maven.plugin.dir}/${avalon.plugin.jar}"
- toDir="${maven.build.dir}/merlin/plugins"/>
- </goal>
-
<goal name="avalon:build-externals" description="Build Externals.">
<maven:reactor basedir="${basedir}"
includes="external.xml"
@@ -343,108 +299,6 @@
prepare the merlin installation package
==============================================================================
-->
-
- <goal name="avalon:package">
-
- <ant:delete>
- <fileset dir="${maven.build.dir}">
- <include name="*.zip"/>
- <include name="*.tar"/>
- <include name="*.tar.gz"/>
- <include name="*.md5"/>
- <include name="*.asc"/>
- </fileset>
- </ant:delete>
-
- <j:choose>
- <j:when test="${merlin.snapshot}">
- <maven:snapshot project="${pom}"/>
- <j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
- <j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
- <j:set var="tutorial.name"
value="${maven.final.name}-tutorial-${timestamp}"/>
- <echo>Snapshot Packaging: ${timestamp}</echo>
- </j:when>
- <j:otherwise>
- <j:set var="package.name" value="${maven.final.name}-dist"/>
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
- <echo>Release Packaging: ${pom.currentVersion}</echo>
- </j:otherwise>
- </j:choose>
-
- <ant:echo>Building zip distribution: ${package.name}</ant:echo>
- <ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
- <zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <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" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${package.name}.zip"/>
- </ant:exec>
- </j:if>
-
- <ant:echo>Building tar distribution: ${package.name}</ant:echo>
- <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${package.name}.tar">
- <tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <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"
- src="${maven.build.dir}/${package.name}.tar"/>
- <ant:delete file="${maven.build.dir}/${package.name}.tar"/>
- <checksum file="${maven.build.dir}/${package.name}.tar.gz" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${package.name}.tar.gz"/>
- </ant:exec>
- </j:if>
-
- <!--
- <ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
- <ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
- <zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
- </ant:zip>
- <checksum file="${maven.build.dir}/${tutorial.name}.zip" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${tutorial.name}.zip"/>
- </ant:exec>
- </j:if>
-
- <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${tutorial.name}.tar">
- <tarfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
- </ant:tar>
- <ant:gzip
- zipfile="${maven.build.dir}/${tutorial.name}.tar.gz"
- src="${maven.build.dir}/${tutorial.name}.tar"/>
- <ant:delete file="${maven.build.dir}/${tutorial.name}.tar"/>
- <checksum file="${maven.build.dir}/${tutorial.name}.tar.gz" fileext=".md5" />
- <j:if test="${maven_gpg_exe != null}">
- <ant:exec executable="${maven_gpg_exe}">
- <ant:arg value="-a"/>
- <ant:arg value="-b"/>
- <ant:arg value="${maven.build.dir}/${tutorial.name}.tar.gz"/>
- </ant:exec>
- </j:if>
- -->
-
- </goal>
<!--
==============================================================================
1.7 +8 -0 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 18 Apr 2004 11:27:16 -0000 1.6
+++ project.xml 18 Apr 2004 14:21:32 -0000 1.7
@@ -156,6 +156,14 @@
<role>Most stuff.</role>
</roles>
</developer>
+ <developer>
+ <name>Timothy Bennett</name>
+ <email>[EMAIL PROTECTED]</email>
+ <id>tbennett</id>
+ <roles>
+ <role>HTTP facility, model enhancements, etc.</role>
+ </roles>
+ </developer>
</developers>
<contributors>
1.72 +38 -24 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- maven.xml 18 Apr 2004 12:59:46 -0000 1.71
+++ maven.xml 18 Apr 2004 14:21:32 -0000 1.72
@@ -106,7 +106,7 @@
-->
<goal name="avalon:build" description="Build Merlin."
- prereqs="avalon:build-main,avalon:build-kernel,avalon:build-externals"/>
+
prereqs="avalon:build-main,avalon:build-kernel,avalon:build-externals,avalon:xinstall"/>
<goal name="avalon:build-main" description="Build Merlin.">
@@ -222,7 +222,7 @@
-->
<goal name="avalon:install"
- description="Build the Merlin distribution."
prereqs="avalon:build,avalon:xinstall"/>
+ description="Build the Merlin distribution." prereqs="avalon:build"/>
<goal name="avalon:xinstall">
<!-- add supporting resources -->
@@ -266,9 +266,6 @@
<include name="LICENSE.txt"/>
</fileset>
</ant:copy>
- <ant:fixcrlf eol="crlf" srcdir="${merlin.build.inst.dir}/bin">
- <include name="README.TXT"/>
- </ant:fixcrlf>
<ant:fixcrlf eol="crlf" srcdir="${merlin.build.dir}">
<include name="INSTALL.TXT"/>
</ant:fixcrlf>
@@ -319,12 +316,12 @@
<maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
- <j:set var="tutorial.name"
value="${maven.final.name}-tutorial-${timestamp}"/>
+ <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>
<echo>Snapshot Packaging: ${timestamp}</echo>
</j:when>
<j:otherwise>
<j:set var="package.name" value="${maven.final.name}-dist"/>
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
+ <j:set var="docs.name" value="${maven.final.name}-docs"/>
<echo>Release Packaging: ${pom.currentVersion}</echo>
</j:otherwise>
</j:choose>
@@ -332,12 +329,6 @@
<ant:echo>Building zip distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
<zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <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" fileext=".md5" />
<j:if test="${maven_gpg_exe != null}">
@@ -351,12 +342,6 @@
<ant:echo>Building tar distribution: ${package.name}</ant:echo>
<ant:tar longfile="gnu" tarfile="${maven.build.dir}/${package.name}.tar">
<tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
- <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"
@@ -371,6 +356,35 @@
</ant:exec>
</j:if>
+ <ant:echo>Building doc kit: ${docs.name}</ant:echo>
+ <ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
+ <zipfileset dir="${maven.build.dir}/docs" prefix="docs"/>
+ </ant:zip>
+ <checksum file="${maven.build.dir}/${docs.name}.zip" fileext=".md5" />
+ <j:if test="${maven_gpg_exe != null}">
+ <ant:exec executable="${maven_gpg_exe}">
+ <ant:arg value="-a"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.build.dir}/${docs.name}.zip"/>
+ </ant:exec>
+ </j:if>
+
+ <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${docs.name}.tar">
+ <tarfileset dir="${maven.build.dir}/docs" prefix="docs"/>
+ </ant:tar>
+ <ant:gzip
+ zipfile="${maven.build.dir}/${docs.name}.tar.gz"
+ 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" fileext=".md5" />
+ <j:if test="${maven_gpg_exe != null}">
+ <ant:exec executable="${maven_gpg_exe}">
+ <ant:arg value="-a"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.build.dir}/${docs.name}.tar.gz"/>
+ </ant:exec>
+ </j:if>
+
</goal>
<!--
@@ -384,8 +398,8 @@
prereqs="xavalon:css-copy,license,xjavadoc,site"/>
<goal name="xavalon:css-copy">
- <ant:mkdir dir="${merlin.build.inst.dir}/docs/style"/>
- <ant:copy toDir="${merlin.build.inst.dir}/docs/style">
+ <ant:mkdir dir="${maven.build.dir}/docs/style"/>
+ <ant:copy toDir="${maven.build.dir}/docs/style">
<fileset dir="${basedir}/site/etc">
<include name="maven.css"/>
<include name="tigris.css"/>
@@ -403,7 +417,7 @@
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="**/target/**,**/test/project.xml,project.xml"
+ excludes="**/target/**,**/test/project.xml,project.xml,site/**"
banner="Site Prep:"
ignoreFailures="false"
postProcessing="true" />
@@ -418,12 +432,12 @@
</j:forEach>
</ant:path>
- <ant:mkdir dir="${merlin.build.inst.dir}/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="${merlin.build.inst.dir}/docs/api"
+ <ant:javadoc destdir="${maven.build.dir}/docs/api"
doctitle="<h1>${title}</h1>"
noindex="false" author="true" use="true"
windowtitle="${title}"
1.13 +4 -4 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.properties 31 Mar 2004 16:57:20 -0000 1.12
+++ project.properties 18 Apr 2004 14:21:32 -0000 1.13
@@ -7,11 +7,11 @@
maven.ui.banner.background = #fff
maven.ui.banner.foreground = #000
-maven.xdoc.jsl = ./platform/etc/site.jsl
-maven.javadoc.stylesheet =${basedir}/platform/etc/stylesheet.css
+maven.xdoc.jsl = ./site/etc/site.jsl
+maven.javadoc.stylesheet =${basedir}/site/etc/stylesheet.css
maven.xdoc.poweredby.image=
-maven.docs.dest = ${maven.build.dir}/merlin/docs
-maven.docs.src = ${basedir}/platform/xdocs
+#maven.docs.dest = ${maven.build.dir}/merlin/docs
+maven.docs.src = ${basedir}/site/xdocs
#
# custom tags spec
1.33 +4 -180 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 9 Apr 2004 12:11:49 -0000 1.32
+++ project.xml 18 Apr 2004 14:21:32 -0000 1.33
@@ -17,6 +17,8 @@
-->
<project>
+ <extend>${basedir}/../project.xml</extend>
+
<pomVersion>3</pomVersion>
<groupId>merlin</groupId>
<id>merlin</id>
@@ -45,185 +47,6 @@
<url>http://cvs.apache.org/viewcvs/avalon/merlin/</url>
</repository>
- <mailingLists>
- <mailingList>
- <name>Avalon Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- <mailingList>
- <name>Avalon User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
- </mailingList>
- <mailingList>
- <name>CVS List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Stephen McConnell</name>
- <id>mcconnell</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Release Manager.</role>
- <role>Conception, architecture and initial implementation.</role>
- </roles>
- <timezone>1</timezone>
- </developer>
- <developer>
- <name>Leo Simons</name>
- <id>leosimons</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>System review, code cleanup.</role>
- </roles>
- <timezone>1</timezone>
- </developer>
- <developer>
- <name>Berin Loritsch</name>
- <id>bloritsch</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Code enhancements and lots of test cases.</role>
- </roles>
- </developer>
- <developer>
- <name>Vinay Chandran</name>
- <id>vinayc</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Testing and bug reporting, migration of tutorials from ant to
maven.</role>
- </roles>
- </developer>
- <developer>
- <name>Marcus Crafter</name>
- <id>crafterm</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Architecture review and Fortress/ECM/Cocoon liason.</role>
- </roles>
- </developer>
- <developer>
- <name>Peter Royal</name>
- <id>proyal</id>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Test and evaluation.</role>
- </roles>
- </developer>
- <developer>
- <name>Leif Mortenson</name>
- <email>[EMAIL PROTECTED]</email>
- <id>leif</id>
- <roles>
- <role>Support on setup of NT service scripts and resources.</role>
- </roles>
- </developer>
- <developer>
- <name>Aaron Far</name>
- <email>[EMAIL PROTECTED]</email>
- <id>farra</id>
- <roles>
- <role>Testing, bug reporting, and early access trial participation.</role>
- <role>AltRMI extensions.</role>
- <role>JMS extensions.</role>
- </roles>
- <timezone>-5</timezone>
- <organization>Sony Electronics</organization>
- </developer>
- <developer>
- <name>Neeme Praks</name>
- <email>[EMAIL PROTECTED]</email>
- <id>neeme</id>
- <roles>
- <role>Documentation improvements and corrections.</role>
- </roles>
- </developer>
- <developer>
- <name>Alex Karasulu</name>
- <email>[EMAIL PROTECTED]</email>
- <id>akarasulu</id>
- <roles>
- <role>Kernel loading strategy, refactoring and optimization of embedded
aspects.</role>
- </roles>
- </developer>
- <developer>
- <name>Niclas Hedhman</name>
- <email>[EMAIL PROTECTED]</email>
- <id>niclas</id>
- <roles>
- <role>Patches improving build procedures, validating and enhancing
cross-platform builds, resolving maven bugs, and enhancements to the repository
subsystem.</role>
- <role>Kernel improvements in deployment and security.</role>
- </roles>
- <organization>Bali Automation Sdn Bhd</organization>
- <timezone>8</timezone>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Gary Shea</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>GTS Design</organization>
- <roles>
- <role>Test and evaluation in a desktop environment.</role>
- </roles>
- </contributor>
- <contributor>
- <name>Richard Wallace</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>A-I-M</organization>
- <roles>
- <role>Web services related trials and feedback.</role>
- </roles>
- </contributor>
- <contributor>
- <name>Jrg Schaible</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>Elsag-Solutions AG</organization>
- <roles>
- <role>Test, evaluation and contribution of German language i18n
resources.</role>
- </roles>
- </contributor>
- <contributor>
- <name>David Bernard</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Documentation and tutorial review, testing and patches. Updates to
lifecycle handlers. Contribution to JMX related development.</role>
- </roles>
- <organization>BNP</organization>
- </contributor>
- <contributor>
- <name>Kristian Meier</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Patches enhancing the meta-info generation sources and documentation,
and patches related to the pooled lifestyle handler.</role>
- </roles>
- <organization>Jentro AG</organization>
- </contributor>
- <contributor>
- <name>Laurent Rieu</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Testing, bug reporting, and early access trial participation.</role>
- </roles>
- <organization>IBM Global Services</organization>
- </contributor>
- <contributor>
- <name>Alexis Agahi</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Debugging, script enhancements and release testing.</role>
- </roles>
- </contributor>
- </contributors>
-
<releases>
<release>
<version>3.2-20031225</version>
@@ -266,6 +89,7 @@
</reports>
-->
+ <!--
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
@@ -304,7 +128,6 @@
<include>**/*.properties</include>
</includes>
</resource>
- <!-- This fix makes merlin build with maven-10 again -->
<resource>
<directory>${basedir}/conf</directory>
<includes>
@@ -368,5 +191,6 @@
<jars></jars>
</build>
+ -->
</project>
1.4 +1 -1 avalon/versioning/avalon-logkit.ent
Index: avalon-logkit.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logkit.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avalon-logkit.ent 18 Apr 2004 05:16:44 -0000 1.3
+++ avalon-logkit.ent 18 Apr 2004 14:21:32 -0000 1.4
@@ -1,5 +1,5 @@
<!ENTITY avalon-logkit-group "avalon-logkit">
<!ENTITY avalon-logkit-id "avalon-logkit">
-<!ENTITY avalon-logkit-version "2.0.dev-0">
+<!ENTITY avalon-logkit-version "2.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
