taylor 2004/02/20 10:17:20
Modified: cps maven.xml project.xml
cps/test/rewriter test-001-output.html
Log:
setup maven to copy over resources during unit testing
Revision Changes Path
1.10 +1 -20 jakarta-jetspeed-2/cps/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 20 Feb 2004 03:54:49 -0000 1.9
+++ maven.xml 20 Feb 2004 18:17:19 -0000 1.10
@@ -4,7 +4,7 @@
xmlns:reactor="reactor">
<!-- Target of maven test:single test -->
- <property name='testcase'
value='org.apache.jetspeed.cps.template.TestTemplateLocatorComponent'/>
+ <property name='testcase'
value='org.apache.jetspeed.components.TestComponentManager'/>
<goal name="deployJar">
<attainGoal name="jar:install"/>
@@ -12,23 +12,4 @@
<copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
</goal>
- <!-- ================================================================ -->
- <!-- Set System properties for junit -->
- <!-- ================================================================ -->
- <preGoal name="test:single">
- <attainGoal name="why.doesnt.maven.do.this"/>
- </preGoal>
-
- <preGoal name="test:test">
- <attainGoal name="why.doesnt.maven.do.this"/>
- </preGoal>
-
- <goal name='why.doesnt.maven.do.this'>
- <copy file="./src/java/META-INF/js-components.properties"
tofile="./target/classes/META-INF/js-components.properties"/>
- <copy todir="./target/classes/org/apache/jetspeed/components/">
- <fileset dir="./src/test/org/apache/jetspeed/components/">
- <include name="**/*.bsh"/>
- </fileset>
- </copy>
- </goal>
</project>
1.14 +8 -0 jakarta-jetspeed-2/cps/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 19 Feb 2004 21:34:36 -0000 1.13
+++ project.xml 20 Feb 2004 18:17:19 -0000 1.14
@@ -167,6 +167,14 @@
<exclude>org/apache/jetspeed/cps/rewriter/UnitTestRewriter.java</exclude>
<exclude>org/apache/jetspeed/cps/components/TestHSQL.java</exclude>
</excludes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
</unitTest>
</build>
1.22 +6 -6 jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html
Index: test-001-output.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/test/rewriter/test-001-output.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- test-001-output.html 20 Feb 2004 03:54:49 -0000 1.21
+++ test-001-output.html 20 Feb 2004 18:17:20 -0000 1.22
@@ -1,10 +1,10 @@
<p>
This is a test</p>
-<a href="http://www.bluesunrise.com/suffix"; target="_BLANK" name="1">keep this</a>
- <a href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix";
target="_BLANK" name="2">junk</a>
- <a href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix";
target="_BLANK" name="3">junk2</a>
- <a href="javascript:whatever()" name="4">script</a>
- <a href="mailto:[EMAIL PROTECTED]" name="5">script</a>
- <a href="#INTERNAL" name="6">internal</a>
+<a name="1" target="_BLANK" href="http://www.bluesunrise.com/suffix";>keep this</a>
+ <a name="2" target="_BLANK"
href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix";>junk</a>
+ <a name="3" target="_BLANK"
href="http://www.rewriter.com/stuff/junk/stuffedjunk.html/suffix";>junk2</a>
+ <a name="4" href="javascript:whatever()">script</a>
+ <a name="5" href="mailto:[EMAIL PROTECTED]">script</a>
+ <a name="6" href="#INTERNAL">internal</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
