Author: apetrelli
Date: Sat Mar 20 13:29:13 2010
New Revision: 925605
URL: http://svn.apache.org/viewvc?rev=925605&view=rev
Log:
TILESSB-30
Moved code from tiles-velocity to tiles-autotag-velocity-runtime.
Removed:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityModelBody.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/package.html
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodylessDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.AddAttributeModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.AddListAttributeModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.DefinitionModel;
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
Sat Mar 20 13:29:13 2010
@@ -28,10 +28,11 @@ import java.util.Map;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.GetAsStringModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link GetAsStringModel} to be used in Velocity. For the list of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -23,9 +23,10 @@ package org.apache.tiles.velocity.templa
import java.util.Map;
+import org.apache.tiles.autotag.velocity.runtime.BodylessDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.ImportAttributeModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link ImportAttributeModel} to be used in Velocity. For the list
of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -26,10 +26,11 @@ import java.util.Map;
import org.apache.tiles.Attribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.DefaultAttributeResolver;
import org.apache.tiles.template.InsertAttributeModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link InsertAttributeModel} to be used in Velocity. For the list
of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,9 +25,10 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.InsertDefinitionModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link InsertDefinitionModel} to be used in Velocity. For the list
of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,9 +25,10 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.InsertTemplateModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link InsertTemplateModel} to be used in Velocity. For the list of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,9 +25,10 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.PutAttributeModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link PutAttributeModel} to be used in Velocity. For the list of
Modified:
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java?rev=925605&r1=925604&r2=925605&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
Sat Mar 20 13:29:13 2010
@@ -25,9 +25,10 @@ import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
import org.apache.tiles.template.PutListAttributeModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Wraps {...@link PutListAttributeModel} to be used in Velocity. For the list
of
