You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/29 17:35:15 UTC

svn commit: r1343781 [17/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...

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/velocimacro2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,91 @@
+#**
+
+@test velocimacro2.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.
+
+*#
+#macro( foo $a )
+  Hello from foo : $a
+#end
+
+#macro( foo2 $a )
+  Hello from foo2 : $a
+#end
+
+#macro( foo_two $a )
+  Hello from foo_two : $a
+#end
+
+#foo( "hi" )
+#foo2( "hi" )
+#foo_two( "hi" )
+
+
+#foo( $notincontext )
+#foo( $notincontext.getThing() )
+
+#macro( tester $a )
+  #if($a)
+    $a :  yes
+  #else
+    $a :  no
+  #end
+#end
+
+##
+## test to see if we can print these
+## as schmoo
+##
+
+#tester( $notincontext )
+#tester( $notincontext.woogie() )
+
+#set($foo = "bar")
+
+#tester($foo)
+
+#foo2( ${foo} )
+
+#macro( poundthis $truth )
+  #if ($truth )
+    <td align=center class=v10><b>#</b></td>
+    <td align=center class=v10><b> # </b></td>
+    <td align=center class=v10><b>\#</b></td>
+  #end
+#end
+
+#poundthis( true )
+
+##
+## test for bug reported when stringlit changed to on-init parsing
+##
+
+#macro( blorp $bar ) $bar #end
+#macro( schlorp $i )#blorp( "hi $i" ) #end
+
+#schlorp("victor")
+
+
+##
+## test all directive arg types
+##
+
+#macro(dirarg $a)
+>$a<
+#end
+
+#set($ref = 1)
+
+#dirarg(1)
+#dirarg(true)
+#dirarg(false)
+#dirarg("hello")
+#dirarg('hello')
+#dirarg($ref)
+#dirarg([1..10])
+#dirarg(['a','b',$ref])
+

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test1.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test1.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test1.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test1.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,16 @@
+#**
+
+@test vm_test1.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.
+
+Tests VM recursion. In our VM library, we have a VM callrecurse()
+which calls recurse().  The point is to have the global def of
+recurse() called since we don't define it here.
+
+*#
+
+#callrecurse()

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test2.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test2.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test2.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/templates/vm_test2.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,24 @@
+#**
+
+@test vm_test2.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.
+
+Tests VM recursion *and* the local template namespace feature.
+This version of recurse should override the global version
+when called by the global VM callrecurse()
+*#
+#macro( recurse $a )
+  local recurse $a
+  #set( $a = $a - 1)
+  #if ($a > 0)
+    #recurse( $a )
+  #end
+#end
+
+#set($count = 5)
+
+#callrecurse()

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+# These should all evaluate to true
+
+true
+true
+true
+
+# These should all evaluate to false
+
+false
+false
+false

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/Test.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java Tue May 29 15:35:01 2012
@@ -0,0 +1,80 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineServices;
+
+/**
+ *
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public class TurbineWeather
+{
+    /**
+     * Utility method for accessing the service 
+     * implementation
+     *
+     * @return a WeatherService implementation instance
+     */
+    protected static WeatherService getService()
+    {
+        return (WeatherService)TurbineServices
+            .getInstance().getService(WeatherService.SERVICE_NAME);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeather.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,77 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineBaseService;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public class TurbineWeatherService extends TurbineBaseService
+    implements WeatherService
+
+{
+    /**
+     * Initialize the TurbineWeather Service.
+     */
+    public void init()
+    {
+        setInit(true);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,69 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.Service;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public interface WeatherService extends Service
+{
+    public static final String SERVICE_NAME = "TurbineWeatherService";
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/WeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+This is the book of the week:
+
+Props retrieved using new method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305
+
+Props retrieved using old method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/compare/book.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,25 @@
+#set ( $sourceFile = "Turbine${baseName}Service.java" )
+$generator.parse("ServiceImplementation.vm",$sourceFile)
+
+#set ( $sourceFile = "${baseName}Service.java" )
+$generator.parse("ServiceInterface.vm",$sourceFile)
+
+#set ( $sourceFile = "Turbine${baseName}.java" )
+$generator.parse("ServiceStaticHelper.vm",$sourceFile)
+
+#set ( $sourceFile = "Test.txt" )
+$generator.parse("Test.vm",$sourceFile)
+
+#set ( $props = $properties.load("test.props") )
+
+## This is to test a properties file that was once taken from
+## the file system but is now taken from a JAR. We have to
+## deprecate the use of $generator.TemplatePath if we want
+## templates to work the same way from JARs and the file
+## system. I have a hack in PropsUtil right now to deal
+## with it.
+
+#set ( $props2 = $properties.load("$generator.TemplatePath/test.props") )
+
+#set ( $sourceFile = "book.txt" )
+$generator.parse("book.vm",$sourceFile)

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Control.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,22 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.TurbineBaseService;
+
+/**
+ *
+ * @author <a href="mailto:$email">$name</a>
+ */
+public class Turbine${baseName}Service extends TurbineBaseService
+    implements ${baseName}Service
+
+{
+    /**
+     * Initialize the Turbine${baseName} Service.
+     */
+    public void init()
+    {
+        setInit(true);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceImplementation.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,14 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.Service;
+
+/**
+ *
+ * @author <a href="mailto:$email">$name</a>
+ */
+public interface ${baseName}Service extends Service
+{
+    public static final String SERVICE_NAME = "Turbine${baseName}Service";
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceInterface.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,25 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.TurbineServices;
+
+/**
+ *
+ *
+ * @author <a href="mailto:$email">$name</a>
+ */
+public class Turbine$baseName
+{
+    /**
+     * Utility method for accessing the service 
+     * implementation
+     *
+     * @return a ${baseName}Service implementation instance
+     */
+    protected static ${baseName}Service getService()
+    {
+        return (${baseName}Service)TurbineServices
+            .getInstance().getService(${baseName}Service.SERVICE_NAME);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/ServiceStaticHelper.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+# These should all evaluate to true
+
+$one
+$two
+$three
+
+# These should all evaluate to false
+
+$four
+$five
+$six

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/Test.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+This is the book of the week:
+
+Props retrieved using new method:
+
+Title: $props.get("title")
+Author: $props.get("author")
+Publisher: $props.get("publisher")
+ISBN: $props.get("isbn")
+
+Props retrieved using old method:
+
+Title: $props2.get("title")
+Author: $props2.get("author")
+Publisher: $props2.get("publisher")
+ISBN: $props2.get("isbn")

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/book.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/license.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/service.props
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/service.props?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/service.props (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/service.props Tue May 29 15:35:01 2012
@@ -0,0 +1,21 @@
+baseName=Weather
+package=org.apache.turbine.services.weather
+name=Jason van Zyl
+email=jvanzyl@apache.org
+
+## The contents of the file license.txt
+## will be available in the context
+## as $license.
+
+license.file.contents = ../test/texen/license.txt
+
+# Test some properties that have be give some boolean
+# values.
+
+one = true
+two = yes
+three = on
+
+four = false
+five = no
+six = off

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/service.props
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/test.props
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/test.props?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/test.props (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/test.props Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+author = Edward O. Wilson
+title = Consilience: The Unity of Knowledge
+publisher = Knopf
+isbn = 0965058305

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/jar-contents/test.props
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh Tue May 29 15:35:01 2012
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+(
+  cd jar-contents
+  rm -f ../test.jar
+  rm *~
+  jar cvf ../test.jar *
+)  

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

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/mkjar.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+# These should all evaluate to true
+
+true
+true
+true
+
+# These should all evaluate to false
+
+false
+false
+false

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/Test.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java Tue May 29 15:35:01 2012
@@ -0,0 +1,80 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineServices;
+
+/**
+ *
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public class TurbineWeather
+{
+    /**
+     * Utility method for accessing the service 
+     * implementation
+     *
+     * @return a WeatherService implementation instance
+     */
+    protected static WeatherService getService()
+    {
+        return (WeatherService)TurbineServices
+            .getInstance().getService(WeatherService.SERVICE_NAME);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeather.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,77 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineBaseService;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public class TurbineWeatherService extends TurbineBaseService
+    implements WeatherService
+
+{
+    /**
+     * Initialize the TurbineWeather Service.
+     */
+    public void init()
+    {
+        setInit(true);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,69 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.Service;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ */
+public interface WeatherService extends Service
+{
+    public static final String SERVICE_NAME = "TurbineWeatherService";
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/WeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+This is the book of the week:
+
+Props retrieved using new method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305
+
+Props retrieved using old method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/book.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen-classpath/results/report
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

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

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/additional.props
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+# These should all evaluate to true
+
+true
+true
+true
+
+# These should all evaluate to false
+
+false
+false
+false

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/Test.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java Tue May 29 15:35:01 2012
@@ -0,0 +1,81 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineServices;
+
+/**
+ *
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ * @occupation somnambulist
+ */
+public class TurbineWeather
+{
+    /**
+     * Utility method for accessing the service 
+     * implementation
+     *
+     * @return a WeatherService implementation instance
+     */
+    protected static WeatherService getService()
+    {
+        return (WeatherService)TurbineServices
+            .getInstance().getService(WeatherService.SERVICE_NAME);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,78 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.TurbineBaseService;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ * @occupation somnambulist
+ */
+public class TurbineWeatherService extends TurbineBaseService
+    implements WeatherService
+
+{
+    /**
+     * Initialize the TurbineWeather Service.
+     */
+    public void init()
+    {
+        setInit(true);
+    }
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java Tue May 29 15:35:01 2012
@@ -0,0 +1,70 @@
+package org.apache.turbine.services.weather;
+
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */
+
+
+import org.apache.turbine.services.Service;
+
+/**
+ *
+ * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
+ * @occupation somnambulist
+ */
+public interface WeatherService extends Service
+{
+    public static final String SERVICE_NAME = "TurbineWeatherService";
+}

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/WeatherService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+This is the book of the week:
+
+Props retrieved using new method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305
+
+Props retrieved using old method:
+
+Title: Consilience: The Unity of Knowledge
+Author: Edward O. Wilson
+Publisher: Knopf
+ISBN: 0965058305

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/compare/book.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/license.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/license.txt?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/license.txt (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/license.txt Tue May 29 15:35:01 2012
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
+ *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
+ *    "Java Apache Project" must not be used to endorse or promote products
+ *    derived from this software without prior written permission.
+ *
+ * 5. Products derived from this software may not be called "Apache JServ"
+ *    nor may "Apache" nor "Apache JServ" appear in their names without
+ *    prior written permission of the Java Apache Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Java Apache
+ *    Project for use in the Apache JServ servlet engine project
+ *    <http://java.apache.org/>."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Java Apache Group. For more information
+ * on the Java Apache Project and the Apache JServ Servlet Engine project,
+ * please see <http://java.apache.org/>.
+ *
+ */

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

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/license.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/service.props
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/service.props?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/service.props (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/service.props Tue May 29 15:35:01 2012
@@ -0,0 +1,21 @@
+baseName=Weather
+package=org.apache.turbine.services.weather
+name=Jason van Zyl
+email=jvanzyl@apache.org
+
+## The contents of the file license.txt
+## will be available in the context
+## as $license.
+
+license.file.contents = ../test/texen/license.txt
+
+# Test some properties that have be give some boolean
+# values.
+
+one = true
+two = yes
+three = on
+
+four = false
+five = no
+six = off

Propchange: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/service.props
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Control.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Control.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Control.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Control.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,25 @@
+#set ( $sourceFile = "Turbine${baseName}Service.java" )
+$generator.parse("ServiceImplementation.vm",$sourceFile)
+
+#set ( $sourceFile = "${baseName}Service.java" )
+$generator.parse("ServiceInterface.vm",$sourceFile)
+
+#set ( $sourceFile = "Turbine${baseName}.java" )
+$generator.parse("ServiceStaticHelper.vm",$sourceFile)
+
+#set ( $sourceFile = "Test.txt" )
+$generator.parse("Test.vm",$sourceFile)
+
+#set ( $props = $properties.load("test.props") )
+
+## This is to test a properties file that was once taken from
+## the file system but is now taken from a JAR. We have to
+## deprecate the use of $generator.TemplatePath if we want
+## templates to work the same way from JARs and the file
+## system. I have a hack in PropsUtil right now to deal
+## with it.
+
+#set ( $props2 = $properties.load("$generator.TemplatePath/test.props") )
+$generator.TemplatePath/test.props
+#set ( $sourceFile = "book.txt" )
+$generator.parse("book.vm",$sourceFile)

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,23 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.TurbineBaseService;
+
+/**
+ *
+ * @author <a href="mailto:$email">$name</a>
+ * @occupation $occupation
+ */
+public class Turbine${baseName}Service extends TurbineBaseService
+    implements ${baseName}Service
+
+{
+    /**
+     * Initialize the Turbine${baseName} Service.
+     */
+    public void init()
+    {
+        setInit(true);
+    }
+}

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.Service;
+
+/**
+ *
+ * @author <a href="mailto:$email">$name</a>
+ * @occupation $occupation
+ */
+public interface ${baseName}Service extends Service
+{
+    public static final String SERVICE_NAME = "Turbine${baseName}Service";
+}

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,26 @@
+package $package;
+
+$license
+
+import org.apache.turbine.services.TurbineServices;
+
+/**
+ *
+ *
+ * @author <a href="mailto:$email">$name</a>
+ * @occupation $occupation
+ */
+public class Turbine$baseName
+{
+    /**
+     * Utility method for accessing the service 
+     * implementation
+     *
+     * @return a ${baseName}Service implementation instance
+     */
+    protected static ${baseName}Service getService()
+    {
+        return (${baseName}Service)TurbineServices
+            .getInstance().getService(${baseName}Service.SERVICE_NAME);
+    }
+}

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Test.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Test.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Test.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/Test.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,11 @@
+# These should all evaluate to true
+
+$one
+$two
+$three
+
+# These should all evaluate to false
+
+$four
+$five
+$six

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/book.vm
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/book.vm?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/book.vm (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/book.vm Tue May 29 15:35:01 2012
@@ -0,0 +1,15 @@
+This is the book of the week:
+
+Props retrieved using new method:
+
+Title: $props.get("title")
+Author: $props.get("author")
+Publisher: $props.get("publisher")
+ISBN: $props.get("isbn")
+
+Props retrieved using old method:
+
+Title: $props2.get("title")
+Author: $props2.get("author")
+Publisher: $props2.get("publisher")
+ISBN: $props2.get("isbn")

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

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

Added: incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/test.props
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/test.props?rev=1343781&view=auto
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/test.props (added)
+++ incubator/flex/trunk/modules/thirdparty/velocity/test/texen/templates/test.props Tue May 29 15:35:01 2012
@@ -0,0 +1,4 @@
+author = Edward O. Wilson
+title = Consilience: The Unity of Knowledge
+publisher = Knopf
+isbn = 0965058305

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