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 [1/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
Author: cframpton
Date: Tue May 29 17:10:53 2012
New Revision: 1343856

URL: http://svn.apache.org/viewvc?rev=1343856&view=rev
Log:
Move velocity from org.apache.velocity to org.apache.flex.forks.velocity since it includes changes made by Flex that were not merged back into the velocity project.  The modules that were changed are marked.

Added:
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/
      - copied from r1343785, incubator/flex/trunk/modules/thirdparty/velocity/src/java/flex/util/
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/
      - copied from r1343785, incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/
Removed:
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/flex/
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/
Modified:
    incubator/flex/trunk/modules/compiler/build.xml
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/GenerativeSecondPassEvaluator.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/CssCompiler.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/SkinTranscoder.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java
    incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/VelocityManager.java
    incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
    incubator/flex/trunk/modules/thirdparty/velocity/build/testcases.xml
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/SerializedTemplateFactory.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/Template.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/VelocityContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaElement.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaJDOMFactory.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaTask.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/Escape.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/NodeList.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/OutputWrapper.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/TreeWalker.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/XPathCache.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/XPathTool.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/FieldMethodizer.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/Velocity.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/VelocityEngine.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventCartridge.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventHandler.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/MethodExceptionEventHandler.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/NullSetEventHandler.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/ReferenceInsertionEventHandler.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/tools/VelocityFormatter.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/AbstractContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/Context.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapter.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapterImpl.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextBase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalEventContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalHousekeepingContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalWrapperContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/VMContext.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/convert/WebMacro.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/MethodInvocationException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ParseErrorException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/ResourceNotFoundException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/exception/VelocityException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/io/VelocityWriter.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/Runtime.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeConstants.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeInstance.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeLogger.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeServices.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/RuntimeSingleton.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroFactory.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/VelocimacroManager.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/compiler/Compiler.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/configuration/Configuration.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/directive.properties
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/defaults/velocity.properties
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Directive.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/DirectiveConstants.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Foreach.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Include.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/InputBase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Literal.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Macro.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/MacroParseException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/Parse.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/ParseDirectiveException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VMProxyArg.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/directive/VelocimacroProxy.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/NodeException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/exception/ReferenceException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/AvalonLogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/Log4JLogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogManager.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/LogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/NullLogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/PrimordialLogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/SimpleLog4JLogSystem.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/log/VelocityFormatter.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/CharStream.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/JJTParserState.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParseException.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jj
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.jjt
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserConstants.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTokenManager.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/ParserTreeConstants.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Token.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/TokenMgrError.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/VelocityCharStream.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAddNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAndNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTAssignment.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTBlock.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTComment.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTDirective.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTDivNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTEQNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTElseIfStatement.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTElseStatement.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTEscape.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTEscapedDirective.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTExpression.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTFalse.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTGENode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTGTNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTIdentifier.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTIfStatement.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTIncludeStatement.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTIntegerRange.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTLENode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTLTNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTMethod.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTModNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTMulNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTNENode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTNotNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTNumberLiteral.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTObjectArray.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTOrNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTParameters.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTReference.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTSetDirective.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTStringLiteral.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTSubtractNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTText.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTTrue.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTVariable.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTWord.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ASTprocess.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/AbstractExecutor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/BooleanPropertyExecutor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/GetExecutor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/Node.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/NodeUtils.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/ParserVisitor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/PropertyExecutor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/node/SimpleNode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ContentResource.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/Resource.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ResourceCache.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ResourceCacheImpl.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ResourceFactory.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ResourceManager.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/ResourceManagerImpl.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/ClasspathResourceLoader.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/FileResourceLoader.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/JarHolder.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/JarResourceLoader.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/ResourceLoader.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/resource/loader/ResourceLoaderFactory.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/BaseVisitor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/NodeViewMode.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/visitor/VMReferenceMungeVisitor.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/servlet/VelocityServlet.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/AnakiaTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/BaseTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClassloaderChangeTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ClasspathResourceTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/CommonsExtPropTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ConfigurationTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ContextSafetyTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EncodingTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/EventHandlingTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ExternalLoggerTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/InlineScopeVMTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase2.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/IntrospectorTestCase3.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MethodInvocationExceptionTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MiscTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultiLoaderTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/MultipleFileResourcePathTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/ParserTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestBase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TemplateTestSuite.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenClasspathTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/TexenTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocimacroTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityAppTestCase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/VelocityServletTest.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/misc/Test.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/BoolObj.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Child.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/Person.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/provider/TestProvider.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/test/view/TemplateNodeView.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/ant/TexenTask.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/defaults/texen.properties
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/FileUtil.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/util/PropertiesUtil.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/ArrayIterator.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/SimplePool.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/StringUtils.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/ClassMap.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Info.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectionCacheData.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Introspector.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/IntrospectorBase.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/MethodMap.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/Uberspect.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectImpl.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/UberspectLoggable.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelMethod.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertyGet.java
    incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/introspection/VelPropertySet.java
    incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh
    incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh
    incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh

Modified: incubator/flex/trunk/modules/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/build.xml?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/build.xml (original)
+++ incubator/flex/trunk/modules/compiler/build.xml Tue May 29 17:10:53 2012
@@ -123,7 +123,7 @@
     <!-- TODO should actually compile them in Velocity for validation before copying -->
     <target name="templates">
         <echo level="info" message="Building serialized velocity templates."/>
-        <java fork="true" classname="flex.util.SerializedTemplateFactory" dir="${module.src}">
+        <java fork="true" classname="org.apache.flex.forks.util.SerializedTemplateFactory" dir="${module.src}">
             <classpath>
                 <fileset dir="${lib.dir}" includes="*.jar"/>
             </classpath>

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java Tue May 29 17:10:53 2012
@@ -40,8 +40,8 @@ import macromedia.asc.embedding.ConfigVa
 import macromedia.asc.parser.*;
 import macromedia.asc.util.Context;
 import macromedia.asc.util.ObjectList;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 import java.io.File;
 import java.io.IOException;

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/GenerativeSecondPassEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/GenerativeSecondPassEvaluator.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/GenerativeSecondPassEvaluator.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/as3/genext/GenerativeSecondPassEvaluator.java Tue May 29 17:10:53 2012
@@ -34,8 +34,8 @@ import macromedia.asc.util.ObjectList;
 import flash.swf.tools.as3.EvaluatorAdapter;
 import flash.util.FileUtils;
 import flash.util.Trace;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 import java.io.*;
 import java.util.*;

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/CssCompiler.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/CssCompiler.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/CssCompiler.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/CssCompiler.java Tue May 29 17:10:53 2012
@@ -61,8 +61,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 /**
  * This subcompiler is used to translate a CSS file into an AS3

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java Tue May 29 17:10:53 2012
@@ -70,8 +70,8 @@ import flash.fonts.FontManager;
 import flash.util.Trace;
 import macromedia.asc.util.ContextStatics;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 /**
  * This class is an MXML document specific override of StyleModule. It provides

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/AbstractTranscoder.java Tue May 29 17:10:53 2012
@@ -43,8 +43,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 /**
  * This is the default transcoder implementation.  The only thing that

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/SkinTranscoder.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/SkinTranscoder.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/SkinTranscoder.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/media/SkinTranscoder.java Tue May 29 17:10:53 2012
@@ -36,8 +36,8 @@ import flex2.compiler.util.ThreadLocalTo
 import flex2.compiler.util.VelocityManager;
 import java.io.StringWriter;
 import java.util.Map;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 /**
  * Transcodes non-Flex skins, likely from Flash Authoring, by

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/ImplementationCompiler.java Tue May 29 17:10:53 2012
@@ -46,8 +46,8 @@ import flex2.compiler.mxml.rep.DocumentI
 import flex2.compiler.mxml.rep.MxmlDocument;
 import flex2.compiler.util.*;
 import macromedia.asc.util.ContextStatics;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 import java.io.IOException;
 import java.util.Iterator;

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java Tue May 29 17:10:53 2012
@@ -49,11 +49,11 @@ import flex2.compiler.util.*;
 import macromedia.asc.embedding.ConfigVar;
 import macromedia.asc.util.ObjectList;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-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.VelocityContext;
+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 java.io.*;
 import java.util.*;

Modified: incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/VelocityManager.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/VelocityManager.java?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/VelocityManager.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flex2/compiler/util/VelocityManager.java Tue May 29 17:10:53 2012
@@ -19,21 +19,21 @@
 
 package flex2.compiler.util;
 
-import flex.util.SerializedTemplateFactory;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.EventHandler;
-import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.LogSystem;
-import org.apache.velocity.util.introspection.Info;
-import org.apache.velocity.util.introspection.UberspectImpl;
-import org.apache.velocity.util.introspection.VelPropertyGet;
-import org.apache.velocity.util.introspection.VelPropertySet;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.app.event.EventHandler;
+import org.apache.flex.forks.velocity.app.event.MethodExceptionEventHandler;
+import org.apache.flex.forks.velocity.app.event.ReferenceInsertionEventHandler;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.log.LogSystem;
+import org.apache.flex.forks.velocity.util.introspection.Info;
+import org.apache.flex.forks.velocity.util.introspection.UberspectImpl;
+import org.apache.flex.forks.velocity.util.introspection.VelPropertyGet;
+import org.apache.flex.forks.velocity.util.introspection.VelPropertySet;
+import org.apache.flex.forks.util.SerializedTemplateFactory;
 
 import java.text.Format;
 import java.text.SimpleDateFormat;
@@ -76,7 +76,7 @@ public class VelocityManager
 
 	private static final String STRICT_UBERSPECT_IMPL_CLASS = "flex2.compiler.util.VelocityManager$StrictUberspectImpl";
 
-	private static final String CLASSPATH_RESOURCE_LOADER_CLASS = "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader";
+	private static final String CLASSPATH_RESOURCE_LOADER_CLASS = "org.apache.flex.forks.velocity.runtime.resource.loader.ClasspathResourceLoader";
 
 	private static final String UTIL_KEY = "util";
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml Tue May 29 17:10:53 2012
@@ -75,12 +75,12 @@
 
   <property 
     name="default.texen.properties"
-    value="org/apache/velocity/texen/defaults/texen.properties"
+    value="org/apache/flex/forks/velocity/texen/defaults/texen.properties"
   />
 
   <property 
     name="runtime.defaults.dir" 
-    value="org/apache/velocity/runtime/defaults"
+    value="org/apache/flex/forks/velocity/runtime/defaults"
   />
 
   <!-- disabled for now == classpath issues
@@ -208,7 +208,7 @@
       source="${javac.source}"
       target="${javac.target}">
 
-      <exclude  name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java"/>
+      <exclude  name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.java"/>
       
       <classpath refid="classpath"/>
     </javac>
@@ -240,8 +240,8 @@
   <!-- ====================================================================== -->
   <target name="compile-copy">
 
-    <copy todir="${build.dest}/org/apache/velocity">
-      <fileset dir="${src.java.dir}/org/apache/velocity">
+    <copy todir="${build.dest}/org/apache/flex/forks/velocity">
+      <fileset dir="${src.java.dir}/org/apache/flex/forks/velocity">
         <include name="**/*.class"/>
       </fileset>
     </copy>
@@ -294,7 +294,7 @@
 
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
-        <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
+        <exclude name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
      
     </jar>
@@ -311,7 +311,7 @@
 
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
-        <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
+        <exclude name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
      
     </jar>
@@ -360,12 +360,12 @@
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
         <exclude name="org/apache/oro/**"/>
-        <exclude name="org/apache/velocity/anakia/**"/>
-        <exclude name="org/apache/velocity/convert/**"/>
-        <exclude name="org/apache/velocity/servlet/**"/>
-        <exclude name="org/apache/velocity/texen/**"/>
-        <exclude name="org/apache/velocity/test/**"/>
-        <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
+        <exclude name="org/apache/flex/forks/velocity/anakia/**"/>
+        <exclude name="org/apache/flex/forks/velocity/convert/**"/>
+        <exclude name="org/apache/flex/forks/velocity/servlet/**"/>
+        <exclude name="org/apache/flex/forks/velocity/texen/**"/>
+        <exclude name="org/apache/flex/forks/velocity/test/**"/>
+        <exclude name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
     </jar>
   
@@ -379,10 +379,10 @@
     <jar jarfile="${build.dir}/${project}-util-${version}.jar">
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
-        <include name="org/apache/velocity/anakia/**"/>
-        <include name="org/apache/velocity/convert/**"/>
-        <include name="org/apache/velocity/texen/**"/>
-        <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
+        <include name="org/apache/flex/forks/velocity/anakia/**"/>
+        <include name="org/apache/flex/forks/velocity/convert/**"/>
+        <include name="org/apache/flex/forks/velocity/texen/**"/>
+        <exclude name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
     </jar>
   
@@ -396,8 +396,8 @@
     <jar jarfile="${build.dir}/${project}-servlet-${version}.jar">
       <fileset dir="${build.dest}">
         <exclude name="**/package.html"/>
-        <include name="org/apache/velocity/servlet/**"/>
-        <exclude name="org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
+        <include name="org/apache/flex/forks/velocity/servlet/**"/>
+        <exclude name="org/apache/flex/forks/velocity/runtime/resource/loader/DataSourceResourceLoader.class"/>
       </fileset>
     </jar>
   
@@ -485,7 +485,7 @@
     
     <javadoc
       sourcepath="${build.src}"
-      packagenames="org.apache.velocity.*"
+      packagenames="org.apache.flex.forks.velocity.*"
       destdir="${javadoc.destdir}"
       author="true"
       private="true"
@@ -708,7 +708,7 @@
       />
 -->
       <taskdef name="anakia"
-          classname="org.apache.velocity.anakia.AnakiaTask">
+          classname="org.apache.flex.forks.velocity.anakia.AnakiaTask">
           
           <classpath>
              <pathelement location="${build.dir}/${project}-${version}.jar"/>
@@ -771,7 +771,7 @@
           >
 
       <taskdef name="anakia"
-          classname="org.apache.velocity.anakia.AnakiaTask">
+          classname="org.apache.flex.forks.velocity.anakia.AnakiaTask">
           
           <classpath>
              <pathelement location="${build.dir}/${project}-${version}.jar"/>

Modified: incubator/flex/trunk/modules/thirdparty/velocity/build/testcases.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/build/testcases.xml?rev=1343856&r1=1343855&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/build/testcases.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/build/testcases.xml Tue May 29 17:10:53 2012
@@ -81,7 +81,7 @@
 
     <java classname="${velocity.test.runner}" fork="yes"
           failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.TemplateTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.TemplateTestCase"/>
       <classpath refid="classpath"/>
     </java>
    </target>
@@ -90,7 +90,7 @@
     <echo message="Running Event Handler tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.EventHandlingTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.EventHandlingTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -101,7 +101,7 @@
     <echo message="Running Template encoding test..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.EncodingTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.EncodingTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -112,7 +112,7 @@
     <echo message="Running app.Velocity tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.VelocityAppTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.VelocityAppTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -123,7 +123,7 @@
     <echo message="Running Introspector tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.IntrospectorTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.IntrospectorTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -134,7 +134,7 @@
     <echo message="Running Introspector2 tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.IntrospectorTestCase2"/>
+      <arg value="org.apache.flex.forks.velocity.test.IntrospectorTestCase2"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -143,7 +143,7 @@
 
   <target name="test-classloaderchange">
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}" >
-      <arg value="org.apache.velocity.test.ClassloaderChangeTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.ClassloaderChangeTest"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -154,7 +154,7 @@
     <echo message="Running Inline VM Scope tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}" >
