incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1343856 [4/4] - in /incubator/flex/trunk/modules: compiler/ compiler/src/java/flex2/compiler/as3/binding/ compiler/src/java/flex2/compiler/as3/genext/ compiler/src/java/flex2/compiler/css/ compiler/src/java/flex2/compiler/media/ compiler/s...
Date Tue, 29 May 2012 17:11:06 GMT
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/NodeViewMode.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/NodeViewMode.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/NodeViewMode.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/NodeViewMode.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.visitor;
+package org.apache.flex.forks.velocity.runtime.visitor;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.velocity.runtime.visi
  * limitations under the License.
  */
 
-import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.parser.Token;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
 
 /**
  * This class is simply a visitor implementation

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/VMReferenceMungeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/VMReferenceMungeVisitor.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/VMReferenceMungeVisitor.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/VMReferenceMungeVisitor.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.visitor;
+package org.apache.flex.forks.velocity.runtime.visitor;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -18,7 +18,7 @@ package org.apache.velocity.runtime.visi
 
 import java.util.Map;
 
-import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.flex.forks.velocity.runtime.parser.node.ASTReference;
 
 /**
  *  This class is a visitor used by the VM proxy to change the 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/servlet/VelocityServlet.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/servlet/VelocityServlet.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/servlet/VelocityServlet.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/servlet/VelocityServlet.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.servlet;
+package org.apache.flex.forks.velocity.servlet;
 
 /*
  * Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -35,20 +35,20 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.io.VelocityWriter;
-import org.apache.velocity.util.SimplePool;
-
-import org.apache.velocity.context.Context;
-import org.apache.velocity.VelocityContext;
-
-import org.apache.velocity.app.Velocity;
-
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.io.VelocityWriter;
+import org.apache.flex.forks.velocity.util.SimplePool;
+
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.VelocityContext;
+
+import org.apache.flex.forks.velocity.app.Velocity;
+
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
 /**
  * Base class which simplifies the use of Velocity with Servlets.
@@ -126,10 +126,10 @@ public abstract class VelocityServlet ex
 
     /**
      * This is the string that is looked for when getInitParameter is
-     * called (<code>org.apache.velocity.properties</code>).
+     * called (<code>org.apache.flex.forks.velocity.properties</code>).
      */
     protected static final String INIT_PROPS_KEY =
-        "org.apache.velocity.properties";
+        "org.apache.flex.forks.velocity.properties";
 
     /**
      * Use of this properties key has been deprecated, and will be
@@ -215,7 +215,7 @@ public abstract class VelocityServlet ex
      *      &lt;servlet-name&gt; YourServlet &lt/servlet-name&gt;
      *      &lt;servlet-class&gt; your.package.YourServlet &lt;/servlet-class&gt;
      *      &lt;init-param&gt;
-     *         &lt;param-name&gt; org.apache.velocity.properties &lt;/param-name&gt;
+     *         &lt;param-name&gt; org.apache.flex.forks.velocity.properties &lt;/param-name&gt;
      *         &lt;param-value&gt; velocity.properties &lt;/param-value&gt;
      *      &lt;/init-param&gt;
      *    &lt;/servlet&gt;
@@ -226,7 +226,7 @@ public abstract class VelocityServlet ex
      *  <br>
      *  <pre>
      *    &lt;context-param&gt;
-     *       &lt;param-name&gt; org.apache.velocity.properties &lt;/param-name&gt;
+     *       &lt;param-name&gt; org.apache.flex.forks.velocity.properties &lt;/param-name&gt;
      *       &lt;param-value&gt; velocity.properties &lt;/param-value&gt;
      *       &lt;description&gt; Path to Velocity configuration &lt;/description&gt;
      *    &lt;/context-param&gt;

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/AnakiaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/AnakiaTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/AnakiaTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/AnakiaTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/BaseTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/BaseTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/BaseTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -17,8 +17,8 @@ package org.apache.velocity.test;
  */
 
 import java.io.File;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
 import junit.framework.TestCase;
 import org.apache.oro.text.perl.Perl5Util;

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClassloaderChangeTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClassloaderChangeTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClassloaderChangeTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClassloaderChangeTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -22,13 +22,13 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.StringWriter;
 
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
 
