svn commit: r748128 - in /tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity: ./ context/ template/

apetrelli Thu, 26 Feb 2009 05:08:00 -0800

Author: apetrelli
Date: Thu Feb 26 13:07:29 2009
New Revision: 748128

URL: http://svn.apache.org/viewvc?rev=748128&view=rev
Log:
TILESSB-7
Package reorganization.


Added:
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
      - copied, changed from r747733, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityTiles2RequestContext.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
      - copied, changed from r747733, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityContextFactory.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityUtil.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddListAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/BodyExecutable.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ContextHolder.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/DefinitionVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Executable.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/GetAsStringVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ImportAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertDefinitionVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertTemplateVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutListAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Tiles2Tool.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java
      - copied, changed from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityRepository.java
Removed:
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddListAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/BodyExecutable.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ContextHolder.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/DefinitionVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Executable.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/GetAsStringVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ImportAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertDefinitionVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertTemplateVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutListAttributeVModel.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Tiles2Tool.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityRepository.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityContextFactory.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityTiles2RequestContext.java
    
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityUtil.java

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
 (from r747733, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityTiles2RequestContext.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityTiles2RequestContext.java&r1=747733&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityTiles2RequestContext.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
 Thu Feb 26 13:07:29 2009
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.context;
 
 import java.io.IOException;
 
@@ -31,13 +31,13 @@
  * @author SergeyZ
  * 
  */
-public class VelocityTiles2RequestContext extends TilesRequestContextWrapper {
+public class VelocityTilesRequestContext extends TilesRequestContextWrapper {
 
     private final Context ctx;
     
     private Object[] requestObjects;
 
-    public VelocityTiles2RequestContext(TilesRequestContext enclosedRequest, 
Context ctx) {
+    public VelocityTilesRequestContext(TilesRequestContext enclosedRequest, 
Context ctx) {
         super(enclosedRequest);
         this.ctx = ctx;
         // FIXME This should go into a renderer

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
 (from r747733, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityContextFactory.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityContextFactory.java&r1=747733&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityContextFactory.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
 Thu Feb 26 13:07:29 2009
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.context;
 
 import java.util.Map;
 
@@ -38,7 +38,7 @@
  * 
  * @since Mar 15, 2008
  */
-public class VelocityContextFactory implements TilesRequestContextFactory, 
TilesRequestContextFactoryAware {
+public class VelocityTilesRequestContextFactory implements 
TilesRequestContextFactory, TilesRequestContextFactoryAware {
 
     /**
      * Parent Tiles context factory.
@@ -58,12 +58,12 @@
             } else {
                 enclosedRequest = new ServletTilesRequestContext(context, 
request, response);
             }
-            return new VelocityTiles2RequestContext(enclosedRequest, ctx);
+            return new VelocityTilesRequestContext(enclosedRequest, ctx);
         } else if (requestItems.length == 1
-            && requestItems[0] instanceof VelocityTiles2RequestContext) {
+            && requestItems[0] instanceof VelocityTilesRequestContext) {
             // FIXME is it necessary?
             
-            VelocityTiles2RequestContext ctx = (VelocityTiles2RequestContext) 
requestItems[0];
+            VelocityTilesRequestContext ctx = (VelocityTilesRequestContext) 
requestItems[0];
             return ctx;
         }
         return null;

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityUtil.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityUtil.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/VelocityUtil.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.context;
 
 import java.util.Map;
 import java.util.Stack;

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -7,6 +7,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.AddAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class AddAttributeVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddListAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddListAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/AddListAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/BodyExecutable.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/BodyExecutable.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/BodyExecutable.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ContextHolder.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ContextHolder.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ContextHolder.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/DefinitionVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/DefinitionVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/DefinitionVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -9,6 +9,7 @@
 import org.apache.tiles.mgmt.MutableTilesContainer;
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.DefinitionModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class DefinitionVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Executable.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Executable.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Executable.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/GetAsStringVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/GetAsStringVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/GetAsStringVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.io.IOException;
 import java.util.Map;
@@ -12,6 +12,8 @@
 import org.apache.tiles.TilesContainer;
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.GetAsStringModel;
+import org.apache.tiles.velocity.TilesVelocityException;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class GetAsStringVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ImportAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ImportAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/ImportAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.ImportAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class ImportAttributeVModel implements Executable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.io.IOException;
 import java.util.Map;
@@ -10,6 +10,8 @@
 import org.apache.tiles.Attribute;
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.InsertAttributeModel;
+import org.apache.tiles.velocity.TilesVelocityException;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class InsertAttributeVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertDefinitionVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertDefinitionVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertDefinitionVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.InsertDefinitionModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class InsertDefinitionVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertTemplateVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertTemplateVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/InsertTemplateVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.InsertTemplateModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class InsertTemplateVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.PutAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class PutAttributeVModel implements Executable, BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutListAttributeVModel.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutListAttributeVModel.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/PutListAttributeVModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.tiles.template.PutListAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
 import org.apache.velocity.context.Context;
 
 public class PutListAttributeVModel implements BodyExecutable {

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Tiles2Tool.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Tiles2Tool.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/Tiles2Tool.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Tiles2Tool.java
 Thu Feb 26 13:07:29 2009
@@ -18,7 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import java.io.IOException;
 import java.util.Map;

Copied: 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java
 (from r748125, 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityRepository.java)
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java?p2=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java&p1=tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityRepository.java&r1=748125&r2=748128&rev=748128&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityRepository.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/TilesVelocityRepository.java
 Thu Feb 26 13:07:29 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.velocity;
+package org.apache.tiles.velocity.template;
 
 import javax.servlet.ServletContext;

svn commit: r748128 - in /tiles/sandbox/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity: ./ context/ template/

Reply via email to