mcconnell 2003/09/10 05:38:51
Modified: merlin maven.xml project.properties
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java
merlin/kernel/bootstrap project.xml
merlin/kernel/plugin project.xml
Log:
Revert plugin and bootstrap loader versions.
Revision Changes Path
1.57 +19 -7 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- maven.xml 10 Sep 2003 11:07:05 -0000 1.56
+++ maven.xml 10 Sep 2003 12:38:51 -0000 1.57
@@ -1,5 +1,9 @@
<project default="merlin:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+ <ant:property name="merlin.bootstrap.jar" value="merlin-bootstrap-1.0.jar"/>
+ <ant:property name="merlin.plugin.jar" value="merlin-plugin-1.0.jar"/>
+ <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.1.jar"/>
+
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/merlin-platform/xdocs"/>
<ant:property name="merlin.build.inst" value="merlin"/>
@@ -73,7 +77,7 @@
<!-- import bootstrap jar -->
<ant:copy
- file="${basedir}/kernel/bootstrap/target/merlin-bootstrap-3.0.jar"
+ file="${basedir}/kernel/bootstrap/target/${merlin.bootstrap.jar}"
toDir="${merlin.build.inst.dir}/bin/lib"/>
<!-- import subproject jar files -->
@@ -131,9 +135,13 @@
</goal>
<goal name="merlin: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}"/>
+ -->
+ <j:set var="package.name" value="${maven.final.name}-dist"/>
<ant:echo>Building distribution: ${package.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
@@ -142,10 +150,10 @@
<include name="INSTALLATION.TXT"/>
</fileset>
<fileset dir="${basedir}/kernel/plugin/target">
- <include name="*.jar"/>
+ <include name="${merlin.plugin.jar}"/>
</fileset>
<fileset dir="${basedir}/../meta/plugin/target">
- <include name="*.jar"/>
+ <include name="${meta.plugin.jar}"/>
</fileset>
</ant:zip>
<ant:tar tarfile="${maven.build.dir}/${package.name}.tar">
@@ -154,10 +162,10 @@
<include name="INSTALLATION.TXT"/>
</fileset>
<fileset dir="${basedir}/kernel/plugin/target">
- <include name="*.jar"/>
+ <include name="${merlin.plugin.jar}"/>
</fileset>
<fileset dir="${basedir}/../meta/plugin/target">
- <include name="*.jar"/>
+ <include name="${meta.plugin.jar}"/>
</fileset>
</ant:tar>
<ant:gzip
@@ -165,7 +173,9 @@
src="${maven.build.dir}/${package.name}.tar"/>
<ant:delete file="${maven.build.dir}/${package.name}.tar"/>
- <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>
+ <!--<j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>-->
+ <j:set var="docs.name" value="${maven.final.name}-docs"/>
+
<ant:echo>Building doc kit: ${docs.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
<zipfileset dir="${maven.build.dir}/docs" prefix="docs"/>
@@ -178,7 +188,9 @@
src="${maven.build.dir}/${docs.name}.tar"/>
<ant:delete file="${maven.build.dir}/${docs.name}.tar"/>
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
+ <!--<j:set var="tutorial.name"
value="${maven.final.name}-tutorial-${timestamp}"/>-->
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
+
<ant:echo>Building tutorial kit: ${tutorial.name}.zip</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
<zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
1.7 +0 -1 avalon-sandbox/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 7 Sep 2003 16:47:16 -0000 1.6
+++ project.properties 10 Sep 2003 12:38:51 -0000 1.7
@@ -8,7 +8,6 @@
maven.xdoc.jsl = ./merlin-platform/src/etc/site.jsl
maven.javadoc.stylesheet =${basedir}/merlin-platform/src/etc/stylesheet.css
-
#
# Declaration of the remote links to assign on javadoc generation.
# Link declarations can be overriden in the user's build.properties
1.2 +1 -1
avalon-sandbox/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTestCase.java 10 Sep 2003 08:56:31 -0000 1.1
+++ AbstractTestCase.java 10 Sep 2003 12:38:51 -0000 1.2
@@ -95,7 +95,7 @@
File local = new File( base, "repository" );
SystemContext system =
DefaultSystemContext.createSystemContext(
- base, local, ConsoleLogger.LEVEL_DEBUG );
+ base, local, ConsoleLogger.LEVEL_INFO );
m_logger = system.getLogger();
//
1.5 +1 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 10 Sep 2003 09:40:33 -0000 1.4
+++ project.xml 10 Sep 2003 12:38:51 -0000 1.5
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-bootstrap</id>
<name>Merlin Kernel CLI</name>
- <currentVersion>3.0</currentVersion>
+ <currentVersion>1.0</currentVersion>
<package>*</package>
<inceptionYear>2003</inceptionYear>
1.4 +1 -1 avalon-sandbox/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 10 Sep 2003 11:07:05 -0000 1.3
+++ project.xml 10 Sep 2003 12:38:51 -0000 1.4
@@ -5,10 +5,10 @@
<pomVersion>3</pomVersion>
<id>merlin-plugin</id>
<name>Merlin Plugin</name>
- <currentVersion>3.0</currentVersion>
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
+ <currentVersion>1.0</currentVersion>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
