mcconnell 2003/09/10 06:28:48
Modified: merlin maven.xml
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java
Log:
Final tweaking for RC1 release.
Revision Changes Path
1.58 +14 -13 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- maven.xml 10 Sep 2003 12:38:51 -0000 1.57
+++ maven.xml 10 Sep 2003 13:28:47 -0000 1.58
@@ -31,8 +31,8 @@
<goal name="merlin:update">
<attainGoal name="merlin:install"/>
- <attainGoal name="merlin:site"/>
<attainGoal name="merlin:tutorials"/>
+ <attainGoal name="merlin:site"/>
<attainGoal name="merlin:package"/>
<attainGoal name="merlin:replicate"/>
</goal>
@@ -75,6 +75,16 @@
<ant:mkdir dir="${merlin.build.inst.dir}/ext"/>
<ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
+ <ant:mkdir dir="${maven.build.dir}/plugins"/>
+ <ant:copy toDir="${maven.build.dir}/plugins">
+ <fileset dir="${basedir}/kernel/plugin/target">
+ <include name="${merlin.plugin.jar}"/>
+ </fileset>
+ <fileset dir="${basedir}/../meta/plugin/target">
+ <include name="${meta.plugin.jar}"/>
+ </fileset>
+ </ant:copy>
+
<!-- import bootstrap jar -->
<ant:copy
file="${basedir}/kernel/bootstrap/target/${merlin.bootstrap.jar}"
@@ -123,6 +133,7 @@
<include name="INSTALLATION.TXT"/>
</fileset>
</ant:copy>
+
</goal>
<goal name="merlin:plugin">
@@ -146,26 +157,16 @@
<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"/>
+ <zipfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
<fileset dir="${basedir}">
<include name="INSTALLATION.TXT"/>
</fileset>
- <fileset dir="${basedir}/kernel/plugin/target">
- <include name="${merlin.plugin.jar}"/>
- </fileset>
- <fileset dir="${basedir}/../meta/plugin/target">
- <include name="${meta.plugin.jar}"/>
- </fileset>
</ant:zip>
<ant:tar tarfile="${maven.build.dir}/${package.name}.tar">
<tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
+ <tarfileset dir="${maven.build.dir}/plugins" prefix="plugins"/>
<fileset dir="${basedir}">
<include name="INSTALLATION.TXT"/>
- </fileset>
- <fileset dir="${basedir}/kernel/plugin/target">
- <include name="${merlin.plugin.jar}"/>
- </fileset>
- <fileset dir="${basedir}/../meta/plugin/target">
- <include name="${meta.plugin.jar}"/>
</fileset>
</ant:tar>
<ant:gzip
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestCase.java 10 Sep 2003 12:38:51 -0000 1.2
+++ AbstractTestCase.java 10 Sep 2003 13:28:47 -0000 1.3
@@ -95,7 +95,7 @@
File local = new File( base, "repository" );
SystemContext system =
DefaultSystemContext.createSystemContext(
- base, local, ConsoleLogger.LEVEL_INFO );
+ base, local, ConsoleLogger.LEVEL_ERROR );
m_logger = system.getLogger();
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
