jstrachan 02/05/28 00:20:06
Modified: jelly/src/test/org/apache/commons/jelly run_all.jelly
TestCoreTags.java
jelly build.xml gump.xml
Added: jelly/src/test/org/apache/commons/jelly show_args.jelly
test_args.jelly
Removed: jelly/src/test/org/apache/commons/jelly testing123.jelly
Log:
Tidied up the example scripts a little
Revision Changes Path
1.2 +8 -19
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/run_all.jelly
Index: run_all.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/run_all.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run_all.jelly 26 Apr 2002 12:20:12 -0000 1.1
+++ run_all.jelly 28 May 2002 07:20:06 -0000 1.2
@@ -1,21 +1,10 @@
-<?xml version="1.0"?>
-<j:jelly xmlns:j="jelly:core">
-
- <!-- try an absolute path -->
- <j:include uri="/src/test/org/apache/commons/jelly/example.jelly"/>
-
- <!-- all other scripts... -->
- <j:include uri="example2.jelly"/>
- <j:include uri="example2.jelly"/>
- <j:include uri="example3.jelly"/>
- <j:include uri="hello_world.jelly"/>
- <j:include uri="show_properties.jelly"/>
- <j:include uri="testing123.jelly"/>
-
- <!-- loading all dynamic tags libraries -->
- <j:include uri="define/babelfishTaglib.jelly"/>
-
- <!-- now run a script using the new taglib -->
+<?xml version="1.0"?>
<j:jelly xmlns:j="jelly:core">
+ <!-- try an absolute path -->
+ <j:include uri="/src/test/org/apache/commons/jelly/hello_world.jelly"/>
<!-- include other relative scripts... -->
+ <j:include uri="example2.jelly"/>
<j:include uri="jsl/example.jelly"/>
+
+ <!-- loading all dynamic tags libraries -->
+ <j:include uri="define/babelfishTaglib.jelly"/>
+ <!-- now run a script using the new taglib -->
<j:include uri="define/example.jelly"/>
-
</j:jelly>
1.8 +6 -6
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java
Index: TestCoreTags.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestCoreTags.java 21 May 2002 07:59:33 -0000 1.7
+++ TestCoreTags.java 28 May 2002 07:20:06 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
1.7 2002/05/21 07:59:33 jstrachan Exp $
- * $Revision: 1.7 $
- * $Date: 2002/05/21 07:59:33 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
1.8 2002/05/28 07:20:06 jstrachan Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/05/28 07:20:06 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: TestCoreTags.java,v 1.7 2002/05/21 07:59:33 jstrachan Exp $
+ * $Id: TestCoreTags.java,v 1.8 2002/05/28 07:20:06 jstrachan Exp $
*/
package org.apache.commons.jelly;
@@ -83,7 +83,7 @@
/** Tests the core tags
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class TestCoreTags extends TestCase {
@@ -103,7 +103,7 @@
}
public void testArgs() throws Exception {
- InputStream in = new
FileInputStream("src/test/org/apache/commons/jelly/testing123.jelly");
+ InputStream in = new
FileInputStream("src/test/org/apache/commons/jelly/test_args.jelly");
XMLParser parser = new XMLParser();
Script script = parser.parse(in);
script = script.compile();
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/show_args.jelly
Index: show_args.jelly
===================================================================
<?xml version="1.0"?>
<!-- displays the current command line arguments -->
<j:jelly xmlns:j="jelly:core">
<arguments>
<j:forEach var="arg" items="${args}">
<argument><j:expr
value="${arg}"/></argument>
</j:forEach>
</arguments>
</j:jelly>
1.1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/test_args.jelly
Index: test_args.jelly
===================================================================
<?xml version="1.0"?>
<!-- displays the current command line arguments -->
<j:jelly xmlns:j="jelly:core">
<j:forEach var="arg" items="${args}"><j:expr
value="${arg}"/> </j:forEach>
</j:jelly>
1.30 +10 -40 jakarta-commons-sandbox/jelly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 25 May 2002 18:27:21 -0000 1.29
+++ build.xml 28 May 2002 07:20:06 -0000 1.30
@@ -255,56 +255,26 @@
</target>
-<!--
- <target name="demo.1" depends="compile"
- description="Runs demo #1">
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/testing123.jelly"/>
- <arg value="one"/>
- <arg value="two"/>
- <arg value="three"/>
- </java>
- </target>
-
- <target name="demo.2" depends="compile"
- description="Runs demo #2">
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/example2.jelly"/>
- </java>
- </target>
-
- <target name="demo.3" depends="compile"
- description="Runs demo #3">
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/example3.jelly"/>
- <arg value="one"/>
- <arg value="two"/>
- <arg value="three"/>
- </java>
- </target>
-
- <target name="demo.sysprop" depends="compile"
- description="Runs demo which displays system properties">
- <java classname="org.apache.commons.jelly.Jelly" fork="yes">
- <classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/show_properties.jelly"/>
- </java>
+ <target name="demo.all" depends="compile"
+ description="Runs various example Jelly scripts">
+
+ <jelly file="src/test/org/apache/commons/jelly/run_all.jelly"/>
+
</target>
- <target name="demo.all" depends="compile"
- description="Runs all the demo scripts inside one single script">
+ <target name="demo.args" depends="compile"
+ description="Runs a demo of processing command line arguments">
+
<java classname="org.apache.commons.jelly.Jelly" fork="yes">
<classpath refid="test.classpath"/>
- <arg value="src/test/org/apache/commons/jelly/run_all.jelly"/>
+ <arg value="src/test/org/apache/commons/jelly/show_args.jelly"/>
<arg value="one"/>
<arg value="two"/>
<arg value="three"/>
</java>
</target>
+<!--
<target name="demo.pnuts" depends="compile, checkPNuts"
description="Runs a pnuts demo which displays system properties">
<java classname="org.apache.commons.jelly.Jelly" fork="yes">
1.2 +5 -1 jakarta-commons-sandbox/jelly/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/gump.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gump.xml 21 May 2002 08:01:31 -0000 1.1
+++ gump.xml 28 May 2002 07:20:06 -0000 1.2
@@ -2,7 +2,7 @@
<description>Commons Jelly</description>
- <url href="http://jakarta.apache.org/commons/jelly.html"/>
+ <url href="http://jakarta.apache.org/commons/sandbox/jelly.html"/>
<cvs repository="jakarta"/>
@@ -25,9 +25,13 @@
<depend project="commons-logging"/>
<depend project="commons-beanutils"/>
+ <depend project="commons-collections"/>
<depend project="commons-digester"/>
<depend project="dom4j"/>
+ <depend project="commons-jexl"/>
+ <depend project="velocity"/>
<depend project="jdbc-stdext"/>
+ <depend project="hsqldb"/>
<work nested="target/classes"/>
<home nested="target"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
