Author: apetrelli
Date: Sat Mar 20 13:27:56 2010
New Revision: 925603
URL: http://svn.apache.org/viewvc?rev=925603&view=rev
Log:
TILESSB-30
Moved code from tiles-velocity to tiles-autotag-velocity-runtime.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
- copied, changed from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyDirective.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
- copied, changed from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodylessDirective.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
- copied, changed from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityModelBody.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java
- copied, changed from r925590,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/BodyBlockDirectiveTest.java
- copied, changed from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java
Removed:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/META-INF/
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml?rev=925603&r1=925602&r2=925603&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
(original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
Sat Mar 20 13:27:56 2010
@@ -10,4 +10,38 @@
<version>1.0-SNAPSHOT</version>
<name>Autotag - Velocity runtime classes</name>
<description>Runtime code for Velocity directives using template
models.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>2.0-beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-velocity</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
(from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyDirective.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyDirective.java&r1=924483&r2=925603&rev=925603&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyDirective.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodyDirective.java
Sat Mar 20 13:27:56 2010
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.velocity.template;
+package org.apache.tiles.autotag.velocity.runtime;
import java.io.IOException;
import java.io.Writer;
@@ -33,8 +33,6 @@ import org.apache.tiles.autotag.core.run
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.tiles.request.velocity.VelocityRequest;
-import org.apache.tiles.velocity.VelocityModelBody;
-import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.node.ASTBlock;
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
(from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodylessDirective.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodylessDirective.java&r1=924483&r2=925603&rev=925603&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodylessDirective.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/BodylessDirective.java
Sat Mar 20 13:27:56 2010
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.velocity.template;
+package org.apache.tiles.autotag.velocity.runtime;
import java.io.IOException;
import java.io.Writer;
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
import org.apache.tiles.request.velocity.VelocityRequest;
-import org.apache.tiles.velocity.context.VelocityUtil;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.parser.node.Node;
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
(from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityModelBody.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityModelBody.java&r1=924483&r2=925603&rev=925603&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityModelBody.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityModelBody.java
Sat Mar 20 13:27:56 2010
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.autotag.velocity.runtime;
import java.io.IOException;
import java.io.Writer;
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java
(from r925590,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java&r1=925590&r2=925603&rev=925603&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/main/java/org/apache/tiles/autotag/velocity/runtime/VelocityUtil.java
Sat Mar 20 13:27:56 2010
@@ -19,17 +19,13 @@
* under the License.
*/
-package org.apache.tiles.velocity.context;
+package org.apache.tiles.autotag.velocity.runtime;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.Renderable;
import org.apache.velocity.runtime.parser.node.ASTBlock;
@@ -85,35 +81,6 @@ public final class VelocityUtil {
}
/**
- * Sets an attribute in the desired scope.
- *
- * @param velocityContext The Velocity context.
- * @param request The HTTP request.
- * @param servletContext The servlet context.
- * @param name The name of the attribute.
- * @param obj The value of the attribute.
- * @param scope The scope. It can be <code>page</code>,
<code>request</code>
- * , <code>session</code>, <code>application</code>.
- * @since 2.2.0
- */
- public static void setAttribute(Context velocityContext,
- HttpServletRequest request, ServletContext servletContext,
- String name, Object obj, String scope) {
- if (scope == null) {
- scope = "page";
- }
- if ("page".equals(scope)) {
- velocityContext.put(name, obj);
- } else if ("request".equals(scope)) {
- request.setAttribute(name, obj);
- } else if ("session".equals(scope)) {
- request.getSession().setAttribute(name, obj);
- } else if ("application".equals(scope)) {
- servletContext.setAttribute(name, obj);
- }
- }
-
- /**
* Evaluates the body (child node at position 1) and returns it as a
string.
*
* @param context The Velocity context.
Copied:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/BodyBlockDirectiveTest.java
(from r924483,
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java)
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/BodyBlockDirectiveTest.java?p2=tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/BodyBlockDirectiveTest.java&p1=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java&r1=924483&r2=925603&rev=925603&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/BodyBlockDirectiveTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity-runtime/src/test/java/org/apache/tiles/autotag/velocity/runtime/BodyBlockDirectiveTest.java
Sat Mar 20 13:27:56 2010
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.velocity.template;
+package org.apache.tiles.autotag.velocity.runtime;
import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
@@ -37,7 +37,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.util.ApplicationAccess;
import org.apache.tiles.request.velocity.VelocityRequest;
-import org.apache.tiles.velocity.VelocityModelBody;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.directive.DirectiveConstants;
import org.apache.velocity.runtime.parser.node.ASTBlock;
