geirm 01/01/02 21:28:52
Modified: src/java/org/apache/velocity/anakia AnakiaTask.java
src/java/org/apache/velocity/servlet VelocityServlet.java
src/java/org/apache/velocity/test ContextSafetyTestCase.java
InlineScopeVMTestCase.java TemplateTestCase.java
src/java/org/apache/velocity/test/misc Test.java
src/java/org/apache/velocity/texen Generator.java
src/java/org/apache/velocity/texen/ant TexenTask.java
src/java/org/apache/velocity/util/tools
VelocityFormatter.java
Log:
No functional change. New context support in AST.
Revision Changes Path
1.12 +6 -3
jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java
Index: AnakiaTask.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AnakiaTask.java 2000/12/20 07:29:09 1.11
+++ AnakiaTask.java 2001/01/03 05:28:50 1.12
@@ -72,11 +72,12 @@
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import org.apache.velocity.Context;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.util.StringUtils;
+import org.apache.velocity.VelocityContext;
+
/**
* The purpose of this Ant Task is to allow you to use
* Velocity as an XML transformation tool like XSLT is.
@@ -89,7 +90,7 @@
* <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
*
* @author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- * @version $Id: AnakiaTask.java,v 1.11 2000/12/20 07:29:09 jvanzyl Exp $
+ * @version $Id: AnakiaTask.java,v 1.12 2001/01/03 05:28:50 geirm Exp $
*/
public class AnakiaTask extends MatchingTask
{
@@ -310,7 +311,9 @@
projectDocument = builder.build(projectFile);
// Shove things into the Context
- Context context = new Context();
+
+ VelocityContext context = new VelocityContext();
+
context.put ("root", root.getRootElement());
context.put ("xmlout", new XMLOutputter());
context.put ("relativePath", getRelativePath(xmlFile));
1.20 +6 -3
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
Index: VelocityServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VelocityServlet.java 2000/12/20 07:06:04 1.19
+++ VelocityServlet.java 2001/01/03 05:28:51 1.20
@@ -70,12 +70,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.velocity.Context;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.io.VelocityWriter;
import org.apache.velocity.util.SimplePool;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.VelocityContext;
+
/**
* Base class which simplifies the use of Velocity with Servlets.
* Extend this class, implement the <code>handleRequest()</code> method,
@@ -98,7 +100,7 @@
* @author Dave Bryson
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * $Id: VelocityServlet.java,v 1.19 2000/12/20 07:06:04 jvanzyl Exp $
+ * $Id: VelocityServlet.java,v 1.20 2001/01/03 05:28:51 geirm Exp $
*/
public abstract class VelocityServlet extends HttpServlet
{
@@ -219,7 +221,8 @@
try
{
// create a new context
- Context context = new Context();
+ VelocityContext context = new VelocityContext();
+
// put the request/response objects into the context
context.put (REQUEST, request);
context.put (RESPONSE, response);
1.3 +4 -3
jakarta-velocity/src/java/org/apache/velocity/test/ContextSafetyTestCase.java
Index: ContextSafetyTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/ContextSafetyTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextSafetyTestCase.java 2000/12/20 06:50:41 1.2
+++ ContextSafetyTestCase.java 2001/01/03 05:28:51 1.3
@@ -61,7 +61,8 @@
import java.util.Vector;
-import org.apache.velocity.Context;
+import org.apache.velocity.VelocityContext;
+
import org.apache.velocity.Template;
import org.apache.velocity.test.provider.TestProvider;
import org.apache.velocity.runtime.Runtime;
@@ -73,7 +74,7 @@
* and re-merge the template safely.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ContextSafetyTestCase.java,v 1.2 2000/12/20 06:50:41 jvanzyl Exp $
+ * @version $Id: ContextSafetyTestCase.java,v 1.3 2001/01/03 05:28:51 geirm Exp $
*/
public class ContextSafetyTestCase extends RuntimeTestCase
{
@@ -129,7 +130,7 @@
strArray[1] = "array hello 2";
strArray[2] = "array hello 3";
- Context context = new Context();
+ VelocityContext context = new VelocityContext();
try
{
1.5 +4 -3
jakarta-velocity/src/java/org/apache/velocity/test/InlineScopeVMTestCase.java
Index: InlineScopeVMTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/InlineScopeVMTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InlineScopeVMTestCase.java 2000/12/20 06:47:38 1.4
+++ InlineScopeVMTestCase.java 2001/01/03 05:28:51 1.5
@@ -61,7 +61,8 @@
import java.util.Properties;
-import org.apache.velocity.Context;
+import org.apache.velocity.VelocityContext;
+
import org.apache.velocity.Template;
import org.apache.velocity.test.provider.TestProvider;
import org.apache.velocity.runtime.Runtime;
@@ -75,7 +76,7 @@
* Tests if the VM template-locality is working.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InlineScopeVMTestCase.java,v 1.4 2000/12/20 06:47:38 jvanzyl Exp $
+ * @version $Id: InlineScopeVMTestCase.java,v 1.5 2001/01/03 05:28:51 geirm Exp $
*/
public class InlineScopeVMTestCase extends TestCase
{
@@ -172,7 +173,7 @@
* put the Vector into the context, and merge both
*/
- Context context = new Context();
+ VelocityContext context = new VelocityContext();
template1.merge(context, writer1);
writer1.flush();
1.19 +18 -12
jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java
Index: TemplateTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TemplateTestCase.java 2000/12/20 06:36:41 1.18
+++ TemplateTestCase.java 2001/01/03 05:28:51 1.19
@@ -64,7 +64,7 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.velocity.Context;
+import org.apache.velocity.VelocityContext;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.test.provider.TestProvider;
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: TemplateTestCase.java,v 1.18 2000/12/20 06:36:41 jvanzyl Exp $
+ * @version $Id: TemplateTestCase.java,v 1.19 2001/01/03 05:28:51 geirm Exp $
*/
public class TemplateTestCase extends RuntimeTestCase
{
@@ -114,7 +114,9 @@
private TestProvider provider;
private ArrayList al;
private Hashtable h;
- private Context context;
+ private VelocityContext context;
+ private VelocityContext context1;
+ private VelocityContext context2;
private Vector vec;
/**
@@ -149,19 +151,23 @@
vec.addElement( new String("string2"));
/*
- * set up the context
+ * set up 3 chained contexts, and add our data
+ * throught the 3 of them.
*/
- context = new Context();
+ context2 = new VelocityContext();
+ context1 = new VelocityContext( context2 );
+ context = new VelocityContext( context1 );
+
context.put("provider", provider);
- context.put("name", "jason");
- context.put("providers", provider.getCustomers2());
+ context1.put("name", "jason");
+ context2.put("providers", provider.getCustomers2());
context.put("list", al);
- context.put("hashtable", h);
- context.put("search", provider.getSearch());
+ context1.put("hashtable", h);
+ context2.put("search", provider.getSearch());
context.put("relatedSearches", provider.getRelSearches());
- context.put("searchResults", provider.getRelSearches());
- context.put("stringarray", provider.getArray());
+ context1.put("searchResults", provider.getRelSearches());
+ context2.put("stringarray", provider.getArray());
context.put("vector", vec );
}
@@ -185,7 +191,7 @@
Writer writer = new BufferedWriter(new OutputStreamWriter(fos));
/* process the template */
- template.merge(context, writer);
+ template.merge( context, writer);
/* close the file */
writer.flush();
1.10 +6 -4
jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java
Index: Test.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Test.java 2000/12/20 06:59:12 1.9
+++ Test.java 2001/01/03 05:28:51 1.10
@@ -66,7 +66,7 @@
import java.util.Stack;
import java.util.Vector;
-import org.apache.velocity.Context;
+import org.apache.velocity.VelocityContext;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Test.java,v 1.9 2000/12/20 06:59:12 jvanzyl Exp $
+ * @version $Id: Test.java,v 1.10 2001/01/03 05:28:51 geirm Exp $
*/
public class Test
{
@@ -162,7 +162,8 @@
* now, make a Context object and populate it.
*/
- Context context = new Context();
+ VelocityContext context = new VelocityContext();
+
context.put("provider", provider);
context.put("name", "jason");
context.put("providers", provider.getCustomers2());
@@ -180,8 +181,9 @@
* make a writer, and merge the template 'against' the context
*/
+
writer = new BufferedWriter(new OutputStreamWriter(System.out));
- template.merge(context, writer);
+ template.merge( context , writer);
writer.flush();
writer.close();
1.9 +2 -2
jakarta-velocity/src/java/org/apache/velocity/texen/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/Generator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Generator.java 2000/12/20 06:29:14 1.8
+++ Generator.java 2001/01/03 05:28:51 1.9
@@ -59,7 +59,7 @@
import java.io.*;
import java.util.*;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.Context;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
@@ -70,7 +70,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Generator.java,v 1.8 2000/12/20 06:29:14 jvanzyl Exp $
+ * @version $Id: Generator.java,v 1.9 2001/01/03 05:28:51 geirm Exp $
*/
public class Generator
{
1.13 +4 -3
jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java
Index: TexenTask.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TexenTask.java 2000/12/20 06:22:44 1.12
+++ TexenTask.java 2001/01/03 05:28:52 1.13
@@ -71,7 +71,8 @@
import org.apache.tools.ant.Task;
// Velocity Stuff
-import org.apache.velocity.Context;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.texen.Generator;
@@ -79,7 +80,7 @@
* An ant task for generating output by using Velocity
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: TexenTask.java,v 1.12 2000/12/20 06:22:44 jvanzyl Exp $
+ * @version $Id: TexenTask.java,v 1.13 2001/01/03 05:28:52 geirm Exp $
*/
public class TexenTask extends Task
@@ -243,7 +244,7 @@
public Context initControlContext()
{
- return new Context();
+ return new VelocityContext();
}
/**
1.2 +2 -1
jakarta-velocity/src/java/org/apache/velocity/util/tools/VelocityFormatter.java
Index: VelocityFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/tools/VelocityFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityFormatter.java 2000/11/01 03:33:21 1.1
+++ VelocityFormatter.java 2001/01/03 05:28:52 1.2
@@ -63,6 +63,7 @@
// Veclocity classes
import org.apache.velocity.*;
+import org.apache.velocity.context.*;
/**
* Formatting tool for inserting into the Velocity WebContext. Can
@@ -78,7 +79,7 @@
* </pre></code>
*
* @author <a href="[EMAIL PROTECTED]">Sean Legassick</a>
- * @version $Id: VelocityFormatter.java,v 1.1 2000/11/01 03:33:21 daveb Exp $
+ * @version $Id: VelocityFormatter.java,v 1.2 2001/01/03 05:28:52 geirm Exp $
*/
public class VelocityFormatter
{
