incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1343781 [15/17] - in /incubator/flex/trunk/modules: ./ thirdparty/velocity/ thirdparty/velocity/build/ thirdparty/velocity/build/lib/ thirdparty/velocity/build/xsl/ thirdparty/velocity/src/java/org/apache/velocity/anakia/ thirdparty/veloci...
Date Tue, 29 May 2012 15:35:15 GMT
Added: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java Tue May 29 15:35:01 2012
@@ -0,0 +1,38 @@
+package org.apache.velocity.util.introspection;
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.velocity.runtime.RuntimeLogger;
+
+/**
+ *  Marker interface to let an uberspector indicate it can and wants to
+ *  log
+ *
+ *  Thanks to Paulo for the suggestion
+ *
+ * @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
+ * @version $Id: UberspectLoggable.java,v 1.1.4.1 2004/03/03 23:23:08 geirm Exp $
+ *
+ */
+public interface UberspectLoggable
+{
+    /**
+     *  Sets the logger.  This will be called before any calls to the
+     *  uberspector
+     */
+    public void setRuntimeLogger(RuntimeLogger logger);
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelMethod.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelMethod.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelMethod.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelMethod.java Tue May 29 15:35:01 2012
@@ -0,0 +1,54 @@
+package org.apache.velocity.util.introspection;
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *  Method used for regular method invocation
+ *
+ *    $foo.bar()
+ *
+ *
+ * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
+ * @version $Id: VelMethod.java,v 1.2.4.1 2004/03/03 23:23:08 geirm Exp $
+ */
+public interface VelMethod
+{
+    /**
+     *  invocation method - called when the method invocationshould be
+     *  preformed and a value returned
+     */
+    public Object invoke(Object o, Object[] params)
+        throws Exception;
+
+    /**
+     *  specifies if this VelMethod is cacheable and able to be
+     *  reused for this class of object it was returned for
+     *
+     *  @return true if can be reused for this class, false if not
+     */
+    public boolean isCacheable();
+
+    /**
+     *  returns the method name used
+     */
+    public String getMethodName();
+
+    /**
+     *  returns the return type of the method invoked
+     */
+    public Class getReturnType();
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java Tue May 29 15:35:01 2012
@@ -0,0 +1,48 @@
+package org.apache.velocity.util.introspection;
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *  Interface defining a 'getter'.  For uses when looking for resolution of
+ *  property references
+ *
+ *       $foo.bar
+ *
+ * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
+ * @version $Id: VelPropertyGet.java,v 1.1.4.1 2004/03/03 23:23:08 geirm Exp $
+ */
+public interface VelPropertyGet
+{
+    /**
+     *  invocation method - called when the 'get action' should be
+     *  preformed and a value returned
+     */
+    public Object invoke(Object o) throws Exception;
+
+    /**
+     *  specifies if this VelPropertyGet is cacheable and able to be
+     *  reused for this class of object it was returned for
+     *
+     *  @return true if can be reused for this class, false if not
+     */
+    public boolean isCacheable();
+
+    /**
+     *  returns the method name used to return this 'property'
+     */
+    public String getMethodName();
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertySet.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertySet.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertySet.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertySet.java Tue May 29 15:35:01 2012
@@ -0,0 +1,51 @@
+package org.apache.velocity.util.introspection;
+
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *  Interface used for setting values that appear to be properties in
+ *  Velocity.  Ex.
+ *
+ *      #set($foo.bar = "hello")
+ *
+ * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
+ * @version $Id: VelPropertySet.java,v 1.1.4.1 2004/03/03 23:23:08 geirm Exp $
+ */
+public interface VelPropertySet
+{
+    /**
+     *  method used to set the value in the object
+     *
+     *  @param o Object on which the method will be called with the arg
+     *  @param arg value to be set
+     *  @return the value returned from the set operation (impl specific)
+     */
+    public Object invoke(Object o, Object arg) throws Exception;
+
+    /**
+     *  specifies if this VelPropertySet is cacheable and able to be
+     *  reused for this class of object it was returned for
+     *
+     *  @return true if can be reused for this class, false if not
+     */
+    public boolean isCacheable();
+
+    /**
+     *  returns the method name used to set this 'property'
+     */
+    public String getMethodName();
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/src/java/org/apache/velocity/util/introspection/VelPropertySet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/compare/index.html
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/compare/index.html?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/compare/index.html (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/compare/index.html Tue May 29 15:35:01 2012
@@ -0,0 +1,69 @@
+<!-- Content Stylesheet for Site -->
+
+        
+<!-- start the processing -->
+    <!-- ====================================================================== -->
+    <!-- Main Page Section -->
+    <!-- ====================================================================== -->
+    <html>
+        <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+
+                        
+<!--
+                                    
+            
+            
+                        
+-->
+
+
+                        <meta name="author" value="Jon S. Stevens">
+            <meta name="email" value="jon@latchkey.com">
+
+            <title>The Jakarta Project</title>
+        </head>
+
+        <body bgcolor="#ffffff" text="#000000" link="#525D76">        
+            <table border="1">
+                <tr>
+                <td>
+                    
+            <strong>Home</strong>
+        <ul>
+                    <li>    <a href="./index.html">Front Page</a>
+</li>
+                </ul>
+            <strong>About</strong>
+        <ul>
+                    <li>    <a href="./about/index.html">About</a>
+</li>
+                </ul>
+                    </td>
+                <td>
+                
+                                                                                        <p>
+This is an example template that gets processed.
+</p>
+                                                                                                <img src="./images/velocity.gif" width="329" height="105" align="">
+                                                                                                <table border="1">
+<tr>
+    <td>
+        It even has a table in it!
+    </td>
+</tr>
+</table>
+                                                                                                <h3>And an h3 tag</h3>
+                                                                                                                                    <p> here is another section </p>
+                                                                                                                                    <p><a href="./about/index.html">A link to a sub page</a></p>
+                                                                            </td>
+                </tr>
+            </table>
+        </body>
+    </html>
+<!-- end the processing -->
+
+
+
+
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/compare/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/index.xml?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/index.xml (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/index.xml Tue May 29 15:35:01 2012
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <author email="jon@latchkey.com">Jon S. Stevens</author>
+    <title>The Jakarta Project</title>
+  </properties>
+
+<body>
+
+  <section name="Section 1">
+
+<p>
+This is an example template that gets processed.
+</p>
+
+<img src="/images/velocity.gif" width="329" height="105"/>
+
+<table border="1">
+<tr>
+    <td>
+        It even has a table in it!
+    </td>
+</tr>
+</table>
+
+<h3>And an h3 tag</h3>
+
+  </section>
+
+
+    <section name="Section 2">
+
+    <p> here is another section </p>
+    
+    </section>
+
+    <section name="section 3">
+    
+    <p><a href="./about/index.html">A link to a sub page</a></p>
+
+    </section>
+
+</body>
+</document>

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/project.xml?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/project.xml (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/project.xml Tue May 29 15:35:01 2012
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Jakarta Site"
+        href="http://jakarta.apache.org/">
+
+    <title>Jakarta Site</title>
+
+    <body>
+        <menu name="Home">
+            <item name="Front Page"            href="/index.html"/>
+        </menu>
+    
+        <menu name="About">
+            <item name="About"                 href="/about/index.html"/>
+        </menu>
+    </body>
+</project>

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/site.vsl?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/site.vsl (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/site.vsl Tue May 29 15:35:01 2012
@@ -0,0 +1,110 @@
+<!-- Content Stylesheet for Site -->
+
+    ## Defined variables
+    #set ($bodybg = "#ffffff")
+    #set ($bodyfg = "#000000")
+    #set ($bodylink = "#525D76")
+    #set ($bannerbg = "#525D76")
+    #set ($bannerfg = "#ffffff")
+    #set ($tablethbg = "#039acc")
+    #set ($tabletdbg = "#a0ddf0")
+    
+<!-- start the processing -->
+#document()
+<!-- end the processing -->
+
+## This is where the macro's live
+
+#macro ( makeProject )
+    ##set ($menus = $project.getChild("body").getChildren("menu"))
+    #set ($menus = $xpath.applyTo("body/menu", $project))
+
+    #foreach ( $menu in $menus )
+        <strong>$menu.getAttributeValue("name")</strong>
+        <ul>
+        #foreach ( $item in $menu.getChildren() )
+            #set ($name = $item.getAttributeValue("name"))
+            <li>#projectanchor($name $item.getAttributeValue("href"))</li>
+        #end
+        </ul>
+    #end
+#end
+
+#macro ( image $value )
+#if ($value.getAttributeValue("width"))
+#set ($width=$value.getAttributeValue("width"))
+#end
+#if ($value.getAttributeValue("height"))
+#set ($height=$value.getAttributeValue("height"))
+#end
+#if ($value.getAttributeValue("align"))
+#set ($align=$value.getAttributeValue("align"))
+#end
+<img src="$relativePath$value.getAttributeValue("src")" width="$!width" height="$!height" align="$!align">
+#end
+
+#macro ( projectanchor $name $value )
+    <a href="$relativePath$value">$name</a>
+#end
+#macro ( metaauthor $author $email )
+            <meta name="author" value="$author">
+            <meta name="email" value="$email">
+#end
+
+#macro (document)
+    <!-- ====================================================================== -->
+    <!-- Main Page Section -->
+    <!-- ====================================================================== -->
+    <html>
+        <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+
+            ##set ($au = $root.getChild("properties").getChild("author").getText())
+            ##set ($em = $root.getChild("properties").getChild("author").getAttributeValue("email"))
+
+<!--
+            ## For some reason, we can't .getText() and .getValue() directly in the
+            ## set directive, but rather have to wait a moment, and do it in the
+            ## metaauthor directive.
+
+            #set ($au = $xpath.applyTo("properties/author", $root).get(0))
+            #set ($em = $xpath.applyTo("properties/author/@email", $root).get(0))
+
+            ## This should work, but doesn't
+
+            ##set ($au = $xpath.applyTo("properties/author", $root).get(0).getText())
+            ##set ($em = $xpath.applyTo("properties/author/@email", $root).get(0).getValue())
+
+-->
+
+
+            #metaauthor ( $au.getText() $em.getValue() )
+
+            <title>$root.getChild("properties").getChild("title").getText()</title>
+        </head>
+
+        <body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">        
+            <table border="1">
+                <tr>
+                <td>
+                #makeProject()
+                </td>
+                <td>
+                ##set ($allSections = $root.getChild("body").getChildren("section"))
+                #set ($allSections = $xpath.applyTo("body/section", $root))
+
+                #foreach ( $section in $allSections )
+                    #foreach ( $item in $section.getChildren() )                
+                        #if ($item.getName().equals("img"))
+                            #image ($item)
+                        #else
+                            $xmlout.outputString($item)
+                        #end
+                    #end
+                #end
+                </td>
+                </tr>
+            </table>
+        </body>
+    </html>
+#end

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/anakia/xdocs/stylesheets/site.vsl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.class
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.class?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.java Tue May 29 15:35:01 2012
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2001,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *  Simple class Foo to be used in classloader testing
+ *  This class should be kept here and not in velocity.jar
+ *  to keep out of the parent classloader of the test
+ *  classloader
+ */
+public class Foo
+{
+    /*
+     *  the ClassloaderChangeTest
+     *  depends on this string as 
+     *  is.  If this changes (there is no reason
+     *  to ever do that, BTW), then
+     *  udpate ClassloaderChangeTest as well.
+     */
+    private static String MSG = 
+        "Hello From Foo";
+        
+	public String doIt()
+	{
+		return MSG;
+	}
+}
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/classloader/Foo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/compare/output.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/compare/output.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/compare/output.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/compare/output.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,123 @@
+--------------------------------------------------
+Testing order of keys ...
+--------------------------------------------------
+
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+resource.loader
+file.resource.loader.class
+file.resource.loader.description
+file.resource.loader.path
+classpath.resource.loader.class
+classpath.resource.loader.description
+datasource.resource.loader.class
+datasource.resource.loader.description
+logger.type
+config.string.value
+config.boolean.value
+config.byte.value
+config.short.value
+config.int.value
+config.long.value
+config.float.value
+config.double.value
+escape.comma1
+escape.comma2
+include1.property
+include2.property
+
+--------------------------------------------------
+Testing retrieval of CSV values ...
+--------------------------------------------------
+
+file
+classpath
+datasource
+
+--------------------------------------------------
+Testing subset(prefix).getKeys() ...
+--------------------------------------------------
+
+class
+description
+path
+
+--------------------------------------------------
+Testing getVector(prefix) ...
+--------------------------------------------------
+
+/path01
+/path02
+/path03
+
+--------------------------------------------------
+Testing getString(key) ...
+--------------------------------------------------
+
+string
+
+--------------------------------------------------
+Testing getBoolean(key) ...
+--------------------------------------------------
+
+true
+
+--------------------------------------------------
+Testing getByte(key) ...
+--------------------------------------------------
+
+1
+
+--------------------------------------------------
+Testing getShort(key) ...
+--------------------------------------------------
+
+1
+
+--------------------------------------------------
+Testing getInt(key) ...
+--------------------------------------------------
+
+30000
+
+--------------------------------------------------
+Testing getLong(key) ...
+--------------------------------------------------
+
+1000000
+
+--------------------------------------------------
+Testing getFloat(key) ...
+--------------------------------------------------
+
+3.14
+
+--------------------------------------------------
+Testing getDouble(key) ...
+--------------------------------------------------
+
+3.14159265358793
+
+--------------------------------------------------
+Testing escaped-comma scalar...
+--------------------------------------------------
+
+foo,
+
+--------------------------------------------------
+Testing escaped-comma vector...
+--------------------------------------------------
+
+bar,lala
+woogie,bjork!
+
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include1.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include1.properties?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include1.properties (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include1.properties Tue May 29 15:35:01 2012
@@ -0,0 +1 @@
+include1.property = somnambulance

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include1.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include2.properties
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include2.properties?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include2.properties (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include2.properties Tue May 29 15:35:01 2012
@@ -0,0 +1 @@
+include2.property = insomnia

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/include2.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/test.config
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/test.config?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/test.config (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/test.config Tue May 29 15:35:01 2012
@@ -0,0 +1,87 @@
+# ---------------------------------------------------------
+# Make sure that we get these back in the
+# order that they are listed here.
+# ---------------------------------------------------------
+01 = 01
+02 = 02
+03 = 03
+04 = 04
+05 = 05
+06 = 06
+07 = 07
+08 = 08
+09 = 09
+10 = 10
+
+# ---------------------------------------------------------
+# Test CSV properties
+# ---------------------------------------------------------
+resource.loader = file, classpath, datasource
+
+file.resource.loader.class = FileResourceLoader
+file.resource.loader.description = File Resource Loader
+file.resource.loader.path = /path01
+file.resource.loader.path = /path02
+file.resource.loader.path = /path03
+
+classpath.resource.loader.class = ClasspathResourceLoader
+classpath.resource.loader.description = Classpath Resource Loader
+
+datasource.resource.loader.class = DataSourceResourceLoader
+datasource.resource.loader.description = Datasource Resource Loader
+
+# ---------------------------------------------------------
+# Test multi same value keys
+# ---------------------------------------------------------
+logger.type = file
+logger.type = console
+logger.type = db
+
+# ---------------------------------------------------------
+# Testing String retrieval
+# ---------------------------------------------------------
+config.string.value = string
+
+# ---------------------------------------------------------
+# Testing boolean retrieval
+# ---------------------------------------------------------
+config.boolean.value = true
+
+# ---------------------------------------------------------
+# Testing byte retrieval
+# ---------------------------------------------------------
+config.byte.value = 1
+
+# ---------------------------------------------------------
+# Testing short retrieval
+# ---------------------------------------------------------
+config.short.value = 1
+
+# ---------------------------------------------------------
+# Testing integer retrieval
+# ---------------------------------------------------------
+config.int.value = 30000
+
+# ---------------------------------------------------------
+# Testing long retrieval
+# ---------------------------------------------------------
+config.long.value = 1000000
+
+# ---------------------------------------------------------
+# Testing float retrieval
+# ---------------------------------------------------------
+config.float.value = 3.14
+
+# ---------------------------------------------------------
+# Testing double retrieval
+# ---------------------------------------------------------
+config.double.value = 3.14159265358793
+
+#---------------------------------------------------------
+# Testing escaped commas
+#---------------------------------------------------------
+escape.comma1 = foo\,
+escape.comma2 = bar\,lala,woogie\,,bjork!
+
+include = include1.properties
+include = ./include2.properties

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/configuration/test.config
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test1.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test1.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test1.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test1.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+this is a template for test1.jar    

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/compare/test2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+this is a template for test2.jar    

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test1.jar
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test1.jar?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test2.jar
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test2.jar?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/cpload/test2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/README.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/README.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/README.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/README.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,18 @@
+$Id: README.txt,v 1.5 2001/03/12 02:09:19 jon Exp $
+
+This directory contains some misc tests for you to ponder over.
+
+compile.sh: This script will compile a .vm file into a .class file.
+            Note: at the current time, this code is not working.
+            Usage: ./compile.sh ../templates/test.vm
+
+dump.sh: This script will dump out a text representation of the AST.
+         Usage: ./dump.sh ../templates/test.vm
+
+test.sh: This script is used for command line testing of .vm files.
+         Note: this script is not a replacement for the core testing
+         suite. It is simply a convinence script/class for the developers.
+
+thanks!
+
+- The Velocity Team

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh Tue May 29 15:35:01 2012
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+CLASSPATH=.:../../bin/classes
+
+for jar in ../../build/lib/*.jar
+do
+    CLASSPATH=${CLASSPATH}:${jar}
+done
+
+java -cp ${CLASSPATH} org.apache.velocity.runtime.compiler.Compiler $1

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/compile.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh Tue May 29 15:35:01 2012
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+CLASSPATH=.:../../bin/classes
+
+for jar in ../../build/lib/*.jar
+do
+    CLASSPATH=${CLASSPATH}:${jar}
+done
+
+java -cp ${CLASSPATH} org.apache.velocity.test.view.TemplateNodeView $1 > output.dump

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/dump.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh Tue May 29 15:35:01 2012
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+CLASSPATH=.:../../bin/classes
+
+for jar in ../../build/lib/*.jar
+do
+    CLASSPATH=${CLASSPATH}:${jar}
+done
+
+java -cp ${CLASSPATH} org.apache.velocity.test.misc.Test $1 $2 > output 2>&1

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/misc/test.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path1.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path1.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path1.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path1.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+I am path1.vm

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multi/compare/path2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+I am path2.vm

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path1/path1.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path1/path1.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path1/path1.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path1/path1.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,12 @@
+#*
+
+@test path1.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+I am path1.vm

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path1/path1.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path2/path2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path2/path2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path2/path2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path2/path2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,12 @@
+#*
+
+@test path2.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+I am path2.vm

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/multi/path2/path2.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/path1.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/path1.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/path1.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/path1.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+I am path1.vm

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+this is a template for test1.jar    

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test3.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test3.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test3.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/compare/test3.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+
+
+this is a template for test2.jar    

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/path1.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/path1.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/path1.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/path1.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,12 @@
+#*
+
+@test path1.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+I am path1.vm

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/path1.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test1.jar
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test1.jar?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test2.jar
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test2.jar?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/multiloader/test2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,27 @@
+#macro( quietnull $a)
+#if($a)$a#end
+#end
+
+#macro( recurse $a )
+  global recurse $a
+  #set( $a = $a - 1)
+  #if ($a > 0)
+    #recurse( $a )
+  #end
+#end
+
+#macro( callrecurse )
+   #set( $count = 5)
+   #recurse( $count )
+#end
+
+#macro( testbool $b )
+ #if($b)
+  arg true
+ #end
+ #if( ! $b )
+  arg false
+ #end
+#end
+
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/VM_global_library.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/arithmetic.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/arithmetic.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/arithmetic.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/arithmetic.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,38 @@
+#**
+
+@test arithmetic.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set($foo = 5)
+#set($foo = $foo + 1)
+$foo
+
+#set($foo = $foo - 1)
+$foo
+
+#set($foo = $foo * 2)
+$foo
+
+#set($foo = $foo / 2)
+$foo
+
+And the whole thing again with inline set statements
+
+#set( $foo = 5)
+#set( $foo = $foo + 1)
+$foo
+
+#set ( $foo = $foo - 1 )
+$foo
+
+#set( $foo = $foo * 2)
+$foo
+
+#set ($foo = $foo / 2)
+$foo

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/arithmetic.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/array.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/array.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/array.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/array.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,42 @@
+#*
+
+@test array.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#set( $foo = [$this, $that, $woog.Bar, [$this, "this"] ])
+
+$provider.concat(["a", "b", "c"])
+
+#set($foo = "a")
+$provider.objConcat( [1..2] )
+$provider.objConcat( ["a","b"] )
+$provider.objConcat( [1..2 ] )
+$provider.objConcat( [$foo] )
+$provider.objConcat( [ $foo] )
+$provider.objConcat( [$foo ] )
+
+#macro( showme $array )
+ #foreach( $i in $array )
+   > $i <#end
+
+#end
+
+#set($woog = "a")
+#set($floog = "b")
+#showme( [ $woog] )
+#showme( [ $woog,$floog] )
+#showme( [1..2])
+#showme( [1 ..2 ])
+
+##  and more....
+
+$p.m( [ $A.g(1), $title ])
+$pp.messageFormat( [ $Abc.get($sti), $title, $ti, $sti, 'bodytext' ], $subtopicTemplate)
+#set ($args = [ $pp.nQuestions, $pass, $units ] )
+

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/array.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/block.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/block.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/block.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/block.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,97 @@
+#*
+
+@test block.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+First test : spacing between stuff.  Note that spacing preceeding the directives counts!
+One blank line follows
+
+#set($foo = false)
+#if ($foo)
+    this is true
+#elseif ($bar)
+    this is false
+#elseif (true)
+    this should be followed by two blank lines
+#end
+
+
+#if (true)
+    this is the if statement. (followed by two blank lines)
+
+    #if (true)
+    
+        this is great (followed by a blank line, 4 spaces on a line,and 2 more, yes there should be one after the 4 spaces)
+
+    #elseif (false)
+        this is also great.
+    #end
+
+#elseif (true)
+    this is the first elseif.
+#elseif (false)
+    this is the second elseif.
+#else
+    this is the else statement
+#end
+
+-- Second Test : no spacing between anything (1 blank line follows)
+
+#set($foo = false)
+#if ($foo)
+    this is true
+#elseif ($bar)
+    this is false
+#elseif (true)
+    this
+#end
+#if (true)
+    this is the if statement.
+    #if (true)
+        this is great (line w/ 4 spaces follows (from in front of the \#end) + another blank line)
+    #elseif (false)
+        this is also great.
+    #end
+#elseif (true)
+    this is the first elseif.
+#elseif (false)
+    this is the second elseif.
+#else
+    this is the else statement
+#end
+
+------------
+#if(false)
+False
+#else
+True
+#end
+-----------
+
+-- Third Test : tight tight tight.  Note that \#end eats the \n, which is NOT what people expect, I think.
+-- one blank line follows
+
+blargh #if(true)This follows blargh#end
+blargh#if(true)This immedately follows blargh with a following newline
+#end
+
+-- Fourth Test : another tight tight tight. If you want the \n, then put one *after* the content, not a space after \#end.
+-- one blank line follows
+
+blargh #if(true)This follows blargh
+#end
+blargh#if(true)This immedately follows blargh with a following newline
+#end
+
+-- Fifth Test : different kind of tight. blank line follows
+
+blargh
+#if(true)
+blargh2
+#end
+blargh3

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/block.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/comment.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/comment.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/comment.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/comment.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,49 @@
+#*
+
+@test comment.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression
+test doesn't fail incorrectly.
+
+*#
+
+## this is a single line comment
+
+#*
+
+this is a multi line comment
+
+#if (
+
+*#
+
+#**
+
+@author jason van zyl
+
+*#
+
+this is some text.
+
+The following is a 'Christoph Comment' ;)
+##  ##
+foo
+
+We can now comment after the inline set :
+
+#set( $foo = 1 ) ## and this is a set statement
+
+
+## here is a Nathan Bubna bug :
+
+$bar##
+#set($foo = 'foo!' )
+$foo
+
+
+##  here's one reported by Daniel Dekany
+
+$##
+there is a dollar before me

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/comment.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/arithmetic.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/arithmetic.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/arithmetic.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/arithmetic.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,19 @@
+
+
+6
+
+5
+
+10
+
+5
+
+And the whole thing again with inline set statements
+
+6
+
+5
+
+10
+
+5

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/array.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/array.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/array.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/array.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+
+
+
+a b c 
+
+1 2 
+a b 
+1 2 
+a 
+a 
+a 
+
+
+    > a <
+    > a <   > b <
+    > 1 <   > 2 <
+    > 1 <   > 2 <
+
+
+$p.m( [ $A.g(1), $title ])
+$pp.messageFormat( [ $Abc.get($sti), $title, $ti, $sti, 'bodytext' ], $subtopicTemplate)
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/block.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/block.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/block.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/block.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,40 @@
+
+First test : spacing between stuff.  Note that spacing preceeding the directives counts!
+One blank line follows
+
+    this should be followed by two blank lines
+
+
+    this is the if statement. (followed by two blank lines)
+
+        
+        this is great (followed by a blank line, 4 spaces on a line,and 2 more, yes there should be one after the 4 spaces)
+
+    
+
+-- Second Test : no spacing between anything (1 blank line follows)
+
+    this
+    this is the if statement.
+            this is great (line w/ 4 spaces follows (from in front of the #end) + another blank line)
+    
+------------
+True
+-----------
+
+-- Third Test : tight tight tight.  Note that #end eats the \n, which is NOT what people expect, I think.
+-- one blank line follows
+
+blargh This follows blarghblarghThis immedately follows blargh with a following newline
+
+-- Fourth Test : another tight tight tight. If you want the \n, then put one *after* the content, not a space after #end.
+-- one blank line follows
+
+blargh This follows blargh
+blarghThis immedately follows blargh with a following newline
+
+-- Fifth Test : different kind of tight. blank line follows
+
+blargh
+blargh2
+blargh3

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/comment.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/comment.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/comment.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/comment.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+this is some text.
+
+The following is a 'Christoph Comment' ;)
+foo
+
+We can now comment after the inline set :
+
+ 
+
+
+$barfoo!
+
+
+
+$there is a dollar before me

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety1.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety1.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety1.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety1.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+ vector hello 1
+ vector hello 2
+ vector hello 3

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/context_safety2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+ array hello 1
+ array hello 2
+ array hello 3

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/diabolical.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/diabolical.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/diabolical.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/diabolical.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,45 @@
+
+
+$f.
+$f
+$f. $f
+foo.
+foo
+foo. foo
+$thingy.dingy
+"#FFFFFF"
+"$ow"
+
+"$row","var"
+#333333
+#FFFFFF
+"#FFFFF
+#FFFFF"
+"#000000">
+"#ffffff"
+
+$strings.getVillageType($col.Type)
+$strings.getVillageType( $col.Type)
+$strings.getVillageType($col.Type )
+
+
+-#-# Inline loops #-#-
+
+blargh><first element><second element><blargh
+blargh> <first element> <second element><blargh
+blargh><first element> <second element> <blargh
+blargh> <first element>  <second element> <blargh
+
+#"FFFF
+-#-#-#-#-#
+#-#-#-#
+$-$-$-$-
+#FF00FF00
+#'FF
+
+$tstrings.chop($generator.parse("sql/mysql/columns", "", "table", $tbl),1)
+string
+
+foobar
+
+#0F

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/directive.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/directive.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/directive.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/directive.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,5 @@
+
+
+this is a dynamic directive!
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+Thanks to Kent Johnson for this example and the nudge.
+
+<p>Chinese: 网站登录</p>
+<p>Spanish: niño</p>

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,3 @@
+This is an example of chinese code encoding:
+
+The chinese string is 上网, its length is 2

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest3.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest3.cmp?rev=1343781&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest3.cmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest_KOI8-R.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest_KOI8-R.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest_KOI8-R.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/encodingtest_KOI8-R.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,104 @@
+From - Sat Jun  2 11:47:36 2001
+Return-Path: <velocity-user-return-1985-geirm=optonline.net@jakarta.apache.org>
+Received: from mta1.srv.hcvlny.cv.net (mta1.srv.hcvlny.cv.net [167.206.5.4])
+	by s1.optonline.net (8.10.2/8.10.2) with ESMTP id f4U9uVc26907
+	for <@mail.srv.nrwlct.cv.net:geirm@optonline.net>; Wed, 30 May 2001 05:56:31 -0400 (EDT)
+Received: from apache.org (h31.sny.collab.net [64.208.42.41])
+ by mta1.srv.hcvlny.cv.net
+ (iPlanet Messaging Server 5.0 Patch 2 (built Dec 14 2000))
+ with SMTP id <0GE5008U97M83H@mta1.srv.hcvlny.cv.net> for geirm@optonline.net
+ (ORCPT geirm@optonline.net); Wed, 30 May 2001 05:56:33 -0400 (EDT)
+Received: (qmail 19350 invoked by uid 500); Wed, 30 May 2001 09:56:20 +0000
+Received: (qmail 19153 invoked from network); Wed, 30 May 2001 09:56:18 +0000
+Date: Wed, 30 May 2001 13:57:17 +0400
+From: Vitaly Repetenko <vit@mtu.ru>
+Subject: Re: Russian Character Encoding
+To: velocity-user@jakarta.apache.org
+Reply-to: velocity-user@jakarta.apache.org
+Message-id: <3B14C3FD.3834AF02@mtu.ru>
+Organization: MTU-Intel
+MIME-version: 1.0
+X-Mailer: Mozilla 4.77 [en] (Windows NT 5.0; U)
+Content-type: multipart/mixed; boundary="Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)"
+X-Accept-Language: ru,en
+Precedence: bulk
+Delivered-to: mailing list velocity-user@jakarta.apache.org
+Mailing-List: contact velocity-user-help@jakarta.apache.org; run by ezmlm
+X-Recipient: velocity-user@jakarta.apache.org
+X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N
+References: <3B139D1A.E49723E2@mtu.ru> <3B139DB1.CD00E5E2@optonline.net>
+ <3B13A6B9.B02D04BF@mtu.ru> <3B13B5FB.57130BA9@optonline.net>
+ <3B149DF4.72383B1D@mtu.ru> <3B14BC65.A688FFFB@optonline.net>
+List-Post: <mailto:velocity-user@jakarta.apache.org>
+List-Subscribe: <mailto:velocity-user-subscribe@jakarta.apache.org>
+List-Unsubscribe: <mailto:velocity-user-unsubscribe@jakarta.apache.org>
+List-Help: <mailto:velocity-user-help@jakarta.apache.org>
+X-Mozilla-Status: 8011
+X-Mozilla-Status2: 00000000
+X-UIDL: a57ee51a80f6ed07173b135dbac0735e
+
+This is a multi-part message in MIME format.
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)
+Content-type: text/plain; charset=koi8-r
+Content-transfer-encoding: 7BIT
+
+template
+
+"Geir Magnusson Jr." wrote:
+
+> Vitaly Repetenko wrote:
+> >
+> > Hi!
+> >
+> > Test is attached.
+> >
+> > Not only russian capital "U" is converted into space but russian capital "F" (ASCII
+> > code E6) also.
+> >
+>
+> Can you attach a test template?  Or better yet, see if the latest in CVS
+> fixes it?  It might have gone in later than the nightly snapshot, so you
+> may need to just get a dump from CVS.
+>
+> geir
+>
+> --
+> Geir Magnusson Jr.                           geirm@optonline.net
+> System and Software Consulting
+> Developing for the web?  See http://jakarta.apache.org/velocity/
+> "still climbing up to the shoulders..."
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)
+Content-type: text/html; charset=koi8-r; name=charset_test.vm
+Content-transfer-encoding: 8BIT
+Content-disposition: inline; filename=charset_test.vm
+
+<html>
+<head><title>Russian charset test</title></head>
+<body bgcolor="#ffffff">
+
+<pre>
+ABCDEFGHIJKLMNOPRSTUVWXYZ
+abcdefghijklmnoprstuvwxyz
+
+Russian alphabet:(32 chars) Displayed without codes 0xF5 0xE6 (code page KOI8-R)
+
+Â×ÞÚÄųÃßÊËÌÍÎÏÐÒÔÕÆÈÖÉÇÀÙÜÑÝÛÁÓ
+                    ^^
+------------------>F5E6
+â÷þúäå£ãÿêëìíîïðòôõæèöéçàùüñýûáó
+
+alt="Èõíèúê"
+     ^
+---->F5
+alt="Öêúâ"
+     ^
+---->E6
+</pre>
+
+</html>
+
+
+--Boundary_(ID_tldpu1b8SMKs0pXiY1Dv8g)--
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/equality.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/equality.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/equality.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/equality.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+
+
+
+    the user jason is logged in!
+
+
+    the count is 5!
+
+    the user isn't logged in.
+
+    $count is not equal to 3

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,44 @@
+
+
+\A
+
+#set($woo = "bar")
+
+$woo => bar
+
+The following should print 'as is' : 
+$f\oo
+\a
+"\r"
+
+Now, test the built in directives. Note that $foo isn't in the context :
+#set($foo = $foo + 1)
+#set(\$foo = $foo + 1)
+#if($foo)
+#if ( $foo )
+#else
+#end
+#elseif(
+
+Now, a reference not in the context:
+\$foo -> $foo
+#if($foo)
+#if(\$foo)
+
+Put it in :
+$foo -> 1
+#if(1)
+#if($foo)
+
+This isn't in the context, so we get the full monty :
+	\$woobie.blagh()
+
+The following two are references :
+	$provider.Title = lunatic
+	$provider.getTitle() = lunatic
+
+Now, pluggable directives:
+
+\#notadirective
+#foreach
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape2.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape2.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape2.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/escape2.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,106 @@
+
+--- Schmoo ---
+
+These are not in the context, so they should render as they are here (schmoo).
+$foo
+\$foo
+\\$foo
+
+\#woogie
+\\#woogie
+\\\#woogie
+
+Now put $foo in the context :
+$foo = bar
+\$foo =\bar
+\\$foo =\\bar
+
+As we increase the number of \'s, we alternate renderings :
+bar
+$foo
+\bar
+\$foo
+\\bar
+
+--- Pluggable Directives ----
+
+We are doing an #include("test.txt"), starting with 0 '\' preceeding :
+
+--text--
+#include("test.txt")
+\--text--
+\#include("test.txt")
+\\--text--
+
+Now, foreach is a PD.  Escape the first one, and then not the second so it
+renders.  The third and fourth examples show the single 'unpleasantry' about this.  The \
+is only an escape when 'touching' VTL, otherwise, it's just schmoo.
+
+#foreach(
+
+\ first element \ second element \
+\ first element \ \ second element \ \
+\first element\ \second element\ \
+
+--- Control Structures ----
+
+First should be escaped...
+#if(true) hi #end
+
+This isn't.  Note then that it has to render the \\ as a \ because it's stuck to the VTL
+
+\ hi \
+\ hi 
+And so forth...
+\#if(true) hi \#end
+
+\\ hi \\
+And more...
+
+#if(true)
+	hi
+#else
+	there
+#end
+
+\	hi
+\
+\#if(true)
+	hi
+\#else
+	there
+\#end
+
+\	there
+\
+\#if(false)
+	hi
+\#elseif(true)
+	there
+\#end
+
+
+#$foo1
+\#$foo1
+#${foo1}
+\#$${foo1}
+#C0C0C0
+\#C0C0C0
+#C0C0C0
+\#$C0C0C0
+#\$C0C0C0
+
+
+$(QUERY_STRING{forumid})
+\$(QUERY_STRING{forumid})
+\\$(QUERY_STRING{forumid})
+
+
+\
+\\
+\\\
+\\\\
+\\\\\
+\\\\\\
+\\\\\\\
+\\\\\\\\

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-array.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-array.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-array.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-array.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,31 @@
+
+
+--Foreach with an array. 2 blank lines follow
+
+
+<table>
+    <tr>
+        <td>This is first element and it is the 1 item</td>
+    </tr>        
+    <tr>
+        <td>This is second element and it is the 2 item</td>
+    </tr>        
+</table>
+
+--Foreach with a null array.  1 blank line follows
+
+<table>
+</table>
+
+-- And when we declare the array in-template :
+
+Choose among :
+	red
+	blue
+	green
+
+ $foo : a
+
+ $foo2 : bar
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-introspect.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-introspect.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-introspect.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-introspect.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,14 @@
+
+
+   21 1
+   22 2
+   23 3
+   24 4
+   25 5
+   26 6
+   27 7
+   28 8
+   29 9
+   30 10
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-map.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-map.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-map.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-map.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,5 @@
+
+
+    value2
+    value1
+    value0

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-method.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-method.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-method.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-method.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,8 @@
+
+
+Foreach with a method.
+
+    This is ArrayList element 1.
+    This is ArrayList element 2.
+    This is ArrayList element 3.
+    This is ArrayList element 4.

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-type.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-type.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-type.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-type.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,38 @@
+
+
+Using a Object []
+
+  a
+  b
+  c
+  d
+
+Using a Map
+
+  this is from a hashtable!
+  this is from a hashtable too!
+
+Using a Collection
+
+  string1
+  string2
+
+Using an Iterator
+
+  string1 
+  string2 
+
+
+Using an Enumeration
+
+  string1
+  string2
+
+
+Using an array of primitives
+
+  10
+  20
+  30
+  40
+  50

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-variable.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-variable.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-variable.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/foreach-variable.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,74 @@
+
+
+Foreach with a variable.
+
+    This is ArrayList element 1.
+    1
+    This is ArrayList element 2.
+    2
+    This is ArrayList element 3.
+    3
+    This is ArrayList element 4.
+    4
+
+    -- inner foreach --
+            This is ArrayList element 1.
+        1
+            This is ArrayList element 2.
+        2
+            This is ArrayList element 3.
+        3
+            This is ArrayList element 4.
+        4
+        -- inner foreach --
+
+    -- outer foreach --
+    This is ArrayList element 1.
+    1
+    -- outer foreach --
+    -- inner foreach --
+            This is ArrayList element 1.
+        1
+            This is ArrayList element 2.
+        2
+            This is ArrayList element 3.
+        3
+            This is ArrayList element 4.
+        4
+        -- inner foreach --
+
+    -- outer foreach --
+    This is ArrayList element 2.
+    2
+    -- outer foreach --
+    -- inner foreach --
+            This is ArrayList element 1.
+        1
+            This is ArrayList element 2.
+        2
+            This is ArrayList element 3.
+        3
+            This is ArrayList element 4.
+        4
+        -- inner foreach --
+
+    -- outer foreach --
+    This is ArrayList element 3.
+    3
+    -- outer foreach --
+    -- inner foreach --
+            This is ArrayList element 1.
+        1
+            This is ArrayList element 2.
+        2
+            This is ArrayList element 3.
+        3
+            This is ArrayList element 4.
+        4
+        -- inner foreach --
+
+    -- outer foreach --
+    This is ArrayList element 4.
+    4
+    -- outer foreach --
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/formal.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/formal.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/formal.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/formal.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,34 @@
+
+
+1. lunatic
+
+2. lunatic
+
+3. lunatic
+
+4. lunatic
+
+lunaticlunatic
+
+lunaticMapBuilder
+
+lunatic.map.lunaticMapBuilder
+
+
+thisthat
+
+lunatic
+
+value0
+value1
+value2
+$provider.getHashtable().get("floogie!")
+
+
+{lunatic
+lunatic}
+{lunatic}
+test provider}.Title
+test provider.Title
+test provider{.Title
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/get.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/get.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/get.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/get.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,7 @@
+
+
+
+Muck
+Duck
+Truck
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/if.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/if.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/if.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/if.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,5 @@
+
+
+    this is true
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/ifstatement.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/ifstatement.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/ifstatement.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/ifstatement.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,29 @@
+
+
+
+start :
+
+ right
+
+  right
+
+  right
+
+  right
+
+  right
+
+
+ right
+
+ right
+
+ right
+
+  right
+
+  right
+
+ right
+
+done

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/include.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/include.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/include.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/include.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,41 @@
+
+
+#*
+
+@test include.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#include("include.vm" "include.vm")
+
+#set($foo = "subdir/test.txt")
+
+#include($foo)
+
+#*
+
+@test include.vm
+
+This template is used for Velocity regression testing.
+If you alter this template make sure you change the
+corresponding comparison file so that the regression 
+test doesn't fail incorrectly.
+
+*#
+
+#include("include.vm" "include.vm")
+
+#set($foo = "subdir/test.txt")
+
+#include($foo)
+
+
+
+This is included text!
+
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/interpolation.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/interpolation.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/interpolation.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/interpolation.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,40 @@
+
+
+Start with simple string interpolation :
+
+it will cost you $10.00
+
+dog.jpg
+
+foobar.jpg
+
+foobar.jpg
+
+123
+1 2 3
+
+How about a directive?  Sure :
+
+
+ >a<  >b<  >c<  
+
+For our next trick, lets interpolate a.... VelociMacro!
+
+
+
+  Hi, I'm a VM!
+
+
+And now, for something completely different :
+
+
+ False 
+
+Now, non interpolated stringlits :
+
+
+ False 
+$code
+$!$\!code
+
+-- end --

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/literal.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/literal.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/literal.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/literal.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,12 @@
+
+
+
+#foreach ($woogie in $boogie)
+  nothing will happen to $woogie
+#end  
+
+#if($skin)
+    $!data.setLayoutTemplate($!skin.getLayout())
+    $!page.setCss($!skin.getCss())
+#end
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/logical.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/logical.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/logical.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/logical.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,133 @@
+
+
+
+    $foo is greater then 1
+
+    $foo is less than 10
+
+    $foo is great than or equal to 5
+
+    $foo is less than or equal to 5
+
+
+    foo is false
+
+--
+
+
+Logical OR :
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+Logical AND :
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+ right
+
+----------
+equivalence
+-----------
+
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+-----------
+comparisons
+-----------
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+right
+
+----------------------
+goofy but legal stuff
+----------------------
+Should equal true : true
+
+Should equal true : true
+
+Should equal true : true
+
+Should equal true : true
+
+
+
+right
+
+
+right
+
+Test to see if we can do logical assignment from any expression
+
+right
+
+right
+
+
+right
+
+
+right
+
+right
+
+right

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/loop.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/loop.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/loop.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/loop.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,6 @@
+
+
+    hello< ArrayList element 1 > 
+    hello< ArrayList element 2 > 
+    hello< ArrayList element 3 > 
+    hello< ArrayList element 4 > 

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/map.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/map.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/map.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/map.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+
+
+
+this is from a hashtable!
+
+
+foovalue
+foovalue
+
+foovalue
+foovalue

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/math.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/math.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/math.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/math.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,20 @@
+
+
+Addition and subtraction : 
+1 + 1 = 2
+2 - 1 = 1
+
+Multiplication, division, and modulus :
+5 % 2 = 1
+5 % 0 = $rem2
+7 % 2 = 1
+5 / 2 = 2
+5 / 0 = $rem4
+5 * 2 = 10
+
+5 * -1 = -5
+5 * -2 = -10
+5 * -2 = -10
+
+And now null nodes to make sure it doesn't throw an NPE :
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/method.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/method.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/method.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/method.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+
+
+I am a running man  
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/parse.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/parse.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/parse.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/parse.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+
+
+Test the #parse pluggable directive 
+
+Now calling parse1.vm :
+---
+
+This is content from parse1.vm
+
+	Hello first element.
+	Hello second element.
+
+Now using a reference to get the next one :
+   --
+
+This is parse2.vm.
+
+	This is from a true #if.
+   --
+done with parse1.vm
+---
+all done!

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/pedantic.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/pedantic.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/pedantic.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/pedantic.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,79 @@
+
+
+This is a test of the new pedantic mode.
+
+There are a few things you can do in pedantic mode.
+
+Like get the spacing between things first elementsecond element to be really, really tight.
+
+Further, it now binds any \n to the control structures, taking them out of the output.
+The hope that this is What You Expect. 
+So...
+
+--
+pedantic
+--
+
+should come out looking like
+
+--
+pedantic
+--
+
+But pay attention to what follows the #end statement :
+
+1) First, follow with 'stuff' (not sure why you want to do this... but anway...)
+
+--
+pedantic
+ woogie!
+--
+
+should be
+
+--
+pedantic
+ woogie!
+--
+
+2) Whitespace will be eaten if there is a following newline 
+
+--
+pedantic
+--
+
+should be
+
+--
+pedantic
+--
+
+
+-- INLINE STUFF ---
+
+1) respect spaces in the block
+>first elementsecond element<
+> first element second element<
+>first element second element <
+> first element  second element <
+
+2) set statement has no output, incuding preceeding whitespace
+ first element is first element
+ second element is second element
+
+	public void foo( String lala )
+	{
+  		System.out.println("first element"); 
+  		System.out.println("second element"); 
+	}
+
+	public void foo( String lala )
+	{
+	  	System.out.println("first element"); 
+	  	System.out.println("second element"); 
+		}
+
+Inline set statement :
+
+Here are the prices :  $10.24  $15.32  $12.15 
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/quotes.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/quotes.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/quotes.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/quotes.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,9 @@
+
+
+
+    "what is that"
+
+<input type="checkbox" name="jason" />
+ 
+<input type="checkbox" name="this is from a hashtable!" />
+

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/range.cmp
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/range.cmp?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/range.cmp (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/compare/range.cmp Tue May 29 15:35:01 2012
@@ -0,0 +1,54 @@
+
+[1..5]
+ 1  2  3  4  5 
+-----
+[0..0]
+ 0 
+-----
+[-4..-5]
+ -4  -5 
+-----
+[ 1 .. 5 ]
+ 1  2  3  4  5 
+-----
+[5..1]
+ 5  4  3  2  1 
+-----
+[-5..5]
+ -5  -4  -3  -2  -1  0  1  2  3  4  5 
+-----
+[5..-5]
+ 5  4  3  2  1  0  -1  -2  -3  -4  -5 
+-----
+refs $a=1 $b=5 [$a..$b]
+ 1  2  3  4  5 
+-----
+[$a.. 7]
+ 1  2  3  4  5  6  7 
+-----
+[-7 ..$a]
+ -7  -6  -5  -4  -3  -2  -1  0  1 
+-----
+[ -7 ..$a]
+ -7  -6  -5  -4  -3  -2  -1  0  1 
+------
+setting in $foo -> [0..5] :
+0 1 2 3 4 5 
+----
+
+Now some use-case examples.  Suppose we want a table to have 10 rows
+
+
+<table>
+<tr><td>a</td></tr>
+<tr><td>b</td></tr>
+<tr><td>c</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+</table>
+=done=



Mime
View raw message