svn commit: r692177 - in /velocity/engine/trunk/src/java/org/apache/velocity/runtime: Renderable.java directive/Define.java parser/node/ASTReference.java parser/node/Renderable.java

[cbrisson]

Author: cbrisson
Date: Thu Sep  4 11:03:57 2008
New Revision: 692177

URL: http://svn.apache.org/viewvc?rev=692177&view=rev
Log:
move Renderable interface to o.a.v.runtime (and actually USE it\!)

Added:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/Renderable.java
      - copied, changed from r691943, 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Renderable.java
Removed:
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Renderable.java
Modified:
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Define.java
    
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java

Copied: 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/Renderable.java 
(from r691943, 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Renderable.java)
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/Renderable.java?p2=velocity/engine/trunk/src/java/org/apache/velocity/runtime/Renderable.java&p1=velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Renderable.java&r1=691943&r2=692177&rev=692177&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Renderable.java
 (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/Renderable.java 
Thu Sep  4 11:03:57 2008
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser.node;
+package org.apache.velocity.runtime;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Define.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Define.java?rev=692177&r1=692176&r2=692177&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Define.java
 (original)
+++ 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Define.java
 Thu Sep  4 11:03:57 2008
@@ -24,13 +24,14 @@
 import java.io.StringWriter;
 
 import org.apache.commons.lang.text.StrBuilder;
-import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.node.Node;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.exception.VelocityException;
+import org.apache.velocity.runtime.Renderable;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.runtime.log.Log;
+import org.apache.velocity.runtime.parser.node.Node;
 
 /**
  * Directive that puts an unrendered AST block in the context
@@ -139,7 +140,7 @@
      * being used for the render, as well as the parent (which already holds
      * everything else we need).
      */
-    public static class Block
+    public static class Block implements Renderable
     {
         private InternalContextAdapter context;
         private Writer writer;

Modified: 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=692177&r1=692176&r2=692177&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 (original)
+++ 
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 Thu Sep  4 11:03:57 2008
@@ -30,6 +30,7 @@
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.Renderable;
 import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.util.introspection.Info;