-import org.apache.velocity.util.introspection.Introspector;
+import org.apache.flex.forks.velocity.util.introspection.Introspector;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClasspathResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClasspathResourceTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClasspathResourceTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClasspathResourceTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -21,10 +21,10 @@ import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
 /**
  * Load templates from the Classpath.
@@ -80,7 +80,7 @@ public class ClasspathResourceTest exten
 
             Velocity.addProperty(
                 "classpath." + Velocity.RESOURCE_LOADER + ".class",
-                    "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+                    "org.apache.flex.forks.velocity.runtime.resource.loader.ClasspathResourceLoader");
 
             Velocity.setProperty(
                 "classpath." + Velocity.RESOURCE_LOADER + ".cache", "false");

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/CommonsExtPropTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/CommonsExtPropTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/CommonsExtPropTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/CommonsExtPropTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ConfigurationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ConfigurationTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ConfigurationTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ConfigurationTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -21,7 +21,7 @@ import java.io.FileWriter;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.apache.velocity.runtime.configuration.Configuration;
+import org.apache.flex.forks.velocity.runtime.configuration.Configuration;
 
 /**
  * Tests for the Configuration class.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ContextSafetyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ContextSafetyTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ContextSafetyTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ContextSafetyTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,11 +23,11 @@ import java.io.Writer;
 
 import java.util.Vector;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
 /**
  * Tests if we are context safe : can we switch objects in the context

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EncodingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EncodingTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EncodingTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EncodingTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,12 +23,12 @@ import java.io.Writer;
 
 import java.util.Vector;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EventHandlingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EventHandlingTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EventHandlingTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EventHandlingTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -20,19 +20,19 @@ import java.io.StringWriter;
 
 import junit.framework.TestCase;
 
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.log.LogSystem;
-
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.MethodInvocationException;
-
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
-import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.app.event.NullSetEventHandler;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
+
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.app.event.ReferenceInsertionEventHandler;
+import org.apache.flex.forks.velocity.app.event.MethodExceptionEventHandler;
+import org.apache.flex.forks.velocity.app.event.NullSetEventHandler;
 
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
 
 /**
  *  Tests event handling

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ExternalLoggerTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ExternalLoggerTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ExternalLoggerTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ExternalLoggerTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -16,10 +16,10 @@ package org.apache.velocity.test;
  * limitations under the License.
  */
 
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
 
-import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/InlineScopeVMTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/InlineScopeVMTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/InlineScopeVMTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/InlineScopeVMTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,14 +23,14 @@ import java.io.Writer;
 
 import java.util.Properties;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
-import org.apache.velocity.runtime.VelocimacroFactory;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.VelocimacroFactory;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 
 import java.lang.reflect.Method;
 
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase2.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase2.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase2.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase2.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -20,9 +20,9 @@ import java.util.ArrayList;
 
 import java.lang.reflect.Method;
 