-      <arg value="org.apache.velocity.test.InlineScopeVMTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.InlineScopeVMTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -165,7 +165,7 @@
     <echo message="Running Multiple File Resource Path tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.MultipleFileResourcePathTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.MultipleFileResourcePathTest"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -176,7 +176,7 @@
     <echo message="Running Classpath Resource tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.ClasspathResourceTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.ClasspathResourceTest"/>
       <classpath>
         <path refid="classpath"/>
         <pathelement location="../test/cpload/test1.jar"/>
@@ -189,7 +189,7 @@
     <echo message="Running Context Safety tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.ContextSafetyTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.ContextSafetyTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -199,7 +199,7 @@
   <target name="test-anakia">
     <echo message="Running Anakia tests..."/>
 
-    <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
+    <taskdef name="anakia" classname="org.apache.flex.forks.velocity.anakia.AnakiaTask">
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -214,7 +214,7 @@
     </anakia>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}" >
-      <arg value="org.apache.velocity.test.AnakiaTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.AnakiaTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -223,7 +223,7 @@
 
   <target name="test-configuration">
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}" >
-      <arg value="org.apache.velocity.test.ConfigurationTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.ConfigurationTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -232,7 +232,7 @@
 
  <target name="test-commonsextprop">
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}" >
-      <arg value="org.apache.velocity.test.CommonsExtPropTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.CommonsExtPropTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -243,7 +243,7 @@
     <echo message="Running external logger tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.ExternalLoggerTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.ExternalLoggerTest"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -255,7 +255,7 @@
     <echo message="Running MethodInvocationException tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.MethodInvocationExceptionTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.MethodInvocationExceptionTest"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -266,7 +266,7 @@
     <echo message="Running misc tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.MiscTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.MiscTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -277,7 +277,7 @@
     <echo message="Running special parser tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.ParserTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.ParserTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -288,7 +288,7 @@
     <echo message="Running VelocityServlet tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.VelocityServletTest"/>
