jstrachan 2002/11/07 00:33:34
Modified: jelly README.txt project.xml build.xml
Log:
Patch so that the autogenerated Ant build will now run all the unit test cases!
Also fixed a few typeos in the readme.
Revision Changes Path
1.4 +5 -2 jakarta-commons-sandbox/jelly/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.txt 6 Nov 2002 20:46:56 -0000 1.3
+++ README.txt 7 Nov 2002 08:33:34 -0000 1.4
@@ -1,13 +1,16 @@
Jelly
=====
-Jelly is build using Maven. So all you should need to do is
-install Maven and just type
+The primary build tool for this project is Maven.
+So all you should need to do is install Maven and just type
maven
For more help using Maven please go to
http://jakarta.apache.org/turbine/maven/
+
+Maven also supports the auto-generation of Ant build files so
+you may also be able to use Ant to build the code.
Enjoy!
1.86 +20 -16 jakarta-commons-sandbox/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- project.xml 5 Nov 2002 13:06:13 -0000 1.85
+++ project.xml 7 Nov 2002 08:33:34 -0000 1.86
@@ -452,16 +452,32 @@
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<integrationUnitTestSourceDirectory/>
<aspectSourceDirectory/>
- <!-- Unit test classes -->
- <unitTestPatterns>
- <unitTestPattern>**/Test*.java</unitTestPattern>
- </unitTestPatterns>
+ <!-- Resources that are packaged up inside the JAR file -->
+ <resources>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resources>
+ <!-- Unit test classes -->
<unitTest>
<includes>
<include>**/Test*.java</include>
</includes>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.jelly</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.rng</include>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
@@ -469,17 +485,5 @@
<integrationUnitTestPatterns></integrationUnitTestPatterns>
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
- <resources>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resources>
-
- <jarResources>
- <jarResource>**/*.properties</jarResource>
- </jarResources>
- <jars></jars>
</build>
</project>
1.69 +25 -7 jakarta-commons-sandbox/jelly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 6 Nov 2002 20:49:09 -0000 1.68
+++ build.xml 7 Nov 2002 08:33:34 -0000 1.69
@@ -14,14 +14,7 @@
-
-
-
-
-
<property name="resourcedir" value="C:\workspace\jelly/src/java"></property>
- <property name="testresourcedir" value="."></property>
-
<property name="distdir" value="dist"></property>
<property name="javadocdir" value="target/docs/apidocs"></property>
@@ -67,6 +60,31 @@
+
+
+ <copy todir="${testclassesdir}">
+
+
+
+
+ <fileset dir="src/test">
+
+
+ <include name="**/*.jelly"></include>
+
+ <include name="**/*.xml"></include>
+
+ <include name="**/*.xsl"></include>
+
+ <include name="**/*.rng"></include>
+
+ <include name="**/*.dtd"></include>
+
+
+ </fileset>
+ </copy>
+
+
</target>
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