-import org.apache.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.Velocity;
 
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase3.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase3.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase3.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase3.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -21,7 +21,7 @@ import java.util.List;
 
 import java.lang.reflect.Method;
 
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
 import junit.framework.TestCase;
 import junit.framework.Test;

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MethodInvocationExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MethodInvocationExceptionTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MethodInvocationExceptionTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MethodInvocationExceptionTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -18,11 +18,11 @@ package org.apache.velocity.test;
 
 import java.io.StringWriter;
 
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.log.LogSystem;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
 
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MiscTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MiscTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MiscTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MiscTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@ package org.apache.velocity.test;
 import junit.framework.TestCase;
 import junit.framework.Test;
 
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
 /**
  * Test case for any miscellaneous stuff.  If it isn't big, and doesn't fit

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultiLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultiLoaderTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultiLoaderTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultiLoaderTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -24,12 +24,12 @@ import java.io.File;
 
 import java.util.Properties;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
-import org.apache.velocity.runtime.VelocimacroFactory;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.VelocimacroFactory;
 
 import junit.framework.TestCase;
 
@@ -103,7 +103,7 @@ public class MultiLoaderTestCase extends
 
             Velocity.setProperty(
                 "classpath." + Velocity.RESOURCE_LOADER + ".class",
-                    "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+                    "org.apache.flex.forks.velocity.runtime.resource.loader.ClasspathResourceLoader");
 
             Velocity.setProperty(
                 "classpath." + Velocity.RESOURCE_LOADER + ".cache", "false");
@@ -118,7 +118,7 @@ public class MultiLoaderTestCase extends
 
             Velocity.setProperty(
                                  "jar." + Velocity.RESOURCE_LOADER + ".class",
-                                 "org.apache.velocity.runtime.resource.loader.JarResourceLoader");
+                                 "org.apache.flex.forks.velocity.runtime.resource.loader.JarResourceLoader");
 
             Velocity.setProperty( "jar." + Velocity.RESOURCE_LOADER + ".path",  
                                   "jar:file:" + FILE_RESOURCE_LOADER_PATH + "/test2.jar" );

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultipleFileResourcePathTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultipleFileResourcePathTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultipleFileResourcePathTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultipleFileResourcePathTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -24,14 +24,14 @@ import java.io.File;
 
 import java.util.Properties;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
-import org.apache.velocity.runtime.VelocimacroFactory;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.VelocimacroFactory;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ParserTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ParserTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ParserTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ParserTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 /*
  * Copyright 2002,2004 The Apache Software Foundation.
  * 
@@ -18,9 +18,9 @@ package org.apache.velocity.test;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
 
 import java.io.StringWriter;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestBase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestBase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestBase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestBase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -27,14 +27,14 @@ import java.util.Hashtable;
 import java.util.HashMap;
 import java.util.Vector;
 
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.test.provider.BoolObj;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.test.provider.BoolObj;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
-import org.apache.velocity.app.FieldMethodizer;
+import org.apache.flex.forks.velocity.app.FieldMethodizer;
 
 import junit.framework.TestCase;
 
@@ -139,7 +139,7 @@ public class TemplateTestCase extends Ba
         context2.put("stringarray", provider.getArray());
         context.put("vector", vec );
         context.put("mystring", new String());
-        context.put("runtime", new FieldMethodizer( "org.apache.velocity.runtime.RuntimeSingleton" ));
+        context.put("runtime", new FieldMethodizer( "org.apache.flex.forks.velocity.runtime.RuntimeSingleton" ));
         context.put("fmprov", new FieldMethodizer( provider ));
         context.put("Floog", "floogie woogie");
         context.put("boolobj", new BoolObj() );

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestSuite.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestSuite.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestSuite.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.Velocity;
 
 import junit.framework.TestSuite;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenClasspathTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenClasspathTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenClasspathTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenClasspathTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -17,8 +17,8 @@ package org.apache.velocity.test;
  */
 
 import java.io.File;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.util.StringUtils;
 import junit.framework.TestCase;
 
 /**

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -17,8 +17,8 @@ package org.apache.velocity.test;
  */
 
 import java.io.File;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.util.StringUtils;
 import junit.framework.TestCase;
 
 /**

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocimacroTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocimacroTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocimacroTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocimacroTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,14 +23,14 @@ import java.io.StringWriter;
 
 import java.util.Vector;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
-import org.apache.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.Velocity;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityAppTestCase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityAppTestCase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityAppTestCase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityAppTestCase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,14 +23,14 @@ import java.io.StringWriter;
 
 import java.util.Vector;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.test.provider.TestProvider;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
-import org.apache.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.Velocity;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityServletTest.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityServletTest.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityServletTest.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityServletTest.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test;
+package org.apache.flex.forks.velocity.test;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -30,10 +30,10 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.servlet.VelocityServlet;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.servlet.VelocityServlet;
 
 import junit.framework.TestCase;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/misc/Test.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/misc/Test.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/misc/Test.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/misc/Test.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.misc;
+package org.apache.flex.forks.velocity.test.misc;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -31,25 +31,25 @@ import java.util.Stack;
 import java.util.Vector;
 import java.util.Enumeration;
 
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
 
-import org.apache.velocity.app.FieldMethodizer;
-import org.apache.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.FieldMethodizer;
+import org.apache.flex.forks.velocity.app.Velocity;
 
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.test.provider.TestProvider;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.test.provider.TestProvider;
 
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
-import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.app.event.NullSetEventHandler;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.app.event.ReferenceInsertionEventHandler;
+import org.apache.flex.forks.velocity.app.event.MethodExceptionEventHandler;
+import org.apache.flex.forks.velocity.app.event.NullSetEventHandler;
 
-import org.apache.velocity.context.Context;
+import org.apache.flex.forks.velocity.context.Context;
 
 
 /**
@@ -199,7 +199,7 @@ public class Test implements ReferenceIn
             context.put("vector", v);
             context.put("mystring", new String());
             context.put("hashmap", new HashMap() );
-            context.put("runtime", new FieldMethodizer( "org.apache.velocity.runtime.RuntimeSingleton" ));
+            context.put("runtime", new FieldMethodizer( "org.apache.flex.forks.velocity.runtime.RuntimeSingleton" ));
             context.put("fmprov", new FieldMethodizer( provider ));
             context.put("Floog", "floogie woogie");
             context.put("geirstring", str );

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/BoolObj.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/BoolObj.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/BoolObj.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/BoolObj.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.provider;
+package org.apache.flex.forks.velocity.test.provider;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Child.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Child.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Child.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Child.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.provider;
+package org.apache.flex.forks.velocity.test.provider;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Person.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Person.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Person.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Person.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.provider;
+package org.apache.flex.forks.velocity.test.provider;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/TestProvider.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/TestProvider.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/TestProvider.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/TestProvider.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.provider;
+package org.apache.flex.forks.velocity.test.provider;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/view/TemplateNodeView.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/view/TemplateNodeView.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/view/TemplateNodeView.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/view/TemplateNodeView.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.test.view;
+package org.apache.flex.forks.velocity.test.view;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -22,10 +22,10 @@ import java.io.FileInputStream;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
 
-import org.apache.velocity.runtime.visitor.NodeViewMode;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.visitor.NodeViewMode;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
 
 /**
  * Simple class for dumping the AST for a template.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.texen;
+package org.apache.flex.forks.velocity.texen;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -32,10 +32,10 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
 
 /**
  * A text/code generator class
@@ -61,7 +61,7 @@ public class Generator
      * tools placed in the context.
      */
     private static final String DEFAULT_TEXEN_PROPERTIES =
