dion 2003/01/07 06:42:59
Modified: jelly/src/test/org/apache/commons/jelly/mock service.jelly
suite.jelly
jelly project.xml
jelly/src/test/org/apache/commons/jelly TestParser.java
Removed: jelly/src/test/org/apache/commons/jelly/soap example.jelly
Log:
Remove sql taglib from tests
Move soap tests to taglib
Revision Changes Path
1.3 +15 -10
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/service.jelly
Index: service.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/service.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- service.jelly 27 Nov 2002 19:13:25 -0000 1.2
+++ service.jelly 7 Jan 2003 14:42:58 -0000 1.3
@@ -4,22 +4,27 @@
|| via Mock Tags
-->
-<j:jelly xmlns:j="jelly:core" xmlns:sql="jelly:sql" xmlns:my="myFoodWebService"
xmlns:log="jelly:log">
+<j:jelly xmlns:j="jelly:core" xmlns:my="myFoodWebService" xmlns:log="jelly:log">
- <sql:query var="results">
+<!-- <sql:query var="results">
select * from food where kind = ?
-
+-->
<!-- lets pass in some parametrized value -->
- <sql:param value="${foodKind}"/>
+<!-- <sql:param value="${foodKind}"/>
</sql:query>
-
- <!-- invoke some service -->
+-->
+ <!-- invoke some service
<j:forEach items="${results.rows}" var="row">
<log:info>Found row with ID ${row.id}</log:info>
-
- <!-- this tag could invoke a web service etc -->
- <my:eat cheese="${row.id}"/>
- </j:forEach>
+-->
+ <!-- this tag could invoke a web service etc
+ <my:eat cheese="${row.id}"/> -->
+ <!-- FIXME: Commented code above and repeated line are a
+ workaround as the sql taglib has been removed
+ -->
+ <my:eat cheese="abc"/>
+ <my:eat cheese="def"/>
+<!-- </j:forEach> -->
</j:jelly>
1.3 +10 -10
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/suite.jelly
Index: suite.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/mock/suite.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- suite.jelly 27 Nov 2002 19:13:25 -0000 1.2
+++ suite.jelly 7 Jan 2003 14:42:58 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<test:suite xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:mock="jelly:define"
xmlns:sql="jelly:sql" xmlns:log="jelly:log">
+<test:suite xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:mock="jelly:define"
xmlns:log="jelly:log">
<!-- lets create some mock tags and test a sample script that it evaluates the
|| mock tags as we'd expect
@@ -14,24 +14,24 @@
-->
<j:set var="foodKind" value="pizza"/>
- <mock:taglib uri="jelly:sql">
+<!-- <mock:taglib uri="jelly:sql">
<mock:tag name="query">
-
- <!-- generate a mock result set -->
+-->
+ <!-- generate a mock result set
<sql:resultSet var="results">
<sql:row id="abc"/>
<sql:row id="def"/>
</sql:resultSet>
-
- <!-- since we are inside a Tag Context, lets export the results variable
to the parent context -->
- <j:set var="${var}" scope="parent" value="${results}"/>
- </mock:tag>
+ -->
+ <!-- since we are inside a Tag Context, lets export the results variable
to the parent context
+ <j:set var="${var}" scope="parent" value="${results}"/>-->
+<!-- </mock:tag>
<mock:tag name="param">
<test:equals expects="pizza" value="${value}"/>
</mock:tag>
</mock:taglib>
-
+-->
<mock:taglib uri="myFoodWebService">
<mock:tag name="eat">
<log:info>Invoking the eat web service with
${cheese}</log:info>
@@ -56,7 +56,7 @@
</mock:tag>
</mock:taglib>
- <!-- now lets invoke the service using the Mock Tags -->
+ <!-- now lets invoke the service using the Mock Tags -->
<j:include uri="service.jelly"/>
1.117 +70 -88 jakarta-commons-sandbox/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- project.xml 7 Jan 2003 08:44:27 -0000 1.116
+++ project.xml 7 Jan 2003 14:42:59 -0000 1.117
@@ -19,26 +19,26 @@
<inceptionYear>2002</inceptionYear>
<package>org.apache.commons.jelly</package>
<packageGroups>
- <packageGroup>
- <title>Core Public API</title>
- <packages>org.apache.commons.jelly</packages>
- </packageGroup>
- <packageGroup>
- <title>Utility classes for using Jelly from Ant</title>
- <packages>org.apache.commons.jelly.task</packages>
- </packageGroup>
- <packageGroup>
- <title>Utility classes for using Jelly from Servlets</title>
- <packages>org.apache.commons.jelly.servlet</packages>
- </packageGroup>
- <packageGroup>
- <title>Classes used by Tag Implementors</title>
-
<packages>org.apache.commons.jelly.impl,org.apache.commons.jelly.tags,org.apache.commons.jelly.expression</packages>
- </packageGroup>
- <packageGroup>
- <title>Tag Implementations</title>
- <packages>org.apache.commons.jelly.tags.*</packages>
- </packageGroup>
+ <packageGroup>
+ <title>Core Public API</title>
+ <packages>org.apache.commons.jelly</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Utility classes for using Jelly from Ant</title>
+ <packages>org.apache.commons.jelly.task</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Utility classes for using Jelly from Servlets</title>
+ <packages>org.apache.commons.jelly.servlet</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Classes used by Tag Implementors</title>
+
<packages>org.apache.commons.jelly.impl,org.apache.commons.jelly.tags,org.apache.commons.jelly.expression</packages>
+ </packageGroup>
+ <packageGroup>
+ <title>Tag Implementations</title>
+ <packages>org.apache.commons.jelly.tags.*</packages>
+ </packageGroup>
</packageGroups>
<shortDescription>Commons Jelly</shortDescription>
@@ -46,9 +46,9 @@
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>
- Jelly is a Java and XML based scripting engine.
- Jelly combines the best ideas from JSTL, Velocity, DVSL, Ant and Cocoon all
together in a simple
- yet powerful scripting engine.
+ Jelly is a Java and XML based scripting engine.
+ Jelly combines the best ideas from JSTL, Velocity, DVSL, Ant and Cocoon all
together in a simple
+ yet powerful scripting engine.
</description>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
@@ -134,7 +134,7 @@
<name>Erik Fransen</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Logo designer</role>
+ <role>Logo designer</role>
</roles>
</contributor>
<contributor>
@@ -148,7 +148,7 @@
<name>Vinay Chandran</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -159,7 +159,7 @@
<email>[EMAIL PROTECTED]</email>
<organization>ThoughtWorks, Inc.</organization>
<roles>
- <role>Inventor of Mock Tags</role>
+ <role>Inventor of Mock Tags</role>
</roles>
</contributor>
<contributor>
@@ -167,22 +167,22 @@
<email>[EMAIL PROTECTED]</email>
<organization></organization>
<roles>
- <role>Author of the tutorials</role>
- <role>Developer</role>
+ <role>Author of the tutorials</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
<name>Robert Leftwich</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
<name>Paul Libbrecht</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -190,14 +190,14 @@
<email>[EMAIL PROTECTED]</email>
<organization>Genscape, Inc.</organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
<name>Jason Horman</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -205,7 +205,7 @@
<email>[EMAIL PROTECTED]</email>
<organization>Intalio, Inc.</organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -213,7 +213,7 @@
<email>[EMAIL PROTECTED]</email>
<organization></organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -221,7 +221,7 @@
<email>[EMAIL PROTECTED]</email>
<organization></organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -229,7 +229,7 @@
<email></email>
<organization></organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -237,7 +237,7 @@
<email></email>
<organization></organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
<contributor>
@@ -245,11 +245,11 @@
<email></email>
<organization></organization>
<roles>
- <role>Developer</role>
+ <role>Developer</role>
</roles>
</contributor>
</contributors>
-
+
<dependencies>
&commonDeps;
@@ -266,7 +266,7 @@
<version>SNAPSHOT</version>
</dependency>
- <!-- this is brought in by the commons-cli dependency -->
+ <!-- this is brought in by the commons-cli dependency -->
<dependency>
<id>commons-lang</id>
<version>SNAPSHOT</version>
@@ -277,7 +277,7 @@
<version>SNAPSHOT</version>
</dependency>
- <!-- for the jelly startup scripts -->
+ <!-- for the jelly startup scripts -->
<dependency>
<id>forehead</id>
<version>1.0-beta-2</version>
@@ -295,11 +295,11 @@
<version>0.7.1</version>
</dependency>
- <!-- used by SQL library -->
+ <!-- used by SQL library
<dependency>
<id>jdbc</id>
<version>2.0</version>
- </dependency>
+ </dependency> -->
<dependency>
<id>junit</id>
@@ -322,19 +322,19 @@
|| These will be sub-projects one day, when Maven handles them gracefully
-->
- <!-- beanshell taglib -->
+ <!-- beanshell taglib -->
<dependency>
<id>bsh</id>
<version>1.2-b3</version>
</dependency>
- <!-- bsf taglib -->
+ <!-- bsf taglib -->
<dependency>
<id>bsf</id>
<version>2.2</version>
</dependency>
- <!-- jms taglib -->
+ <!-- jms taglib -->
<dependency>
<id>commons-messenger</id>
<version>1.0-dev-8</version>
@@ -345,13 +345,13 @@
<version>1.0.2b</version>
</dependency>
- <!-- scheduler taglib -->
+ <!-- scheduler taglib -->
<dependency>
<id>quartz</id>
<version>SNAPSHOT</version>
</dependency>
- <!-- email taglib -->
+ <!-- email taglib -->
<dependency>
<id>jaf</id>
<version>1.0.2</version>
@@ -363,26 +363,8 @@
<version>1.2</version>
</dependency>
- <!-- soap taglib -->
- <dependency>
- <id>axis</id>
- <version>1.0</version>
- </dependency>
- <dependency>
- <id>jaxrpc</id>
- <version>1.0</version>
- </dependency>
- <dependency>
- <id>saaj</id>
- <version>1.1</version>
- </dependency>
-<!--
- <dependency>
- <id>wsdl4j</id>
- <version>1.0</version>
- </dependency>
--->
</dependencies>
+
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
@@ -391,13 +373,13 @@
<aspectSourceDirectory/>
<!-- Resources that are packaged up inside the JAR file -->
- <resources>
- <resource>
- <directory>src/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
</resources>
@@ -406,20 +388,20 @@
<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>
- <include>**/*.properties</include>
- <include>**/*.html</include>
- </includes>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.jelly</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.rng</include>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
1.5 +1 -1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java
Index: TestParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestParser.java 11 Dec 2002 12:40:58 -0000 1.4
+++ TestParser.java 7 Jan 2003 14:42:59 -0000 1.5
@@ -102,7 +102,7 @@
* Tests that parsing an example script correctly creates the parent
relationships
*/
public void testParser() throws Exception {
- InputStream in = new
FileInputStream("src/test/org/apache/commons/jelly/sql/example2.jelly");
+ InputStream in = new
FileInputStream("src/test/org/apache/commons/jelly/example2.jelly");
XMLParser parser = new XMLParser();
Script script = parser.parse(in);
script = script.compile();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