+      <arg value="org.apache.flex.forks.velocity.test.VelocityServletTest"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -303,7 +303,7 @@
 
   <target name="test-texen">
 
-    <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask">
+    <taskdef name="texen" classname="org.apache.flex.forks.velocity.texen.ant.TexenTask">
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -318,7 +318,7 @@
     />
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.TexenTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.TexenTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -335,7 +335,7 @@
 
   <target name="test-texen-classpath">
 
-    <taskdef name="texen" classname="org.apache.velocity.texen.ant.TexenTask"
+    <taskdef name="texen" classname="org.apache.flex.forks.velocity.texen.ant.TexenTask"
 	reverseloader="true">
       <classpath>
         <pathelement location="../test/texen-classpath/test.jar"/>
@@ -352,7 +352,7 @@
     />
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.TexenClasspathTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.TexenClasspathTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>
@@ -364,7 +364,7 @@
     <echo message="Running MultiLoader tests..."/>
 
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.MultiLoaderTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.MultiLoaderTestCase"/>
       <classpath>
         <path refid="classpath"/>
         <pathelement location="../test/multiloader/test1.jar"/>
@@ -375,7 +375,7 @@
  <target name="test-velocimacro">
     <echo message="Running Velocimacro tests..."/>
     <java classname="${velocity.test.runner}" fork="yes" failonerror="${testbed.failonerror}">
