You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/29 19:11:06 UTC
svn commit: r1343856 [2/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...
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalEventContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalEventContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalEventContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalEventContext.java Tue May 29 17:10:53 2012
@@ -1,6 +1,6 @@
-package org.apache.velocity.context;
+package org.apache.flex.forks.velocity.context;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -18,7 +18,7 @@ package org.apache.velocity.context;
* limitations under the License.
*/
-import org.apache.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
/**
* Interface for event support. Note that this is a public internal
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalHousekeepingContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalHousekeepingContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalHousekeepingContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalHousekeepingContext.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.context;
+package org.apache.flex.forks.velocity.context;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -16,9 +16,9 @@ package org.apache.velocity.context;
* limitations under the License.
*/
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.flex.forks.velocity.util.introspection.IntrospectionCacheData;
-import org.apache.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
/**
* interface to encapsulate the 'stuff' for internal operation of velocity.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalWrapperContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalWrapperContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalWrapperContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalWrapperContext.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.context;
+package org.apache.flex.forks.velocity.context;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/VMContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/VMContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/VMContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/VMContext.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.context;
+package org.apache.flex.forks.velocity.context;
/*
* Copyright 2000,2004 The Apache Software Foundation.
@@ -18,12 +18,12 @@ package org.apache.velocity.context;
import java.util.HashMap;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.directive.VMProxyArg;
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
-import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.directive.VMProxyArg;
+import org.apache.flex.forks.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
/**
* This is a special, internal-use-only context implementation to be
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/convert/WebMacro.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/convert/WebMacro.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/convert/WebMacro.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/convert/WebMacro.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.convert;
+package org.apache.flex.forks.velocity.convert;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -20,7 +20,7 @@ import java.io.File;
import java.io.FileWriter;
import org.apache.oro.text.perl.Perl5Util;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.util.StringUtils;
import org.apache.tools.ant.DirectoryScanner;
/**
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/MethodInvocationException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/MethodInvocationException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/MethodInvocationException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/MethodInvocationException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.exception;
+package org.apache.flex.forks.velocity.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ParseErrorException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ParseErrorException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ParseErrorException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ParseErrorException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.exception;
+package org.apache.flex.forks.velocity.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ResourceNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ResourceNotFoundException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ResourceNotFoundException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ResourceNotFoundException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.exception;
+package org.apache.flex.forks.velocity.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/VelocityException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/VelocityException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/VelocityException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/VelocityException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.exception;
+package org.apache.flex.forks.velocity.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/io/VelocityWriter.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/io/VelocityWriter.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/io/VelocityWriter.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/io/VelocityWriter.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.io;
+package org.apache.flex.forks.velocity.io;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/Runtime.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/Runtime.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/Runtime.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/Runtime.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -24,19 +24,19 @@ import java.io.Reader;
import java.util.Properties;
-import org.apache.velocity.Template;
+import org.apache.flex.forks.velocity.Template;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.resource.ContentResource;
+import org.apache.flex.forks.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
import org.apache.commons.collections.ExtendedProperties;
@@ -87,8 +87,8 @@ import org.apache.commons.collections.Ex
* @author <a href="mailto:jlb@houseofdistraction.com">Jeff Bowden</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magusson Jr.</a>
*
- * @see org.apache.velocity.runtime.RuntimeInstance
- * @see org.apache.velocity.runtime.RuntimeSingleton
+ * @see org.apache.flex.forks.velocity.runtime.RuntimeInstance
+ * @see org.apache.flex.forks.velocity.runtime.RuntimeSingleton
* @deprecated Use RuntimeInstance or RuntimeSingleton instead.
*
* @version $Id: Runtime.java,v 1.116.4.1 2004/03/03 23:22:55 geirm Exp $
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeConstants.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeConstants.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeConstants.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeConstants.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -346,13 +346,13 @@ public interface RuntimeConstants
* Default Runtime properties.
*/
final static String DEFAULT_RUNTIME_PROPERTIES =
- "org/apache/velocity/runtime/defaults/velocity.properties";
+ "org/apache/flex/forks/velocity/runtime/defaults/velocity.properties";
/**
* Default Runtime properties
*/
final static String DEFAULT_RUNTIME_DIRECTIVES =
- "org/apache/velocity/runtime/defaults/directive.properties";
+ "org/apache/flex/forks/velocity/runtime/defaults/directive.properties";
/**
* The default number of parser instances to create. Configurable
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeInstance.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeInstance.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeInstance.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeInstance.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -31,33 +31,33 @@ import java.util.Properties;
import java.util.Enumeration;
import java.util.HashMap;
-import org.apache.velocity.Template;
+import org.apache.flex.forks.velocity.Template;
-import org.apache.velocity.runtime.log.LogManager;
-import org.apache.velocity.runtime.log.LogSystem;
-import org.apache.velocity.runtime.log.PrimordialLogSystem;
-import org.apache.velocity.runtime.log.NullLogSystem;
+import org.apache.flex.forks.velocity.runtime.log.LogManager;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
+import org.apache.flex.forks.velocity.runtime.log.PrimordialLogSystem;
+import org.apache.flex.forks.velocity.runtime.log.NullLogSystem;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.VelocimacroFactory;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.VelocimacroFactory;
-import org.apache.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.runtime.resource.ResourceManager;
+import org.apache.flex.forks.velocity.runtime.resource.ContentResource;
+import org.apache.flex.forks.velocity.runtime.resource.ResourceManager;
-import org.apache.velocity.util.SimplePool;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.util.SimplePool;
+import org.apache.flex.forks.velocity.util.StringUtils;
-import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.util.introspection.Uberspect;
-import org.apache.velocity.util.introspection.UberspectLoggable;
+import org.apache.flex.forks.velocity.util.introspection.Introspector;
+import org.apache.flex.forks.velocity.util.introspection.Uberspect;
+import org.apache.flex.forks.velocity.util.introspection.UberspectLoggable;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
import org.apache.commons.collections.ExtendedProperties;
@@ -279,7 +279,7 @@ public class RuntimeInstance implements
{
String err = "The specified class for Uberspect ("
+ rm
- + ") does not implement org.apache.velocity.util.introspector.Uberspect."
+ + ") does not implement org.apache.flex.forks.velocity.util.introspector.Uberspect."
+ " Velocity not initialized correctly.";
error(err);
@@ -657,7 +657,7 @@ public class RuntimeInstance implements
* Grab all the values of the properties. These
* are all class names for example:
*
- * org.apache.velocity.runtime.directive.Foreach
+ * org.apache.flex.forks.velocity.runtime.directive.Foreach
*/
Enumeration directiveClasses = directiveProperties.elements();
@@ -707,7 +707,7 @@ public class RuntimeInstance implements
else
{
error( caption + " Directive " + directiveClass
- + " is not org.apache.velocity.runtime.directive.Directive."
+ + " is not org.apache.flex.forks.velocity.runtime.directive.Directive."
+ " Ignoring. " );
}
}
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeLogger.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeLogger.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeLogger.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeLogger.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2002,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeServices.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeServices.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeServices.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeServices.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -25,20 +25,20 @@ import java.io.Reader;
import java.util.Hashtable;
import java.util.Properties;
-import org.apache.velocity.Template;
+import org.apache.flex.forks.velocity.Template;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.resource.ContentResource;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.util.introspection.Uberspect;
+import org.apache.flex.forks.velocity.util.introspection.Introspector;
+import org.apache.flex.forks.velocity.util.introspection.Uberspect;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
import org.apache.commons.collections.ExtendedProperties;
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeSingleton.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeSingleton.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeSingleton.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeSingleton.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -24,25 +24,25 @@ import java.io.Reader;
import java.util.Properties;
-import org.apache.velocity.Template;
+import org.apache.flex.forks.velocity.Template;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.resource.ContentResource;
+import org.apache.flex.forks.velocity.runtime.resource.ContentResource;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
import org.apache.commons.collections.ExtendedProperties;
-import org.apache.velocity.util.introspection.Introspector;
-import org.apache.velocity.util.introspection.Uberspect;
+import org.apache.flex.forks.velocity.util.introspection.Introspector;
+import org.apache.flex.forks.velocity.util.introspection.Uberspect;
/**
@@ -92,7 +92,7 @@ import org.apache.velocity.util.introspe
* @author <a href="mailto:geirm@optonline.net">Geir Magusson Jr.</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
*
- * @see org.apache.velocity.runtime.RuntimeInstance
+ * @see org.apache.flex.forks.velocity.runtime.RuntimeInstance
*
* @version $Id: RuntimeSingleton.java,v 1.7.4.1 2004/03/03 23:22:55 geirm Exp $
*/
@@ -540,7 +540,7 @@ public class RuntimeSingleton implements
}
/**
- * @see org.apache.velocity.runtime.RuntimeServices#getApplicationAttribute(Object)
+ * @see org.apache.flex.forks.velocity.runtime.RuntimeServices#getApplicationAttribute(Object)
*/
public static Object getApplicationAttribute(Object key)
{
@@ -548,7 +548,7 @@ public class RuntimeSingleton implements
}
/**
- * @see org.apache.velocity.runtime.RuntimeServices#getUberspect()
+ * @see org.apache.flex.forks.velocity.runtime.RuntimeServices#getUberspect()
*/
public static Uberspect getUberspect()
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroFactory.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroFactory.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroFactory.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroFactory.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -20,11 +20,11 @@ package org.apache.velocity.runtime;
* Modified by Adobe Flex.
*/
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.VelocimacroProxy;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.VelocimacroProxy;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
import java.util.Vector;
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroManager.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroManager.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroManager.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroManager.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime;
+package org.apache.flex.forks.velocity.runtime;
/*
* Copyright 2000-2002,2004 The Apache Software Foundation.
@@ -25,12 +25,12 @@ import java.util.Hashtable;
import java.io.StringReader;
import java.io.BufferedReader;
-import org.apache.velocity.runtime.directive.VelocimacroProxy;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.directive.VelocimacroProxy;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.util.StringUtils;
-import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
/**
* Manages VMs in namespaces. Currently, two namespace modes are
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/compiler/Compiler.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/compiler/Compiler.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/compiler/Compiler.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.compiler;
+package org.apache.flex.forks.velocity.runtime.compiler;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/configuration/Configuration.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/configuration/Configuration.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/configuration/Configuration.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.configuration;
+package org.apache.flex.forks.velocity.runtime.configuration;
/*
* Copyright (c) 2001 The Java Apache Project. All rights reserved.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/directive.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/directive.properties?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/directive.properties (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/directive.properties Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
-directive.1=org.apache.velocity.runtime.directive.Foreach
-directive.2=org.apache.velocity.runtime.directive.Include
-directive.3=org.apache.velocity.runtime.directive.Parse
-directive.4=org.apache.velocity.runtime.directive.Macro
-directive.5=org.apache.velocity.runtime.directive.Literal
+directive.1=org.apache.flex.forks.velocity.runtime.directive.Foreach
+directive.2=org.apache.flex.forks.velocity.runtime.directive.Include
+directive.3=org.apache.flex.forks.velocity.runtime.directive.Parse
+directive.4=org.apache.flex.forks.velocity.runtime.directive.Macro
+directive.5=org.apache.flex.forks.velocity.runtime.directive.Literal
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/velocity.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/velocity.properties?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/velocity.properties (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/velocity.properties Tue May 29 17:10:53 2012
@@ -13,7 +13,7 @@
# default LogSystem to use: default: AvalonLogSystem
#----------------------------------------------------------------------------
-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogSystem,org.apache.velocity.runtime.log.SimpleLog4JLogSystem
+runtime.log.logsystem.class = org.apache.flex.forks.velocity.runtime.log.AvalonLogSystem,org.apache.flex.forks.velocity.runtime.log.SimpleLog4JLogSystem
#---------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
@@ -35,7 +35,7 @@ runtime.log.invalid.reference = true
#----------------------------------------------------------------------------
# Configuration for the Log4JLogSystem.
# You must define the runtime.log.logsystem.class property to be:
-# org.apache.velocity.runtime.log.Log4JLogSystem
+# org.apache.flex.forks.velocity.runtime.log.Log4JLogSystem
#
# You must also include Log4J's .jar files into your classpath. They are
# included with the Velocity distribution in the build/lib directory.
@@ -101,7 +101,7 @@ directive.parse.max.depth = 10
resource.loader = file
file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
+file.resource.loader.class = org.apache.flex.forks.velocity.runtime.resource.loader.FileResourceLoader
file.resource.loader.path = .
file.resource.loader.cache = false
file.resource.loader.modificationCheckInterval = 2
@@ -136,8 +136,8 @@ runtime.interpolate.string.literals = tr
# Allows alternative ResourceManager and ResourceCache implementations
# to be plugged in.
#----------------------------------------------------------------------------
-resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
-resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
+resource.manager.class = org.apache.flex.forks.velocity.runtime.resource.ResourceManagerImpl
+resource.manager.cache.class = org.apache.flex.forks.velocity.runtime.resource.ResourceCacheImpl
#----------------------------------------------------------------------------
# PLUGGABLE INTROSPECTOR
@@ -145,6 +145,6 @@ resource.manager.cache.class = org.apach
# Allows alternative introspection and all that can of worms brings
#----------------------------------------------------------------------------
-runtime.introspector.uberspect = org.apache.velocity.util.introspection.UberspectImpl
+runtime.introspector.uberspect = org.apache.flex.forks.velocity.util.introspection.UberspectImpl
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Directive.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Directive.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Directive.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Directive.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -19,14 +19,14 @@ package org.apache.velocity.runtime.dire
import java.io.Writer;
import java.io.IOException;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
/**
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/DirectiveConstants.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/DirectiveConstants.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/DirectiveConstants.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/DirectiveConstants.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Foreach.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Foreach.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Foreach.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Foreach.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -25,19 +25,19 @@ import java.io.IOException;
import java.util.Iterator;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+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.velocity.util.introspection.Info;
+import org.apache.flex.forks.velocity.util.introspection.Info;
/**
* Foreach directive used for moving through arrays,
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Include.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Include.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Include.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Include.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -24,15 +24,15 @@ package org.apache.velocity.runtime.dire
import java.io.Writer;
import java.io.IOException;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.parser.ParserTreeConstants;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
/**
* Pluggable directive that handles the #include() statement in VTL. This
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/InputBase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/InputBase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/InputBase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/InputBase.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -16,9 +16,9 @@ package org.apache.velocity.runtime.dire
* limitations under the License.
*/
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
/**
* Base class for directives which do input operations
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Literal.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Literal.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Literal.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Literal.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -18,10 +18,10 @@ package org.apache.velocity.runtime.dire
import java.io.*;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* A very simple directive that leverages the Node.literal()
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Macro.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Macro.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Macro.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Macro.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2002,2004 The Apache Software Foundation.
@@ -27,14 +27,14 @@ import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
-import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.NodeUtils;
-import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.ParserTreeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.NodeUtils;
+import org.apache.flex.forks.velocity.runtime.parser.Token;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Macro.java
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/MacroParseException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/MacroParseException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/MacroParseException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/MacroParseException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2002,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.dire
* limitations under the License.
*/
-import org.apache.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
/**
* Exception to indicate problem happened while constructing #macro()
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Parse.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Parse.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Parse.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Parse.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -19,16 +19,16 @@ package org.apache.velocity.runtime.dire
import java.io.IOException;
import java.io.Writer;
-import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
/**
* Pluggable directive that handles the <code>#parse()</code>
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/ParseDirectiveException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/ParseDirectiveException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/ParseDirectiveException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/ParseDirectiveException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VMProxyArg.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VMProxyArg.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VMProxyArg.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VMProxyArg.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -25,17 +25,17 @@ import java.io.StringWriter;
import java.io.StringReader;
import java.io.BufferedReader;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.ASTReference;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.ParserTreeConstants;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.InternalContextAdapterImpl;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.ASTReference;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.util.StringUtils;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.VelocityContext;
/**
* The function of this class is to proxy for the calling parameter to the VM.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VelocimacroProxy.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VelocimacroProxy.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VelocimacroProxy.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VelocimacroProxy.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.directive;
+package org.apache.flex.forks.velocity.runtime.directive;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -27,18 +27,18 @@ import java.io.StringReader;
import java.util.HashMap;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.context.VMContext;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.context.VMContext;
-import org.apache.velocity.runtime.visitor.VMReferenceMungeVisitor;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.parser.ParserTreeConstants;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.visitor.VMReferenceMungeVisitor;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.Token;
+import org.apache.flex.forks.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.util.StringUtils;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
/**
* VelocimacroProxy.java
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/NodeException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/NodeException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/NodeException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/NodeException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.exception;
+package org.apache.flex.forks.velocity.runtime.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.exce
* limitations under the License.
*/
-import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
public class NodeException extends Exception
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/ReferenceException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/ReferenceException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/ReferenceException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/ReferenceException.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.exception;
+package org.apache.flex.forks.velocity.runtime.exception;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.exce
* limitations under the License.
*/
-import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.flex.forks.velocity.runtime.parser.node.Node;
/**
* Exception thrown when a bad reference is found.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/AvalonLogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/AvalonLogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/AvalonLogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/AvalonLogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -24,8 +24,8 @@ import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.output.io.FileTarget;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
/**
* Implementation of a Avalon logger.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/Log4JLogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/Log4JLogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/Log4JLogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/Log4JLogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -21,8 +21,8 @@ import java.util.Enumeration;
import org.apache.log4j.*;
import org.apache.log4j.net.*;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Implementation of a Log4J logger.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogManager.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogManager.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogManager.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogManager.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -20,8 +20,8 @@ import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
/**
* <p>
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.log;
* limitations under the License.
*/
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Base interface that Logging systems need to implement.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/NullLogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/NullLogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/NullLogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/NullLogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -16,7 +16,7 @@ package org.apache.velocity.runtime.log;
* limitations under the License.
*/
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Logger used in case of failure. Does nothing.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/PrimordialLogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/PrimordialLogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/PrimordialLogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/PrimordialLogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -19,7 +19,7 @@ package org.apache.velocity.runtime.log;
import java.util.Vector;
import java.util.Enumeration;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Pre-init logger. I believe that this was suggested by
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/SimpleLog4JLogSystem.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/SimpleLog4JLogSystem.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/SimpleLog4JLogSystem.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/SimpleLog4JLogSystem.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
@@ -24,8 +24,8 @@ import org.apache.log4j.PatternLayout;
import org.apache.log4j.Priority;
import org.apache.log4j.Appender;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
/**
* Implementation of a simple log4j system that will either
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/VelocityFormatter.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/VelocityFormatter.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/VelocityFormatter.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/VelocityFormatter.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.log;
+package org.apache.flex.forks.velocity.runtime.log;
/*
* Copyright 2001,2004 The Apache Software Foundation.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/CharStream.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/CharStream.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/CharStream.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/CharStream.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 2.1 */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
/**
* This interface describes a character stream that maintains line and
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/JJTParserState.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/JJTParserState.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/JJTParserState.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/JJTParserState.java Tue May 29 17:10:53 2012
@@ -1,8 +1,8 @@
/* Generated By:JJTree: Do not edit this line. JJTParserState.java */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
-import org.apache.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
class JJTParserState {
private java.util.Stack nodes;
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParseException.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParseException.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParseException.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 2.1 */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
/**
* This exception is thrown when parse errors are encountered.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. Parser.java */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
/**
* Modified by Adobe Flex.
@@ -8,12 +8,12 @@ package org.apache.velocity.runtime.pars
import java.io.*;
import java.util.*;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Macro;
-import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Macro;
+import org.apache.flex.forks.velocity.runtime.directive.MacroParseException;
+import org.apache.flex.forks.velocity.util.StringUtils;
/**
* This class is responsible for parsing a Velocity
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jj
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jj?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jj (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jj Tue May 29 17:10:53 2012
@@ -53,17 +53,17 @@ options
PARSER_BEGIN(Parser)
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
import java.io.*;
import java.util.*;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Macro;
-import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Macro;
+import org.apache.flex.forks.velocity.runtime.directive.MacroParseException;
+import org.apache.flex.forks.velocity.util.StringUtils;
/**
* This class is responsible for parsing a Velocity
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jjt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jjt?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jjt (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jjt Tue May 29 17:10:53 2012
@@ -26,7 +26,7 @@
options
{
/** The default package for this parser kit */
- NODE_PACKAGE="org.apache.velocity.runtime.parser";
+ NODE_PACKAGE="org.apache.flex.forks.velocity.runtime.parser";
/** A source file will be generated for each non-terminal */
MULTI=true;
@@ -78,17 +78,17 @@ options
PARSER_BEGIN(Parser)
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
import java.io.*;
import java.util.*;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Macro;
-import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Macro;
+import org.apache.flex.forks.velocity.runtime.directive.MacroParseException;
+import org.apache.flex.forks.velocity.util.StringUtils;
/**
* This class is responsible for parsing a Velocity
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserConstants.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserConstants.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserConstants.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserConstants.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. ParserConstants.java */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
public interface ParserConstants {
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTokenManager.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTokenManager.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTokenManager.java Tue May 29 17:10:53 2012
@@ -1,13 +1,13 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
import java.io.*;
import java.util.*;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Macro;
-import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.*;
+import org.apache.flex.forks.velocity.runtime.directive.Directive;
+import org.apache.flex.forks.velocity.runtime.directive.Macro;
+import org.apache.flex.forks.velocity.runtime.directive.MacroParseException;
+import org.apache.flex.forks.velocity.util.StringUtils;
public class ParserTokenManager implements ParserConstants
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTreeConstants.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTreeConstants.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTreeConstants.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTreeConstants.java Tue May 29 17:10:53 2012
@@ -1,6 +1,6 @@
/* Generated By:JJTree: Do not edit this line. ParserTreeConstants.java */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
public interface ParserTreeConstants
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Token.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Token.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Token.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Token.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. Token.java Version 2.1 */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
/**
* Modified by Adobe Flex.
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/TokenMgrError.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/TokenMgrError.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/TokenMgrError.java Tue May 29 17:10:53 2012
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 2.1 */
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
public class TokenMgrError extends Error
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/VelocityCharStream.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/VelocityCharStream.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/VelocityCharStream.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/VelocityCharStream.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser;
+package org.apache.flex.forks.velocity.runtime.parser;
/**
* NOTE : This class was originally an ASCII_CharStream autogenerated
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAddNode.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAddNode.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAddNode.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAddNode.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser.node;
+package org.apache.flex.forks.velocity.runtime.parser.node;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -28,10 +28,10 @@ package org.apache.velocity.runtime.pars
* @version $Id: ASTAddNode.java,v 1.8.8.1 2004/03/03 23:22:58 geirm Exp $
*/
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
public class ASTAddNode extends SimpleNode
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAndNode.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAndNode.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAndNode.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAndNode.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser.node;
+package org.apache.flex.forks.velocity.runtime.parser.node;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -16,9 +16,9 @@ package org.apache.velocity.runtime.pars
* limitations under the License.
*/
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
/**
* Please look at the Parser.jjt file which is
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAssignment.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAssignment.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAssignment.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAssignment.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser.node;
+package org.apache.flex.forks.velocity.runtime.parser.node;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -17,7 +17,7 @@ package org.apache.velocity.runtime.pars
*/
-import org.apache.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
public class ASTAssignment extends SimpleNode
{
Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTBlock.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTBlock.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTBlock.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTBlock.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser.node;
+package org.apache.flex.forks.velocity.runtime.parser.node;
/*
* Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -19,12 +19,12 @@ package org.apache.velocity.runtime.pars
import java.io.Writer;
import java.io.IOException;
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
+import org.apache.flex.forks.velocity.context.InternalContextAdapter;
+import org.apache.flex.forks.velocity.runtime.parser.Parser;
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
public class ASTBlock extends SimpleNode