Author: nlebas
Date: Wed Jul 11 19:52:00 2012
New Revision: 1360373
URL: http://svn.apache.org/viewvc?rev=1360373&view=rev
Log:
update to autotag 1.1
Modified:
tiles/framework/branches/TILES_3_0_X/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml
tiles/framework/branches/TILES_3_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml
Modified: tiles/framework/branches/TILES_3_0_X/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/pom.xml?rev=1360373&r1=1360372&r2=1360373&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/pom.xml Wed Jul 11 19:52:00 2012
@@ -312,8 +312,8 @@
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tiles.request.version>1.0.0</tiles.request.version>
- <tiles.autotag.version>1.0.0</tiles.autotag.version>
+ <tiles.request.version>1.0.1</tiles.request.version>
+ <tiles.autotag.version>1.1.0</tiles.autotag.version>
</properties>
<dependencies />
Modified: tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml?rev=1360373&r1=1360372&r2=1360373&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-freemarker/pom.xml Wed Jul 11
19:52:00 2012
@@ -45,6 +45,7 @@
</goals>
<configuration>
<packageName>org.apache.tiles.freemarker.template</packageName>
+
<requestClass>org.apache.tiles.request.Request</requestClass>
<freemarkerRuntime>org.apache.tiles.request.freemarker.autotag.FreemarkerAutotagRuntime</freemarkerRuntime>
</configuration>
</execution>
Modified: tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml?rev=1360373&r1=1360372&r2=1360373&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-jsp/pom.xml Wed Jul 11 19:52:00
2012
@@ -81,6 +81,7 @@
<configuration>
<taglibURI>http://tiles.apache.org/tags-tiles</taglibURI>
<packageName>org.apache.tiles.jsp.taglib</packageName>
+
<requestClass>org.apache.tiles.request.Request</requestClass>
<jspRuntime>org.apache.tiles.request.jsp.autotag.JspAutotagRuntime</jspRuntime>
</configuration>
</execution>
Modified:
tiles/framework/branches/TILES_3_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=1360373&r1=1360372&r2=1360373&view=diff
==============================================================================
---
tiles/framework/branches/TILES_3_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
(original)
+++
tiles/framework/branches/TILES_3_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
Wed Jul 11 19:52:00 2012
@@ -22,6 +22,7 @@
package org.apache.tiles.jsp.taglib;
import java.io.IOException;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import javax.servlet.jsp.tagext.TagData;
@@ -177,7 +178,7 @@ public class UseAttributeTag extends Sim
/** {@inheritDoc} */
@Override
public void doTag() throws JspException, IOException {
- AutotagRuntime runtime = new
org.apache.tiles.request.jsp.autotag.JspAutotagRuntime();
+ AutotagRuntime<Request> runtime = new
org.apache.tiles.request.jsp.autotag.JspAutotagRuntime();
if (runtime instanceof SimpleTagSupport) {
SimpleTagSupport tag = (SimpleTagSupport) runtime;
tag.setJspContext(getJspContext());
Modified: tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml?rev=1360373&r1=1360372&r2=1360373&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/tiles-velocity/pom.xml Wed Jul 11
19:52:00 2012
@@ -46,6 +46,7 @@
</goals>
<configuration>
<packageName>org.apache.tiles.velocity.template</packageName>
+
<requestClass>org.apache.tiles.request.Request</requestClass>
<velocityRuntime>org.apache.tiles.request.velocity.autotag.VelocityAutotagRuntime</velocityRuntime>
</configuration>
</execution>