-      <arg value="org.apache.velocity.test.VelocimacroTestCase"/>
+      <arg value="org.apache.flex.forks.velocity.test.VelocimacroTestCase"/>
       <classpath>
         <path refid="classpath"/>
       </classpath>

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/SerializedTemplateFactory.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/SerializedTemplateFactory.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/SerializedTemplateFactory.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/util/SerializedTemplateFactory.java Tue May 29 17:10:53 2012
@@ -17,7 +17,7 @@
  *
  */
 
-package flex.util;
+package org.apache.flex.forks.util;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -32,12 +32,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStreamWriter;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.app.Velocity;
+import org.apache.flex.forks.velocity.runtime.RuntimeInstance;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
 
 public class SerializedTemplateFactory 
 {

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/Template.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/Template.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/Template.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/Template.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity;
+package org.apache.flex.forks.velocity;
 
 /*
  * Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -22,17 +22,17 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.context.InternalContextAdapterImpl;
-
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+
+import org.apache.flex.forks.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.context.InternalContextAdapterImpl;
+
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
 /**
  * This class is used for controlling all template

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/VelocityContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/VelocityContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/VelocityContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/VelocityContext.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity;
+package org.apache.flex.forks.velocity;
 
 /*
  * Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -19,8 +19,8 @@ package org.apache.velocity;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.velocity.context.AbstractContext;
-import org.apache.velocity.context.Context;
+import org.apache.flex.forks.velocity.context.AbstractContext;
+import org.apache.flex.forks.velocity.context.Context;
 
 /**
  *  General purpose implemention of the application Context 
@@ -37,7 +37,7 @@ import org.apache.velocity.context.Conte
  *  threads with simultaneous access for some reason, please create 
  *  your own and extend the interface Context 
  *  
- *  @see org.apache.velocity.context.Context
+ *  @see org.apache.flex.forks.velocity.context.Context
  *
  *  @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  *  @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>

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

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

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaTask.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaTask.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaTask.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/anakia/AnakiaTask.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.anakia;
+package org.apache.flex.forks.velocity.anakia;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -35,12 +35,12 @@ import org.jdom.Document;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.util.StringUtils;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.app.VelocityEngine;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.util.StringUtils;
 
-import org.apache.velocity.VelocityContext;
+import org.apache.flex.forks.velocity.VelocityContext;
 
 /**
  * The purpose of this Ant Task is to allow you to use 

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

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

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

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

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

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

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/FieldMethodizer.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/FieldMethodizer.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/FieldMethodizer.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/FieldMethodizer.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.app;
+package org.apache.flex.forks.velocity.app;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -40,7 +40,7 @@ import java.util.HashMap;
  *  <p>
  *  So to use in your Java code, do something like this :
  *  <blockquote><pre>
- *   context.put("runtime", new FieldMethodizer( "org.apache.velocity.runtime.Runtime" ));
+ *   context.put("runtime", new FieldMethodizer( "org.apache.flex.forks.velocity.runtime.Runtime" ));
  *  </pre></blockquote>
  *  and then in your template, you can access any of your static fields in this way :
  *  <blockquote><pre>  

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/Velocity.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/Velocity.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/Velocity.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/Velocity.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.app;
+package org.apache.flex.forks.velocity.app;
 
 /*
  * Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -26,19 +26,19 @@ import java.io.StringReader;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.velocity.context.Context;
-import org.apache.velocity.Template;
-import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.configuration.Configuration;
-
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.context.InternalContextAdapterImpl;
+import org.apache.flex.forks.velocity.runtime.RuntimeSingleton;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.configuration.Configuration;
+
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
-import org.apache.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
 
 import org.apache.commons.collections.ExtendedProperties;
 
@@ -493,7 +493,7 @@ public class Velocity implements Runtime
     /**
      * <p>Determines whether a resource is accessable via the
      * currently configured resource loaders.  {@link
-     * org.apache.velocity.runtime.resource.Resource} is the generic
+     * org.apache.flex.forks.velocity.runtime.resource.Resource} is the generic
      * description of templates, static content, etc.</p>
      *
      * <p>Note that the current implementation will <b>not</b> change

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/VelocityEngine.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/VelocityEngine.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/VelocityEngine.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/VelocityEngine.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.app;
+package org.apache.flex.forks.velocity.app;
 
 /*
  * Copyright 2000-2001,2004 The Apache Software Foundation.
@@ -30,20 +30,20 @@ import java.io.StringReader;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.velocity.context.Context;
-import org.apache.velocity.Template;
-import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.configuration.Configuration;
-
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.Template;
+import org.apache.flex.forks.velocity.context.InternalContextAdapterImpl;
+import org.apache.flex.forks.velocity.runtime.RuntimeInstance;
+import org.apache.flex.forks.velocity.runtime.RuntimeConstants;
+import org.apache.flex.forks.velocity.runtime.RuntimeServices;
+import org.apache.flex.forks.velocity.runtime.parser.node.SimpleNode;
+import org.apache.flex.forks.velocity.runtime.configuration.Configuration;
+
+import org.apache.flex.forks.velocity.exception.ResourceNotFoundException;
+import org.apache.flex.forks.velocity.exception.ParseErrorException;
+import org.apache.flex.forks.velocity.exception.MethodInvocationException;
 
-import org.apache.velocity.runtime.parser.ParseException;
+import org.apache.flex.forks.velocity.runtime.parser.ParseException;
 
 import org.apache.commons.collections.ExtendedProperties;
 

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventCartridge.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventCartridge.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventCartridge.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/event/EventCartridge.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.app.event;
+package org.apache.flex.forks.velocity.app.event;
 
 /*
  * Copyright 2001,2004 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.velocity.app.event;
  * limitations under the License.
  */
 
-import org.apache.velocity.context.InternalEventContext;
-import org.apache.velocity.context.Context;
+import org.apache.flex.forks.velocity.context.InternalEventContext;
+import org.apache.flex.forks.velocity.context.Context;
 
 /**
  *  'Package' of event handlers...

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

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

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

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

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/tools/VelocityFormatter.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/tools/VelocityFormatter.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/tools/VelocityFormatter.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/app/tools/VelocityFormatter.java Tue May 29 17:10:53 2012
@@ -1,4 +1,4 @@
-package org.apache.velocity.app.tools;
+package org.apache.flex.forks.velocity.app.tools;
 
 /*
  * Copyright (c) 2001 The Java Apache Project.  All rights reserved.
@@ -62,7 +62,7 @@ import java.text.*;
 import java.lang.reflect.Array;
 
 // Veclocity classes
-import org.apache.velocity.context.*;
+import org.apache.flex.forks.velocity.context.*;
 
 /**
  * Formatting tool for inserting into the Velocity WebContext.  Can

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/AbstractContext.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/AbstractContext.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/AbstractContext.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.
@@ -18,8 +18,8 @@ package org.apache.velocity.context;
 
 import java.io.Serializable;
 
-import org.apache.velocity.context.Context;
-import org.apache.velocity.context.InternalContextBase;
+import org.apache.flex.forks.velocity.context.Context;
+import org.apache.flex.forks.velocity.context.InternalContextBase;
 
 /**
  *  This class is the abstract base class for all conventional 
@@ -40,7 +40,7 @@ import org.apache.velocity.context.Inter
  *  </ul>
  *
  *  The default implementation of this for application use is 
- *  org.apache.velocity.VelocityContext.
+ *  org.apache.flex.forks.velocity.VelocityContext.
  *
  *  All thanks to Fedor for the chaining idea.
  *

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/Context.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/Context.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/Context.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/Context.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.
@@ -25,8 +25,8 @@ package org.apache.velocity.context;
  *  This is the same set of methods supported by the original Context
  *  class
  *
- *  @see org.apache.velocity.context.AbstractContext
- *  @see org.apache.velocity.VelocityContext
+ *  @see org.apache.flex.forks.velocity.context.AbstractContext
+ *  @see org.apache.flex.forks.velocity.VelocityContext
  *
  *  @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  *  @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapter.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapter.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapter.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapter.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/InternalContextAdapterImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapterImpl.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapterImpl.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextAdapterImpl.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,11 +16,11 @@ 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.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
 
-import org.apache.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
 
 /**
  *  This adapter class is the container for all context types for internal

Modified: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextBase.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextBase.java?rev=1343856&r1=1343785&r2=1343856&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextBase.java (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/context/InternalContextBase.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.
@@ -20,10 +20,10 @@ import java.util.HashMap;
 import java.util.Stack;
 import java.io.Serializable;
 
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.flex.forks.velocity.util.introspection.IntrospectionCacheData;
 
-import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.runtime.resource.Resource;
+import org.apache.flex.forks.velocity.app.event.EventCartridge;
+import org.apache.flex.forks.velocity.runtime.resource.Resource;
 
 /**
  *  class to encapsulate the 'stuff' for internal operation of velocity.  



Mime
View raw message