dion 2004/09/07 22:12:46
Modified: jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant
example_jar.jelly suite.jelly typoTest.jelly
jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag
suite.jelly
jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task
example.jelly
Log:
detab
Revision Changes Path
1.3 +1 -1
jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly
Index: example_jar.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_jar.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- example_jar.jelly 25 Feb 2004 05:32:00 -0000 1.2
+++ example_jar.jelly 8 Sep 2004 05:12:46 -0000 1.3
@@ -19,7 +19,7 @@
<j:set var="jarname" value="target/anttest.jar"/>
<echo>
- About to create jar: ${jarname}
+ About to create jar: ${jarname}
</echo>
<jar
1.12 +62 -62
jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly
Index: suite.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/suite.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- suite.jelly 25 Feb 2004 05:32:00 -0000 1.11
+++ suite.jelly 8 Sep 2004 05:12:46 -0000 1.12
@@ -15,10 +15,10 @@
limitations under the License.
-->
<test:suite
- xmlns:j="jelly:core"
- xmlns:test="jelly:junit"
- xmlns:util="jelly:util"
- xmlns="jelly:ant">
+ xmlns:j="jelly:core"
+ xmlns:test="jelly:junit"
+ xmlns:util="jelly:util"
+ xmlns="jelly:ant">
<j:set var="dir" value="target/test-classes/org/apache/commons/jelly/ant"/>
@@ -100,10 +100,10 @@
<test:case name="copy">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
-
+ <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+
<copy
- overwrite="true"
+ overwrite="true"
file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
tofile="${basedir}/target/tmp/ant-tests/output.txt">
<filterset>
@@ -120,14 +120,14 @@
<test:case name="copyWithReference">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+ <mkdir dir="${basedir}/target/tmp/ant-tests"/>
- <filterset id="myFilter">
- <filter token="foo" value="bar"/>
- </filterset>
-
+ <filterset id="myFilter">
+ <filter token="foo" value="bar"/>
+ </filterset>
+
<copy
- overwrite="true"
+ overwrite="true"
file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
tofile="${basedir}/target/tmp/ant-tests/output.txt">
<filterset refid="myFilter"/>
@@ -143,19 +143,19 @@
<test:case name="parallelCopy">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
-
- <parallel>
- <copy
- overwrite="true"
-
file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
- tofile="${basedir}/target/tmp/ant-tests/output.txt">
- <filterset>
- <filter token="foo" value="bar"/>
- </filterset>
- </copy>
- <echo>Performing copy in parallel</echo>
- </parallel>
+ <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+
+ <parallel>
+ <copy
+ overwrite="true"
+ file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
+ tofile="${basedir}/target/tmp/ant-tests/output.txt">
+ <filterset>
+ <filter token="foo" value="bar"/>
+ </filterset>
+ </copy>
+ <echo>Performing copy in parallel</echo>
+ </parallel>
<util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
<delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
@@ -166,21 +166,21 @@
<test:case name="parallelCopyWithReference">
- <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+ <mkdir dir="${basedir}/target/tmp/ant-tests"/>
+
+ <filterset id="myFilter">
+ <filter token="foo" value="bar"/>
+ </filterset>
- <filterset id="myFilter">
- <filter token="foo" value="bar"/>
- </filterset>
-
- <parallel>
- <copy
- overwrite="true"
-
file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
- tofile="${basedir}/target/tmp/ant-tests/output.txt">
- <filterset refid="myFilter"/>
- </copy>
- <echo>Performing copy in parallel</echo>
- </parallel>
+ <parallel>
+ <copy
+ overwrite="true"
+ file="${basedir}/src/test/org/apache/commons/jelly/ant/sample.txt"
+ tofile="${basedir}/target/tmp/ant-tests/output.txt">
+ <filterset refid="myFilter"/>
+ </copy>
+ <echo>Performing copy in parallel</echo>
+ </parallel>
<util:loadText var="text" file="${basedir}/target/tmp/ant-tests/output.txt"/>
<delete file="${basedir}/target/tmp/ant-tests/output.txt"/>
@@ -195,42 +195,42 @@
<j:set var="foo" value="setting the message worked!"/>
- <echo>
- <setProperty name="message" value="${foo}"/>
+ <echo>
+ <setProperty name="message" value="${foo}"/>
</echo>
- <echo>
- <setProperty name="message" value="${bar}" default="the default also
worked"/>
+ <echo>
+ <setProperty name="message" value="${bar}" default="the default also
worked"/>
</echo>
- <!-- haven't thought of a neat way to test this yet... -->
+ <!-- haven't thought of a neat way to test this yet... -->
</test:case>
<test:case name="nestedTask">
- <j:include uri="task/example.jelly"/>
-
+ <j:include uri="task/example.jelly"/>
+
</test:case>
<test:case name="setProperty">
- <taskdef
- name="nested"
+ <taskdef
+ name="nested"
classname="org.apache.commons.jelly.ant.task.DummyTask">
- </taskdef>
+ </taskdef>
- <nested>
- <setProperty name="force" value="true"/>
- </nested>
-
- <j:catch var="ex">
- <nested>
- <setProperty name="force" value="false"/>
- </nested>
- </j:catch>
-
- <test:assert test="${ex != null}">We should have created an
exception</test:assert>
-
+ <nested>
+ <setProperty name="force" value="true"/>
+ </nested>
+
+ <j:catch var="ex">
+ <nested>
+ <setProperty name="force" value="false"/>
+ </nested>
+ </j:catch>
+
+ <test:assert test="${ex != null}">We should have created an
exception</test:assert>
+
</test:case>
</test:suite>
1.3 +1 -1
jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly
Index: typoTest.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/typoTest.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- typoTest.jelly 25 Feb 2004 05:32:00 -0000 1.2
+++ typoTest.jelly 8 Sep 2004 05:12:46 -0000 1.3
@@ -21,7 +21,7 @@
<echo message="Invoking the echo task from inside Jelly; the Maven repository is
${lib.repo}"/>
<echo>
- Maven home is ${maven.home}
+ Maven home is ${maven.home}
</echo>
<!-- lets try invoke a program -->
1.5 +16 -16
jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly
Index: suite.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/tag/suite.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- suite.jelly 1 Sep 2004 15:51:40 -0000 1.4
+++ suite.jelly 8 Sep 2004 05:12:46 -0000 1.5
@@ -15,22 +15,22 @@
limitations under the License.
-->
<test:suite
- xmlns:j="jelly:core"
- xmlns:test="jelly:junit"
- xmlns="jelly:ant"
- xmlns:my="jelly:org.apache.commons.jelly.ant.tag.MyTagLibrary">
+ xmlns:j="jelly:core"
+ xmlns:test="jelly:junit"
+ xmlns="jelly:ant"
+ xmlns:my="jelly:org.apache.commons.jelly.ant.tag.MyTagLibrary">
- <test:case name="nestedClasspath">
-
- <my:dummy var="path" flag="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement path="target/test-classes"/>
- </classpath>
- </my:dummy>
-
- <test:assert test="${path != null}"/>
-
- </test:case>
+ <test:case name="nestedClasspath">
+
+ <my:dummy var="path" flag="true">
+ <classpath>
+ <pathelement path="target/classes"/>
+ <pathelement path="target/test-classes"/>
+ </classpath>
+ </my:dummy>
+
+ <test:assert test="${path != null}"/>
+
+ </test:case>
</test:suite>
1.4 +9 -9
jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly
Index: example.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/task/example.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- example.jelly 25 Feb 2004 05:32:00 -0000 1.3
+++ example.jelly 8 Sep 2004 05:12:46 -0000 1.4
@@ -15,15 +15,15 @@
limitations under the License.
-->
<j:jelly
- xmlns:j="jelly:core"
- xmlns="jelly:ant">
+ xmlns:j="jelly:core"
+ xmlns="jelly:ant">
- <taskdef
- name="nested"
+ <taskdef
+ name="nested"
classname="org.apache.commons.jelly.ant.task.DummyTask">
- </taskdef>
-
- <nested force="true">
+ </taskdef>
+
+ <nested force="true">
<ding/>
<dang/>
<dong/>
@@ -33,6 +33,6 @@
<hipHop/>
<wontStop/>
<tillYouDrop/>
- </nested>
-
+ </nested>
+
</j:jelly>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
