You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/03/07 20:30:18 UTC
svn commit: r920064 - in /tiles/sandbox/trunk/tiles-autotag:
tiles-autotag-jsp-runtime/ tiles-autotag-jsp-runtime/src/main/java/org/
tiles-autotag-jsp-runtime/src/main/java/org/apache/
tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/ tiles-aut...
Author: apetrelli
Date: Sun Mar 7 19:30:17 2010
New Revision: 920064
URL: http://svn.apache.org/viewvc?rev=920064&view=rev
Log:
TILESSB-26
Moved code from tiles-jsp to tiles-autotag-jsp-runtime.
Modified tiles-autotag-jsp accordingly.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodyTag.java
- copied, changed from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodyTag.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodylessTag.java
- copied, changed from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodylessTag.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java
- copied, changed from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspModelBody.java
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml?rev=920064&r1=920063&r2=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml Sun Mar 7 19:30:17 2010
@@ -10,4 +10,22 @@
<version>1.0-SNAPSHOT</version>
<name>Autotag - JSP runtime code</name>
<description>Contains classes used by code generated by Autotag - JSP.</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-jsp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodyTag.java (from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodyTag.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodyTag.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodyTag.java&p1=tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodyTag.java&r1=920006&r2=920064&rev=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodyTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodyTag.java Sun Mar 7 19:30:17 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.jsp.taglib;
+package org.apache.tiles.autotag.jsp.runtime;
import java.io.IOException;
@@ -7,7 +7,6 @@
import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.jsp.JspModelBody;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.jsp.JspRequest;
Copied: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodylessTag.java (from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodylessTag.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodylessTag.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodylessTag.java&p1=tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodylessTag.java&r1=920006&r2=920064&rev=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/BodylessTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/BodylessTag.java Sun Mar 7 19:30:17 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.jsp.taglib;
+package org.apache.tiles.autotag.jsp.runtime;
import java.io.IOException;
Copied: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java (from r920006, tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspModelBody.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java&p1=tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspModelBody.java&r1=920006&r2=920064&rev=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/JspModelBody.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java Sun Mar 7 19:30:17 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.jsp;
+package org.apache.tiles.autotag.jsp.runtime;
import java.io.IOException;
import java.io.Writer;
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm?rev=920064&r1=920063&r2=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm Sun Mar 7 19:30:17 2010
@@ -24,7 +24,7 @@
#if(${clazz.hasBody()})
import org.apache.tiles.autotag.core.runtime.ModelBody;
#end
-import org.apache.tiles.jsp.taglib.Body#if(!${clazz.hasBody()})less#{end}Tag;
+import org.apache.tiles.autotag.jsp.runtime.Body#if(!${clazz.hasBody()})less#{end}Tag;
import org.apache.tiles.request.Request;
/**
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java?rev=920064&r1=920063&r2=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java Sun Mar 7 19:30:17 2010
@@ -2,7 +2,7 @@
import java.io.IOException;
-import org.apache.tiles.jsp.taglib.BodylessTag;
+import org.apache.tiles.autotag.jsp.runtime.BodylessTag;
import org.apache.tiles.request.Request;
/**
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java?rev=920064&r1=920063&r2=920064&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java Sun Mar 7 19:30:17 2010
@@ -3,7 +3,7 @@
import java.io.IOException;
import org.apache.tiles.autotag.core.runtime.ModelBody;
-import org.apache.tiles.jsp.taglib.BodyTag;
+import org.apache.tiles.autotag.jsp.runtime.BodyTag;
import org.apache.tiles.request.Request;
/**