-        "org/apache/velocity/texen/defaults/texen.properties";
+        "org/apache/flex/forks/velocity/texen/defaults/texen.properties";
 
     /**
      * Default properties used by texen.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/ant/TexenTask.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/ant/TexenTask.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/ant/TexenTask.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/ant/TexenTask.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.texen.ant;
+package org.apache.flex.forks.velocity.texen.ant;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -30,14 +30,14 @@ import java.io.IOException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.texen.Generator;
-import org.apache.velocity.util.StringUtils;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.texen.Generator;
+import org.apache.flex.forks.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
 import org.apache.commons.collections.ExtendedProperties;
 
 /**
@@ -404,7 +404,7 @@ public class TexenTask 
             
                 ve.setProperty(
                     "classpath." + VelocityEngine.RESOURCE_LOADER + ".class",
-                        "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+                        "org.apache.flex.forks.velocity.runtime.resource.loader.ClasspathResourceLoader");
 
                 ve.setProperty(
                     "classpath." + VelocityEngine.RESOURCE_LOADER + 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/defaults/texen.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/defaults/texen.properties?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/defaults/texen.properties (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/defaults/texen.properties Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
 path.output=output
-context.objects.strings=org.apache.velocity.util.StringUtils
-context.objects.files=org.apache.velocity.texen.util.FileUtil
-context.objects.properties=org.apache.velocity.texen.util.PropertiesUtil
+context.objects.strings=org.apache.flex.forks.velocity.util.StringUtils
+context.objects.files=org.apache.flex.forks.velocity.texen.util.FileUtil
+context.objects.properties=org.apache.flex.forks.velocity.texen.util.PropertiesUtil

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/FileUtil.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/FileUtil.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/FileUtil.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.texen.util;
+package org.apache.flex.forks.velocity.texen.util;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/PropertiesUtil.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/PropertiesUtil.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/PropertiesUtil.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/PropertiesUtil.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.texen.util;
+package org.apache.flex.forks.velocity.texen.util;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import org.apache.velocity.texen.Generator;
+import org.apache.flex.forks.velocity.texen.Generator;
 
 /**
  * A property utility class for the texen text/code generator

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/ArrayIterator.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/ArrayIterator.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/ArrayIterator.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/ArrayIterator.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util;
+package org.apache.flex.forks.velocity.util;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util;
+package org.apache.flex.forks.velocity.util;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/SimplePool.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/SimplePool.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/SimplePool.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/SimplePool.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util;
+package org.apache.flex.forks.velocity.util;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/StringUtils.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/StringUtils.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/StringUtils.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/StringUtils.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util;
+package org.apache.flex.forks.velocity.util;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/ClassMap.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/ClassMap.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/ClassMap.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/ClassMap.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Info.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Info.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Info.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Info.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 import java.io.Serializable;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectionCacheData.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectionCacheData.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectionCacheData.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectionCacheData.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Introspector.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Introspector.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Introspector.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Introspector.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -23,8 +23,8 @@ import java.util.HashSet;
 
 import java.lang.reflect.Method;
 
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeLogger;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeLogger;
 
 /**
  * This basic function of this class is to return a Method

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectorBase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectorBase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectorBase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectorBase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/MethodMap.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/MethodMap.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/MethodMap.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/MethodMap.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Uberspect.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Uberspect.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Uberspect.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Uberspect.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp
  * limitations under the License.
  */
 
