You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/03/26 22:34:40 UTC
svn commit: r1305546 - in /tiles/framework/trunk: tiles-autotag/
tiles-autotag/tiles-autotag-freemarker-runtime/
tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Author: nlebas
Date: Mon Mar 26 20:34:37 2012
New Revision: 1305546
URL: http://svn.apache.org/viewvc?rev=1305546&view=rev
Log:
merged the autotag-runtime projects into the matching request implementations, as discussed here: http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q@mail.gmail.com%3E
Added:
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagException.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntime.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/package-info.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagExceptionTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntimeTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBodyTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntime.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/package-info.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/package-info.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntimeTest.java
tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspModelBodyTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspModelBodyTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntime.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/package-info.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntimeTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityModelBodyTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityUtilTest.java
- copied, changed from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
Removed:
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntime.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/site/site.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntimeTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntime.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/package-info.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/site/site.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntimeTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspModelBodyTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntime.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/site/site.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntimeTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java
Modified:
tiles/framework/trunk/tiles-autotag/pom.xml
tiles/framework/trunk/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml
Modified: tiles/framework/trunk/tiles-autotag/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/pom.xml?rev=1305546&r1=1305545&r2=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/pom.xml Mon Mar 26 20:34:37 2012
@@ -57,10 +57,7 @@ under the License.
<module>tiles-autotag-core-runtime</module>
<module>tiles-autotag-core</module>
<module>tiles-autotag-jsp</module>
- <module>tiles-autotag-jsp-runtime</module>
- <module>tiles-autotag-freemarker-runtime</module>
<module>tiles-autotag-freemarker</module>
- <module>tiles-autotag-velocity-runtime</module>
<module>tiles-autotag-velocity</module>
<module>maven-autotag-plugin</module>
</modules>
Modified: tiles/framework/trunk/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=1305546&r1=1305545&r2=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Mon Mar 26 20:34:37 2012
@@ -177,7 +177,7 @@ public class UseAttributeTag extends Sim
/** {@inheritDoc} */
@Override
public void doTag() throws JspException, IOException {
- AutotagRuntime runtime = new org.apache.tiles.autotag.jsp.runtime.JspAutotagRuntime();
+ AutotagRuntime runtime = new org.apache.tiles.request.jsp.autotag.JspAutotagRuntime();
if (runtime instanceof SimpleTagSupport) {
SimpleTagSupport tag = (SimpleTagSupport) runtime;
tag.setJspContext(getJspContext());
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml?rev=1305546&r1=1305545&r2=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml Mon Mar 26 20:34:37 2012
@@ -77,5 +77,11 @@ under the License.
<version>2.5.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagException.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagException.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagException.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagException.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagException.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
/**
* Thrown when a Freemarker problem under Autotag runtime part happens.
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntime.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntime.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntime.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import java.util.Map;
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBody.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import java.io.IOException;
import java.io.Writer;
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtil.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java Mon Mar 26 20:34:37 2012
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/package-info.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/package-info.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/package-info.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/package-info.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/package-info.java Mon Mar 26 20:34:37 2012
@@ -21,4 +21,4 @@
/**
* Runtime part of Autotag support for Freemarker.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagExceptionTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagExceptionTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagExceptionTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagExceptionTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagExceptionTest.java Mon Mar 26 20:34:37 2012
@@ -19,10 +19,11 @@
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import static org.junit.Assert.*;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerAutotagException;
import org.junit.Test;
/**
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntimeTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntimeTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerAutotagRuntimeTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -37,6 +37,8 @@ import org.apache.tiles.request.Applicat
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.freemarker.FreemarkerRequest;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerAutotagRuntime;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerModelBody;
import org.junit.Test;
import freemarker.core.Environment;
import freemarker.core.Macro;
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBodyTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBodyTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBodyTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerModelBodyTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBodyTest.java Mon Mar 26 20:34:37 2012
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import static org.easymock.EasyMock.*;
import java.io.IOException;
import java.io.Writer;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerModelBody;
import org.junit.Test;
import freemarker.template.TemplateDirectiveBody;
@@ -38,7 +39,7 @@ import freemarker.template.TemplateExcep
public class FreemarkerModelBodyTest {
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.FreemarkerModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.freemarker.autotag.FreemarkerModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws TemplateException If something goes wrong.
*/
@@ -56,7 +57,7 @@ public class FreemarkerModelBodyTest {
}
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.FreemarkerModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.freemarker.autotag.FreemarkerModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws TemplateException If something goes wrong.
*/
@@ -71,7 +72,7 @@ public class FreemarkerModelBodyTest {
}
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.FreemarkerModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.freemarker.autotag.FreemarkerModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws TemplateException If something goes wrong.
*/
Copied: tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/src/test/java/org/apache/tiles/autotag/freemarker/runtime/FreemarkerUtilTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.freemarker.runtime;
+package org.apache.tiles.request.freemarker.autotag;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -26,6 +26,8 @@ import static org.junit.Assert.*;
import java.io.Writer;
import java.util.HashMap;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerAutotagException;
+import org.apache.tiles.request.freemarker.autotag.FreemarkerUtil;
import org.junit.Test;
import freemarker.core.Environment;
Modified: tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml?rev=1305546&r1=1305545&r2=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml Mon Mar 26 20:34:37 2012
@@ -87,5 +87,11 @@ under the License.
<version>1.0.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
Copied: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntime.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java?p2=tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntime.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntime.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.jsp.runtime;
+package org.apache.tiles.request.jsp.autotag;
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
Copied: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java?p2=tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/JspModelBody.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.jsp.runtime;
+package org.apache.tiles.request.jsp.autotag;
import java.io.IOException;
import java.io.Writer;
Copied: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/package-info.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/package-info.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/package-info.java?p2=tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/package-info.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/package-info.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/main/java/org/apache/tiles/autotag/jsp/runtime/package-info.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/package-info.java Mon Mar 26 20:34:37 2012
@@ -21,4 +21,4 @@
/**
* Runtime part of Autotag support for JavaServer pages.
*/
-package org.apache.tiles.autotag.jsp.runtime;
+package org.apache.tiles.request.jsp.autotag;
Copied: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntimeTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntimeTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspAutotagRuntimeTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java Mon Mar 26 20:34:37 2012
@@ -1,4 +1,4 @@
-package org.apache.tiles.autotag.jsp.runtime;
+package org.apache.tiles.request.jsp.autotag;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -16,6 +16,8 @@ import org.apache.tiles.request.Applicat
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.jsp.JspRequest;
+import org.apache.tiles.request.jsp.autotag.JspAutotagRuntime;
+import org.apache.tiles.request.jsp.autotag.JspModelBody;
import org.junit.Test;
public class JspAutotagRuntimeTest {
Copied: tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspModelBodyTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspModelBodyTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspModelBodyTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspModelBodyTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspModelBodyTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/src/test/java/org/apache/tiles/autotag/jsp/runtime/JspModelBodyTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspModelBodyTest.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.jsp.runtime;
+package org.apache.tiles.request.jsp.autotag;
import static org.easymock.EasyMock.*;
@@ -30,6 +30,7 @@ import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.JspFragment;
+import org.apache.tiles.request.jsp.autotag.JspModelBody;
import org.junit.Test;
/**
@@ -40,7 +41,7 @@ import org.junit.Test;
public class JspModelBodyTest {
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.jsp.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws JspException If something goes wrong.
*/
@@ -60,7 +61,7 @@ public class JspModelBodyTest {
}
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.jsp.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws JspException If something goes wrong.
*/
@@ -78,7 +79,7 @@ public class JspModelBodyTest {
}
/**
- * Test method for {@link org.apache.tiles.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.jsp.autotag.freemarker.runtime.JspModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
* @throws JspException If something goes wrong.
*/
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml?rev=1305546&r1=1305545&r2=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml Mon Mar 26 20:34:37 2012
@@ -52,7 +52,7 @@ under the License.
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -66,5 +66,11 @@ under the License.
<artifactId>tiles-request-servlet</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntime.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntime.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntime.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import java.io.Writer;
import java.util.Map;
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java Mon Mar 26 20:34:37 2012
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import java.io.IOException;
import java.io.Writer;
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java Mon Mar 26 20:34:37 2012
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import java.util.Map;
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/package-info.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/package-info.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/package-info.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/package-info.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/package-info.java Mon Mar 26 20:34:37 2012
@@ -21,4 +21,4 @@
/**
* Runtime part of Autotag support for Velocity.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntimeTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntimeTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityAutotagRuntimeTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java Mon Mar 26 20:34:37 2012
@@ -1,4 +1,4 @@
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
@@ -12,6 +12,8 @@ import org.apache.tiles.request.Applicat
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.velocity.VelocityRequest;
+import org.apache.tiles.request.velocity.autotag.VelocityAutotagRuntime;
+import org.apache.tiles.request.velocity.autotag.VelocityModelBody;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.node.ASTBlock;
import org.apache.velocity.runtime.parser.node.ASTMap;
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityModelBodyTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityModelBodyTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityModelBodyTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBodyTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityModelBodyTest.java Mon Mar 26 20:34:37 2012
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import static org.easymock.EasyMock.*;
import java.io.IOException;
import java.io.Writer;
+import org.apache.tiles.request.velocity.autotag.VelocityModelBody;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.node.ASTBlock;
import org.junit.Test;
@@ -37,7 +38,7 @@ import org.junit.Test;
public class VelocityModelBodyTest {
/**
- * Test method for {@link org.apache.tiles.autotag.velocity.runtime.VelocityModelBody#evaluate(java.io.Writer)}.
+ * Test method for {@link org.apache.tiles.request.velocity.autotag.VelocityModelBody#evaluate(java.io.Writer)}.
* @throws IOException If something goes wrong.
*/
@Test
Copied: tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityUtilTest.java (from r1305507, tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityUtilTest.java?p2=tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityUtilTest.java&p1=tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java&r1=1305507&r2=1305546&rev=1305546&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtilTest.java (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityUtilTest.java Mon Mar 26 20:34:37 2012
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.autotag.velocity.runtime;
+package org.apache.tiles.request.velocity.autotag;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import java.util.Map;
+import org.apache.tiles.request.velocity.autotag.VelocityUtil;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.node.ASTMap;
import org.apache.velocity.runtime.parser.node.Node;
Re: svn commit: r1305546 - in /tiles/framework/trunk:
tiles-autotag/ tiles-autotag/tiles-autotag-freemarker-runtime/
tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Posted by Mick Semb Wever <mc...@apache.org>.
On Tue, 2012-04-24 at 10:35 -0400, Nicolas LE BAS wrote:
>
> That's not the link I posted.
> And that's not the link in "svn log" either.
Oh man my bad.
It's nntp.gmane.org mangling those addresses inside the links...
I probably come across this before and clean forgotten.
so nevermind, sorry for the bum steer :-)
~mck
--
"Some husbands are living proof that a woman can take a joke."
| http://github.com/finn-no | http://tech.finn.no |
Re: svn commit: r1305546 - in /tiles/framework/trunk: tiles-autotag/
tiles-autotag/tiles-autotag-freemarker-runtime/ tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Posted by Nicolas LE BAS <ma...@nlebas.net>.
On 12-04-24 10:23 AM, Mick Semb Wever wrote:
> On Tue, 2012-04-24 at 10:08 -0400, Nicolas LE BAS wrote:
>>
>> After a bit of searching, I found it again. I was refering to:
>> http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org%3E
>
> that's the same link :( (which gives 404)
>
> ~mck
>
That's not the link I posted.
And that's not the link in "svn log" either.
The mailing list is tranforming the link, but I don't know why or how...
Nick.
Re: svn commit: r1305546 - in /tiles/framework/trunk:
tiles-autotag/ tiles-autotag/tiles-autotag-freemarker-runtime/
tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Posted by Mick Semb Wever <mc...@apache.org>.
On Tue, 2012-04-24 at 10:08 -0400, Nicolas LE BAS wrote:
>
> After a bit of searching, I found it again. I was refering to:
> http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org%3E
that's the same link :( (which gives 404)
~mck
--
what goes around comes around
| http://github.com/finn-no | http://tech.finn.no |
Re: svn commit: r1305546 - in /tiles/framework/trunk: tiles-autotag/
tiles-autotag/tiles-autotag-freemarker-runtime/ tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Posted by Nicolas LE BAS <ma...@nlebas.net>.
On 12-04-24 07:32 AM, Mick Semb Wever wrote:
>
>> merged the autotag-runtime projects into the matching request implementations, as discussed here:
>> http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org%3E
>
> that link doesn't work for me.
>
> ~mck
>
Weird... where did I get that link?
After a bit of searching, I found it again. I was refereing to:
http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q@mail.gmail.com%3E
Specifically that part:
On 11-10-18 03:40 AM, Antonio Petrelli wrote:
> > Eventually the tiles-request-XYZ could be merged with
tiles-autotag-XYZ
> > when it's small enough; there's no request coming to tiles from a
JSP except
> > from a taglib.
> >
> I agree, replacing tiles-autotag-XYZ with tiles-autotag-XYZ-runtime.
Re: svn commit: r1305546 - in /tiles/framework/trunk:
tiles-autotag/ tiles-autotag/tiles-autotag-freemarker-runtime/
tiles-autotag/tiles-autotag-freemarker-runtime/src/main/java/org/apache/tiles/autotag/freemarker/runtime/
tiles-autotag/tiles-autotag-freem...
Posted by Mick Semb Wever <mc...@apache.org>.
> merged the autotag-runtime projects into the matching request implementations, as discussed here:
> http://mail-archives.apache.org/mod_mbox/tiles-dev/201110.mbox/%3CCAHTRnew8sEF+GrT_4PC7_OQcoaJo8zpo592bJSgTTdCo3edE0Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org%3E
that link doesn't work for me.
~mck
--
Linux, because I'd rather own a free OS than steal one that's not worth
paying for.
| http://github.com/finn-no | http://tech.finn.no |