svn commit: r685433 - in /velocity/engine/trunk/src: java/org/apache/velocity/context/ java/org/apache/velocity/runtime/directive/ java/org/apache/velocity/runtime/visitor/ test/org/apache/velocity/test/

[nb...@apache.org]

Author: nbubna
Date: Tue Aug 12 21:18:27 2008
New Revision: 685433

URL: http://svn.apache.org/viewvc?rev=685433&view=rev
Log:
remove internal classes made obsolete by fix for VELOCITY-607

Removed:
    velocity/engine/trunk/src/java/org/apache/velocity/context/VMContext.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/visitor/VMReferenceMungeVisitor.java
Modified:
    velocity/engine/trunk/src/test/org/apache/velocity/test/VMContextLocalscopeTestCase.java

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VMContextLocalscopeTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VMContextLocalscopeTestCase.java?rev=685433&r1=685432&r2=685433&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/VMContextLocalscopeTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/VMContextLocalscopeTestCase.java Tue Aug 12 21:18:27 2008
@@ -22,7 +22,7 @@
 import junit.framework.TestCase;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.context.VMContext;
+import org.apache.velocity.context.ProxyVMContext;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeInstance;
 
@@ -48,7 +48,7 @@
         VelocityContext base = new VelocityContext();
         base.put("outsideVar", "value1");
 
-        VMContext vm = new VMContext(new InternalContextAdapterImpl(base), this.instance);
+        ProxyVMContext vm = new ProxyVMContext(new InternalContextAdapterImpl(base), this.instance, true);
         vm.put("newLocalVar", "value2");
 
         // New variable put doesn't leak