-import org.apache.velocity.runtime.RuntimeLogger;
+import org.apache.flex.forks.velocity.runtime.RuntimeLogger;
 
 import java.util.Iterator;
 import java.lang.reflect.Method;

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectImpl.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectImpl.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectImpl.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.
@@ -16,14 +16,14 @@ package org.apache.velocity.util.introsp
  * limitations under the License.
  */
 
-import org.apache.velocity.util.ArrayIterator;
-import org.apache.velocity.util.EnumerationIterator;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeLogger;
-import org.apache.velocity.runtime.parser.node.AbstractExecutor;
-import org.apache.velocity.runtime.parser.node.PropertyExecutor;
-import org.apache.velocity.runtime.parser.node.GetExecutor;
-import org.apache.velocity.runtime.parser.node.BooleanPropertyExecutor;
+import org.apache.flex.forks.velocity.util.ArrayIterator;
+import org.apache.flex.forks.velocity.util.EnumerationIterator;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeLogger;
+import org.apache.flex.forks.velocity.runtime.parser.node.AbstractExecutor;
+import org.apache.flex.forks.velocity.runtime.parser.node.PropertyExecutor;
+import org.apache.flex.forks.velocity.runtime.parser.node.GetExecutor;
+import org.apache.flex.forks.velocity.runtime.parser.node.BooleanPropertyExecutor;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectLoggable.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectLoggable.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectLoggable.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectLoggable.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.util.introsp
  * limitations under the License.
  */
 
-import org.apache.velocity.runtime.RuntimeLogger;
+import org.apache.flex.forks.velocity.runtime.RuntimeLogger;
 
 /**
  *  Marker interface to let an uberspector indicate it can and wants to

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelMethod.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelMethod.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelMethod.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelMethod.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertyGet.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertyGet.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertyGet.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertyGet.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertySet.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertySet.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertySet.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertySet.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.util.introspection;
+package org.apache.flex.forks.velocity.util.introspection;
 
 /*
  * Copyright 2002,2004 The Apache Software Foundation.

Modified: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh Tue May 29 17:10:53 2012
@@ -7,4 +7,4 @@ do
     CLASSPATH=${CLASSPATH}:${jar}
 done
 
-java -cp ${CLASSPATH} org.apache.velocity.runtime.compiler.Compiler $1
+java -cp ${CLASSPATH} org.apache.flex.forks.velocity.runtime.compiler.Compiler $1

Modified: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh Tue May 29 17:10:53 2012
@@ -7,4 +7,4 @@ do
     CLASSPATH=${CLASSPATH}:${jar}
 done
 
-java -cp ${CLASSPATH} org.apache.velocity.test.view.TemplateNodeView $1 > output.dump
+java -cp ${CLASSPATH} org.apache.flex.forks.velocity.test.view.TemplateNodeView $1 > output.dump

Modified: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh Tue May 29 17:10:53 2012
@@ -7,4 +7,4 @@ do
     CLASSPATH=${CLASSPATH}:${jar}
 done
 
-java -cp ${CLASSPATH} org.apache.velocity.test.misc.Test $1 $2 > output 2>&1
+java -cp ${CLASSPATH} org.apache.flex.forks.velocity.test.misc.Test $1 $2 > output 2>&1



Mime
View raw message