jstrachan 2003/01/16 01:20:47
Modified: jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl
StyleTag.java StylesheetTag.java JSLTagLibrary.java
TemplateTag.java
jelly/jelly-tags/jsl project.xml
Log:
Patched to use the latest refactored core of Jelly; mostly just swizzling a few
packages
Revision Changes Path
1.5 +1 -1
jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java
Index: StyleTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StyleTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StyleTag.java 11 Dec 2002 12:40:55 -0000 1.4
+++ StyleTag.java 16 Jan 2003 09:20:47 -0000 1.5
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.tags.xml.XPathTagSupport;
+import org.apache.commons.jelly.xpath.XPathTagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.rule.Stylesheet;
1.10 +2 -2
jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java
Index: StylesheetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/StylesheetTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StylesheetTag.java 11 Dec 2002 12:40:55 -0000 1.9
+++ StylesheetTag.java 16 Jan 2003 09:20:47 -0000 1.10
@@ -58,8 +58,8 @@
package org.apache.commons.jelly.tags.jsl;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.tags.xml.XPathSource;
-import org.apache.commons.jelly.tags.xml.XPathTagSupport;
+import org.apache.commons.jelly.xpath.XPathSource;
+import org.apache.commons.jelly.xpath.XPathTagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.rule.Rule;
1.10 +1 -1
jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java
Index: JSLTagLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/JSLTagLibrary.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JSLTagLibrary.java 31 Dec 2002 03:12:23 -0000 1.9
+++ JSLTagLibrary.java 16 Jan 2003 09:20:47 -0000 1.10
@@ -67,7 +67,7 @@
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.tags.xml.ExprTag;
import org.apache.commons.jelly.tags.xml.XMLTagLibrary;
-import org.apache.commons.jelly.tags.xml.XPathExpression;
+import org.apache.commons.jelly.expression.xpath.XPathExpression;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.DocumentHelper;
1.10 +1 -1
jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java
Index: TemplateTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/TemplateTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TemplateTag.java 11 Dec 2002 12:40:55 -0000 1.9
+++ TemplateTag.java 16 Jan 2003 09:20:47 -0000 1.10
@@ -61,7 +61,7 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.tags.xml.XPathSource;
+import org.apache.commons.jelly.xpath.XPathSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.Node;
1.7 +6 -0 jakarta-commons-sandbox/jelly/jelly-tags/jsl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 7 Jan 2003 23:35:14 -0000 1.6
+++ project.xml 16 Jan 2003 09:20:47 -0000 1.7
@@ -34,6 +34,12 @@
<id>commons-jelly</id>
<version>SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <id>commons-jelly+tags-xml</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+
<!-- END for compilation -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
