felipeal 2005/05/30 21:44:57
Modified: integration/maven plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Added: integration/maven/src/plugin-test/testMultipleSrcDir
maven.xml project.properties project.xml
integration/maven/src/plugin-test/testMultipleSrcDir/src/test/org/apache/cactus/integration/maven/test
Sub2Test.java Sub3Test.java
integration/maven/src/plugin-test/testMultipleSrcDir/src/test-2/org/apache/cactus/integration/maven/test
Super2Test.java
integration/maven/src/plugin-test/testMultipleSrcDir/src/test-3/org/apache/cactus/integration/maven/test
Super3Test.java
Log:
CACTUS-211: Added a cactus.compile.src.set path element, which allows Cactus
tests to be split among multiple source directories.
Revision Changes Path
1.49 +8 -2 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- plugin.jelly 26 Apr 2005 10:54:33 -0000 1.48
+++ plugin.jelly 31 May 2005 04:44:57 -0000 1.49
@@ -115,6 +115,9 @@
<util:available file="${cactus.src.dir}">
<j:set var="cactusSourcePresent" value="true"/>
+ <ant:path id="cactus.compile.src.set">
+ <ant:pathelement location="${cactus.src.dir}"/>
+ </ant:path>
</util:available>
<!-- The Cactus scanner automatically discovers Cactus tests -->
@@ -131,7 +134,8 @@
<ant:dirname property="cactus.ejb.dir" file="${cactus.src.ejb}"/>
<ant:basename property="cactus.ejb.name" file="${cactus.src.ejb}"/>
-
+
+
</goal>
<!--
@@ -190,7 +194,9 @@
deprecation="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.deprecation')}"
optimize="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.optimize')}">
- <ant:src path="${cactus.src.dir}"/>
+ <ant:src>
+ <ant:path refid="cactus.compile.src.set"/>
+ </ant:src>
<ant:classpath>
<ant:path refid="maven.dependency.classpath"/>
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<project xmlns:maven="jelly:maven"
default="testPlugin">
<goal name="testPlugin" prereqs="cactus:compile">
<attainGoal name="clean"/>
</goal>
<preGoal name="cactus:compile">
<path id="cactus.src.set2" location="${cactus.src.dir2}"/>
<maven:addPath id="cactus.compile.src.set" refid="cactus.src.set2"/>
<path id="cactus.src.set3" location="${cactus.src.dir3}"/>
<maven:addPath id="cactus.compile.src.set" refid="cactus.src.set3"/>
</preGoal>
</project>
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/project.properties
Index: project.properties
===================================================================
cactus.src.dir=${basedir}/src/test
cactus.src.dir2=${basedir}/src/test-2
cactus.src.dir3=${basedir}/src/test-3
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<project>
<pomVersion>3</pomVersion>
<extend>../project.xml</extend>
<artifactId>testMultipleSrcDir</artifactId>
<name>testMultipleSrcDir</name>
<shortDescription>Testcase for tests that are split in multiple
directories</shortDescription>
<description>Testcase for tests that are split in multiple
directories</description>
<build>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
</unitTest>
</build>
</project>
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/src/test/org/apache/cactus/integration/maven/test/Sub2Test.java
Index: Sub2Test.java
===================================================================
/*
* ========================================================================
*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.integration.maven.test;
public class Sub2Test extends Super2Test
{
public void testBar2()
{
assertTrue( "foo2", true );
}
}
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/src/test/org/apache/cactus/integration/maven/test/Sub3Test.java
Index: Sub3Test.java
===================================================================
/*
* ========================================================================
*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.integration.maven.test;
public class Sub3Test extends Super3Test
{
public void testBar3()
{
assertTrue( "foo3", true );
}
}
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/src/test-2/org/apache/cactus/integration/maven/test/Super2Test.java
Index: Super2Test.java
===================================================================
/*
* ========================================================================
*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.integration.maven.test;
import org.apache.cactus.ServletTestCase;
public class Super2Test extends ServletTestCase
{
public void testFoo2()
{
assertTrue( "bar2", true );
}
}
1.1
jakarta-cactus/integration/maven/src/plugin-test/testMultipleSrcDir/src/test-3/org/apache/cactus/integration/maven/test/Super3Test.java
Index: Super3Test.java
===================================================================
/*
* ========================================================================
*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.integration.maven.test;
import org.apache.cactus.ServletTestCase;
public class Super3Test extends ServletTestCase
{
public void test3Foo()
{
assertTrue( "bar3", true );
}
}
1.69 +4 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- changes.xml 26 Apr 2005 11:43:25 -0000 1.68
+++ changes.xml 31 May 2005 04:44:57 -0000 1.69
@@ -8,6 +8,10 @@
<body>
<release version="1.8dev" date="in CVS">
+ <action dev="felipeal" type="add" issue="CACTUS-211">
+ Added a <code>cactus.compile.src.set</code> path element, which
allows
+ Cactus tests to be split among multiple source directories.
+ </action>
<action dev="felipeal" type="update" issue="CACTUS-197">
Added a check to verify that the user's version of the
<code>Maven EAR Plugin</code> is greater or equal to 1.6.1, as this
the
1.29 +26 -1 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- properties.xml 25 Apr 2005 02:04:57 -0000 1.28
+++ properties.xml 31 May 2005 04:44:57 -0000 1.29
@@ -312,6 +312,31 @@
</table>
</section>
+ <section name="Cactus Path Settings">
+ <table>
+ <tr>
+ <th>Path Id</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.compile.src.set</td>
+ <td>No</td>
+ <td>
+ <p>
+ Ant path containing the Java classes used by the
+ <code>cactus:compile</code> goal. This path is created by
+ the <code>cactus:init</code> goal ant initially populated with
+ only one path element (<code>${cactus.src.dir}</code> - if a
+ project requires multiple source directories, it could create a
+ <code>preGoal</code> which would add more elements in the path.
+ by a
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
<section name="Cactus/Generic Container Settings">
<table>
<tr>
@@ -717,4 +742,4 @@
</body>
-</document>
\ No newline at end of file
+</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
