You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/04/30 07:50:39 UTC
cvs commit: avalon maven.xml project.xml
mcconnell 2004/04/29 22:50:39
Modified: composition/impl maven.xml
composition/impl/src/test/conf block.xml data-test.xml
playground.xml secure-block.xml
composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset
FilesetModelTestCase.java
composition/impl/src/test/org/apache/avalon/composition/model/test
AbstractTestCase.java
. maven.xml project.xml
Log:
Add filtering support for the testcase configuration to capture the framework impl version.
Revision Changes Path
1.9 +13 -17 avalon/composition/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maven.xml 22 Apr 2004 05:53:43 -0000 1.8
+++ maven.xml 30 Apr 2004 05:50:38 -0000 1.9
@@ -18,38 +18,37 @@
<postGoal name="test:compile">
- <mkdir dir="${basedir}/target/test/repository/test/jars"/>
- <mkdir dir="${basedir}/target/test/ext"/>
- <mkdir dir="${basedir}/target/test/lib"/>
- <mkdir dir="${basedir}/target/test/conf"/>
+ <mkdir dir="${basedir}/target/test-classes/repository/test/jars"/>
+ <mkdir dir="${basedir}/target/test-classes/ext"/>
+ <mkdir dir="${basedir}/target/test-classes/lib"/>
- <ant:jar jarfile="${basedir}/target/test/ext/test-a.jar"
+ <ant:jar jarfile="${basedir}/target/test-classes/ext/test-a.jar"
manifest="${basedir}/src/test/etc/a.mf"
includes="**/testa/*.*" basedir="${basedir}/target/test-classes">
</ant:jar>
- <ant:jar jarfile="${basedir}/target/test/ext/test-b.jar"
+ <ant:jar jarfile="${basedir}/target/test-classes/ext/test-b.jar"
manifest="${basedir}/src/test/etc/b.mf"
includes="**/testb/*.*" basedir="${basedir}/target/test-classes">
</ant:jar>
- <ant:jar jarfile="${basedir}/target/test/lib/test-c.jar"
+ <ant:jar jarfile="${basedir}/target/test-classes/lib/test-c.jar"
manifest="${basedir}/src/test/etc/c.mf"
includes="**/testc/*.*" basedir="${basedir}/target/test-classes">
</ant:jar>
- <ant:jar jarfile="${basedir}/target/test/repository/test/jars/test-d.jar"
+ <ant:jar jarfile="${basedir}/target/test-classes/repository/test/jars/test-d.jar"
manifest="${basedir}/src/test/etc/d.mf"
includes="**/testd/*.*" basedir="${basedir}/target/test-classes">
</ant:jar>
- <ant:jar jarfile="${basedir}/target/test/repository/test/jars/test-e.jar"
+ <ant:jar jarfile="${basedir}/target/test-classes/repository/test/jars/test-e.jar"
manifest="${basedir}/src/test/etc/e.mf"
includes="**/teste/*.*" basedir="${basedir}/target/test-classes">
</ant:jar>
- <ant:jar jarfile="${basedir}/target/test/repository/test/jars/includes.jar">
- <zipfileset dir="${basedir}/src/test/conf" prefix="BLOCK-INF/">
+ <ant:jar jarfile="${basedir}/target/test-classes/repository/test/jars/includes.jar">
+ <zipfileset dir="${maven.build.dir}/test-classes/conf" prefix="BLOCK-INF/">
<include name="block.xml"/>
</zipfileset>
</ant:jar>
@@ -63,15 +62,12 @@
</fileset>
</ant:delete>
- <ant:copy toDir="${basedir}/target/test/repository/avalon-framework/jars"
+ <ant:copy toDir="${basedir}/target/test-classes/repository/avalon-framework/jars"
file="${pom.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
- <ant:copy toDir="${basedir}/target/test/ext"
+ <ant:copy toDir="${basedir}/target/test-classes/ext"
file="${pom.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
- <ant:copy toDir="${basedir}/target/test/ext"
+ <ant:copy toDir="${basedir}/target/test-classes/ext"
file="${pom.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
- <ant:copy toDir="${basedir}/target/test/conf">
- <fileset dir="${basedir}/src/test/conf"/>
- </ant:copy>
</postGoal>
1.3 +1 -1 avalon/composition/impl/src/test/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 13 Jan 2004 11:41:27 -0000 1.2
+++ block.xml 30 Apr 2004 05:50:38 -0000 1.3
@@ -21,7 +21,7 @@
<include>test-c.jar</include>
</fileset>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="@FRAMEWORK_IMPL_VERSION@"/>
<resource id="test:test-d"/>
</repository>
</classpath>
1.2 +1 -1 avalon/composition/impl/src/test/conf/data-test.xml
Index: data-test.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/conf/data-test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- data-test.xml 24 Sep 2003 09:32:20 -0000 1.1
+++ data-test.xml 30 Apr 2004 05:50:38 -0000 1.2
@@ -17,7 +17,7 @@
<include>sally.jar</include>
</fileset>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="@FRAMEWORK_IMPL_VERSION@"/>
<resource id="cornerstone-threads:cornerstone-threads-api"/>
</repository>
<repository>
1.6 +1 -1 avalon/composition/impl/src/test/conf/playground.xml
Index: playground.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/conf/playground.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- playground.xml 10 Feb 2004 16:23:34 -0000 1.5
+++ playground.xml 30 Apr 2004 05:50:38 -0000 1.6
@@ -11,7 +11,7 @@
<classpath>
<fileset dir="../test-classes"/>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="@FRAMEWORK_IMPL_VERSION@"/>
</repository>
</classpath>
</classloader>
1.3 +1 -1 avalon/composition/impl/src/test/conf/secure-block.xml
Index: secure-block.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/conf/secure-block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- secure-block.xml 19 Jan 2004 21:46:47 -0000 1.2
+++ secure-block.xml 30 Apr 2004 05:50:38 -0000 1.3
@@ -5,7 +5,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="@FRAMEWORK_IMPL_VERSION@"/>
</repository>
</classpath>
<grant>
1.5 +4 -4 avalon/composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset/FilesetModelTestCase.java
Index: FilesetModelTestCase.java
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/org/apache/avalon/composition/model/impl/fileset/FilesetModelTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilesetModelTestCase.java 21 Apr 2004 17:55:03 -0000 1.4
+++ FilesetModelTestCase.java 30 Apr 2004 05:50:39 -0000 1.5
@@ -111,7 +111,7 @@
ExcludeDirective[] excludes = new ExcludeDirective[0];
// provide legitimate fileset directory attribute
- final String dir = "target/test";
+ final String dir = "target/test-classes";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
// create the fileset model's anchor directory
@@ -174,7 +174,7 @@
ExcludeDirective[] excludes = new ExcludeDirective[0];
// provide legitimate fileset directory attribute
- final String dir = "target/test/ext";
+ final String dir = "target/test-classes/ext";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
// create the fileset model's anchor directory
@@ -243,7 +243,7 @@
excludes[0] = new ExcludeDirective( "test*.jar" );
// provide legitimate fileset directory attribute
- final String dir = "target/test/ext";
+ final String dir = "target/test-classes/ext";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
// create the fileset model's anchor directory
@@ -313,7 +313,7 @@
ExcludeDirective[] excludes = new ExcludeDirective[0];
// provide legitimate fileset directory attribute
- final String dir = "target/test";
+ final String dir = "target/test-classes";
FilesetDirective fsd = new FilesetDirective( dir, includes, excludes );
// create the fileset model's anchor directory
1.11 +3 -3 avalon/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractTestCase.java 20 Apr 2004 16:53:19 -0000 1.10
+++ AbstractTestCase.java 30 Apr 2004 05:50:39 -0000 1.11
@@ -65,7 +65,7 @@
new File( System.getProperty( "basedir" ) );
public static final File SYS_CONF =
- new File( BASEDIR, "target/test-classes/system/kernel.xml" );
+ new File( BASEDIR, "target/test-classes/conf/system/kernel.xml" );
private static final XMLSecurityProfileBuilder SECURITY_BUILDER =
new XMLSecurityProfileBuilder();
@@ -82,7 +82,7 @@
/**
* Setup the system context and create m_model using a path
- * relative to the ${basedir}/target/test/conf directory.
+ * relative to the ${basedir}/target-classes/conf directory.
*/
public ContainmentModel setUp( String path ) throws Exception
{
@@ -97,7 +97,7 @@
// system repository
//
- File test = new File( getTargetDir(), "test" );
+ File test = new File( getTargetDir(), "test-classes" );
Configuration sysConfig = config.getChild( "system" );
InitialContext context = setUpInitialContext( test, sysConfig );
1.20 +2 -0 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 25 Apr 2004 20:13:01 -0000 1.19
+++ maven.xml 30 Apr 2004 05:50:39 -0000 1.20
@@ -163,6 +163,8 @@
value="&avalon-logging-logkit-artifact;"/>
<ant:filter token="STANDARD_RUNTIME"
value="&avalon-activation-artifact;"/>
+ <ant:filter token="FRAMEWORK_IMPL_VERSION"
+ value="&avalon-framework-impl-version;"/>
</preGoal>
<postGoal name="java:compile">
1.10 +9 -8 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 22 Apr 2004 02:25:01 -0000 1.9
+++ project.xml 30 Apr 2004 05:50:39 -0000 1.10
@@ -246,6 +246,13 @@
<resource>
<directory>${basedir}/src/test</directory>
<includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${basedir}/src/test</directory>
+ <includes>
<include>**/*.dtd</include>
<include>**/*.properties</include>
<include>**/*.xinfo</include>
@@ -255,17 +262,9 @@
<include>**/*.xml</include>
<include>**/*.xservice</include>
<include>**/*.mf</include>
- <include>**/*.jar</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/conf</directory>
- <includes>
<include>**/*.properties</include>
</includes>
</resource>
- <!-- This fix makes merlin build with maven-10 again -->
<resource>
<filtering>true</filtering>
<directory>${basedir}/conf</directory>
@@ -273,6 +272,7 @@
<include>**/*.properties</include>
</includes>
</resource>
+ <!--
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/test/conf</directory>
@@ -280,6 +280,7 @@
<include>**/*</include>
</includes>
</resource>
+ -->
</resources>
</unitTest>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org