You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by dl...@apache.org on 2005/06/22 01:22:27 UTC
svn commit: r191743 [4/5] - in /jakarta/velocity/core/trunk: build/xsl/
contrib/temporary/localdirective/ contrib/temporary/stderrlogsystem/
contrib/temporary/struts-velocity/
contrib/temporary/struts-velocity/src/java/org/apache/velocity/struts/
contr...
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/ClassUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/ClassUtils.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/ClassUtils.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/ClassUtils.java Tue Jun 21 16:22:20 2005
@@ -1,133 +1,133 @@
-package org.apache.velocity.util;
-
-import java.io.InputStream;
-
-/*
- * 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 utility functions for manipulating classes and resources
- * from the classloader.
- *
- * @author <a href="mailto:wglass@apache.org">Will Glass-Husain</a>
- * @version $Id$
- */
-public class ClassUtils {
-
- /**
- * Utility class; cannot be instantiated.
- */
- private ClassUtils()
- {
- }
-
- /**
- * Return a new instance of the given class. Checks the ThreadContext
- * classloader first, then uses the System classloader. Should replace all calls
- * to <code>Class.forName( claz ).newInstance()</code> (which only calls
- * the System class loader) when the class might be in a different classloader
- * (e.g. in a webapp).
- *
- * @param classname the name of the class to instantiate
- * @return
- */
- public static Object getNewInstance(String classname)
- throws ClassNotFoundException,IllegalAccessException,InstantiationException
- {
- /**
- * Use the Thread context classloader if possible
- */
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader != null)
- {
- try
- {
- return Class.forName(classname, true, loader).newInstance();
- }
- catch (ClassNotFoundException E) {
-
- /**
- * If not found with ThreadContext loader, try System classloader
- * (works around bug in ant).
- */
- return Class.forName(classname).newInstance();
- }
- }
-
- /**
- * No Thread context classloader, so use system loader.
- */
- else
- {
- return Class.forName(classname).newInstance();
- }
-
- }
-
- /**
- * Finds a resource with the given name. Checks the Thread Context
- * classloader, then uses the System classloader. Should replace all
- * calls to <code>Class.getResourceAsString</code> when the resource
- * might come from a different classloader. (e.g. a webapp).
- * @param claz Class to use when getting the System classloader (used if no Thread
- * Context classloader available or fails to get resource).
- * @param name name of the resource
- * @return
- */
- public static InputStream getResourceAsStream(Class claz, String name)
- {
- InputStream result = null;
-
- /**
- * remove leading slash so path will work with classes in a JAR file
- */
- while (name.startsWith("/"))
- {
- name = name.substring(1);
- }
-
- ClassLoader classLoader = Thread.currentThread()
- .getContextClassLoader();
-
- if (classLoader == null)
- {
- classLoader = claz.getClassLoader();
- result = classLoader.getResourceAsStream( name );
- }
- else
- {
- result= classLoader.getResourceAsStream( name );
-
- /**
- * for compatibility with texen / ant tasks, fall back to
- * old method when resource is not found.
- */
-
- if (result == null)
- {
- classLoader = claz.getClassLoader();
- if (classLoader != null)
- result = classLoader.getResourceAsStream( name );
- }
- }
-
- return result;
-
- }
-
-
-}
+package org.apache.velocity.util;
+
+import java.io.InputStream;
+
+/*
+ * 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 utility functions for manipulating classes and resources
+ * from the classloader.
+ *
+ * @author <a href="mailto:wglass@apache.org">Will Glass-Husain</a>
+ * @version $Id$
+ */
+public class ClassUtils {
+
+ /**
+ * Utility class; cannot be instantiated.
+ */
+ private ClassUtils()
+ {
+ }
+
+ /**
+ * Return a new instance of the given class. Checks the ThreadContext
+ * classloader first, then uses the System classloader. Should replace all calls
+ * to <code>Class.forName( claz ).newInstance()</code> (which only calls
+ * the System class loader) when the class might be in a different classloader
+ * (e.g. in a webapp).
+ *
+ * @param classname the name of the class to instantiate
+ * @return
+ */
+ public static Object getNewInstance(String classname)
+ throws ClassNotFoundException,IllegalAccessException,InstantiationException
+ {
+ /**
+ * Use the Thread context classloader if possible
+ */
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader != null)
+ {
+ try
+ {
+ return Class.forName(classname, true, loader).newInstance();
+ }
+ catch (ClassNotFoundException E) {
+
+ /**
+ * If not found with ThreadContext loader, try System classloader
+ * (works around bug in ant).
+ */
+ return Class.forName(classname).newInstance();
+ }
+ }
+
+ /**
+ * No Thread context classloader, so use system loader.
+ */
+ else
+ {
+ return Class.forName(classname).newInstance();
+ }
+
+ }
+
+ /**
+ * Finds a resource with the given name. Checks the Thread Context
+ * classloader, then uses the System classloader. Should replace all
+ * calls to <code>Class.getResourceAsString</code> when the resource
+ * might come from a different classloader. (e.g. a webapp).
+ * @param claz Class to use when getting the System classloader (used if no Thread
+ * Context classloader available or fails to get resource).
+ * @param name name of the resource
+ * @return
+ */
+ public static InputStream getResourceAsStream(Class claz, String name)
+ {
+ InputStream result = null;
+
+ /**
+ * remove leading slash so path will work with classes in a JAR file
+ */
+ while (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+
+ if (classLoader == null)
+ {
+ classLoader = claz.getClassLoader();
+ result = classLoader.getResourceAsStream( name );
+ }
+ else
+ {
+ result= classLoader.getResourceAsStream( name );
+
+ /**
+ * for compatibility with texen / ant tasks, fall back to
+ * old method when resource is not found.
+ */
+
+ if (result == null)
+ {
+ classLoader = claz.getClassLoader();
+ if (classLoader != null)
+ result = classLoader.getResourceAsStream( name );
+ }
+ }
+
+ return result;
+
+ }
+
+
+}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/ClassUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java Tue Jun 21 16:22:20 2005
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: StringUtils.java,v 1.18 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class StringUtils
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/TemplateNumber.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/TemplateNumber.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/TemplateNumber.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/TemplateNumber.java Tue Jun 21 16:22:20 2005
@@ -1,34 +1,34 @@
-package org.apache.velocity.util;
-
-/*
- * Copyright 2000-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.
- */
-
-
-/**
- * Any object in the context which implements TemplateNumber will be treated
- * as a number for the purposes of arithmetic operations and comparison.
- *
- * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
- */
-public interface TemplateNumber
-{
-
- /**
- * Returns a Number that can be used in a template.
- */
- public Number getAsNumber();
-
+package org.apache.velocity.util;
+
+/*
+ * Copyright 2000-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.
+ */
+
+
+/**
+ * Any object in the context which implements TemplateNumber will be treated
+ * as a number for the purposes of arithmetic operations and comparison.
+ *
+ * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
+ */
+public interface TemplateNumber
+{
+
+ /**
+ * Returns a Number that can be used in a template.
+ */
+ public Number getAsNumber();
+
}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/TemplateNumber.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java Tue Jun 21 16:22:20 2005
@@ -32,7 +32,7 @@
* @author <a href="mailto:bob@werken.com">Bob McWhirter</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ClassMap.java,v 1.22 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class ClassMap
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Info.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Info.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Info.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Info.java Tue Jun 21 16:22:20 2005
@@ -20,7 +20,7 @@
* for information error reporting from the uberspector implementations
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Info.java,v 1.5 2004/03/20 03:35:51 dlr Exp $
+ * @version $Id$
*/
public class Info
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectionCacheData.java Tue Jun 21 16:22:20 2005
@@ -21,7 +21,7 @@
* information.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: IntrospectionCacheData.java,v 1.5 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class IntrospectionCacheData
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Introspector.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Introspector.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Introspector.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Introspector.java Tue Jun 21 16:22:20 2005
@@ -52,7 +52,7 @@
* @author <a href="mailto:bob@werken.com">Bob McWhirter</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
* @author <a href="mailto:paulo.gaspar@krankikom.de">Paulo Gaspar</a>
- * @version $Id: Introspector.java,v 1.23 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class Introspector extends IntrospectorBase
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/IntrospectorBase.java Tue Jun 21 16:22:20 2005
@@ -49,7 +49,7 @@
* @author <a href="mailto:bob@werken.com">Bob McWhirter</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
* @author <a href="mailto:paulo.gaspar@krankikom.de">Paulo Gaspar</a>
- * @version $Id: IntrospectorBase.java,v 1.4 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class IntrospectorBase
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/MethodMap.java Tue Jun 21 16:22:20 2005
@@ -34,7 +34,7 @@
* @author <a href="mailto:Christoph.Reck@dlr.de">Christoph Reck</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
* @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>
- * @version $Id: MethodMap.java,v 1.17 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class MethodMap
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Uberspect.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Uberspect.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Uberspect.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/Uberspect.java Tue Jun 21 16:22:20 2005
@@ -26,7 +26,7 @@
* behavior in Velocity to be customized.
*
* @author <a href="mailto:geirm@apache.org">Geir Magusson Jr.</a>
- * @version $Id: Uberspect.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public interface Uberspect
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java Tue Jun 21 16:22:20 2005
@@ -37,7 +37,7 @@
* functionality of Velocity
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: UberspectImpl.java,v 1.6 2004/03/20 03:35:51 dlr Exp $
+ * @version $Id$
*/
public class UberspectImpl implements Uberspect, UberspectLoggable
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java Tue Jun 21 16:22:20 2005
@@ -25,7 +25,7 @@
* Thanks to Paulo for the suggestion
*
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
- * @version $Id: UberspectLoggable.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*
*/
public interface UberspectLoggable
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelMethod.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelMethod.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelMethod.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelMethod.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
*
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: VelMethod.java,v 1.4 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public interface VelMethod
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertyGet.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
* $foo.bar
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: VelPropertyGet.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public interface VelPropertyGet
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertySet.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertySet.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertySet.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/VelPropertySet.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
* #set($foo.bar = "hello")
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: VelPropertySet.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public interface VelPropertySet
{
Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/TestSimplePool.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/TestSimplePool.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/TestSimplePool.java (original)
+++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/TestSimplePool.java Tue Jun 21 16:22:20 2005
@@ -23,7 +23,7 @@
/**
* Simpletest for the SimplePool
*
- * @version $Id: TestSimplePool.java,v 1.2 2004/02/27 18:43:21 dlr Exp $
+ * @version $Id$
*/
public class TestSimplePool extends TestCase
{
Modified: jakarta/velocity/core/trunk/test/anakia/compare/index.context.html
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/anakia/compare/index.context.html?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/anakia/compare/index.context.html (original)
+++ jakarta/velocity/core/trunk/test/anakia/compare/index.context.html Tue Jun 21 16:22:20 2005
@@ -1,65 +1,65 @@
-<!-- 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="$au.getText()">
- <meta name="email" value="$em.getValue()">
- <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>
-
- <strong>Other Context</strong>
- <ul>
- <li> <a href="./index.html">Front Page OC</a>
-</li>
- </ul>
- <strong>Other About</strong>
- <ul>
- <li> <a href="./about/index.html">About OC</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="">
+<!-- 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="$au.getText()">
+ <meta name="email" value="$em.getValue()">
+ <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>
+
+ <strong>Other Context</strong>
+ <ul>
+ <li> <a href="./index.html">Front Page OC</a>
+</li>
+ </ul>
+ <strong>Other About</strong>
+ <ul>
+ <li> <a href="./about/index.html">About OC</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>
+ </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 -->
-
-
-
-
-
+ </p>
+ </td>
+ </tr>
+ </table>
+ </body>
+ </html>
+<!-- end the processing -->
+
+
+
+
+
Propchange: jakarta/velocity/core/trunk/test/anakia/compare/index.context.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/anakia/velocity.properties
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/anakia/velocity.properties?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/anakia/velocity.properties (original)
+++ jakarta/velocity/core/trunk/test/anakia/velocity.properties Tue Jun 21 16:22:20 2005
@@ -1,2 +1,2 @@
-# This is an empty velocity.properties file.
-# It is only used to trigger bug #21173 if present.
+# This is an empty velocity.properties file.
+# It is only used to trigger bug #21173 if present.
Propchange: jakarta/velocity/core/trunk/test/anakia/velocity.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/customContext.xml
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/customContext.xml?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/customContext.xml (original)
+++ jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/customContext.xml Tue Jun 21 16:22:20 2005
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Jakarta Site" href="http://jakarta.apache.org/">
- <body>
- <menu name="Other Context">
- <item name="Front Page OC" href="/index.html"/>
- </menu>
- <menu name="Other About">
- <item name="About OC" href="/about/index.html"/>
- </menu>
- </body>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Jakarta Site" href="http://jakarta.apache.org/">
+ <body>
+ <menu name="Other Context">
+ <item name="Front Page OC" href="/index.html"/>
+ </menu>
+ <menu name="Other About">
+ <item name="About OC" href="/about/index.html"/>
+ </menu>
+ </body>
</project>
Propchange: jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/customContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl (original)
+++ jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl Tue Jun 21 16:22:20 2005
@@ -1,96 +1,96 @@
-<!-- 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 = $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
-
- #set ($customMenus = $xpath.applyTo("body/menu",$customContext))
- #foreach($customMenu in $customMenus)
- <strong>$customMenu.getAttributeValue("name")</strong>
- <ul>
- #foreach ($customItem in $customMenu.getChildren() )
- #set ($name = $customItem.getAttributeValue("name"))
- <li>#projectanchor($name $customItem.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"/>
- #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 = $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>
+<!-- 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 = $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
+
+ #set ($customMenus = $xpath.applyTo("body/menu",$customContext))
+ #foreach($customMenu in $customMenus)
+ <strong>$customMenu.getAttributeValue("name")</strong>
+ <ul>
+ #foreach ($customItem in $customMenu.getChildren() )
+ #set ($name = $customItem.getAttributeValue("name"))
+ <li>#projectanchor($name $customItem.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"/>
+ #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 = $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: jakarta/velocity/core/trunk/test/anakia/xdocs/stylesheets/site_contexts.vsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/misc/README.txt
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/misc/README.txt?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/misc/README.txt (original)
+++ jakarta/velocity/core/trunk/test/misc/README.txt Tue Jun 21 16:22:20 2005
@@ -1,4 +1,4 @@
-$Id: README.txt,v 1.5 2001/03/12 02:09:19 jon Exp $
+$Id$
This directory contains some misc tests for you to ponder over.
Modified: jakarta/velocity/core/trunk/test/resourceinstance/compare/testfile.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/resourceinstance/compare/testfile.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/resourceinstance/compare/testfile.cmp (original)
+++ jakarta/velocity/core/trunk/test/resourceinstance/compare/testfile.cmp Tue Jun 21 16:22:20 2005
@@ -1,3 +1,3 @@
-
-
-I am testfile.vm
+
+
+I am testfile.vm
Propchange: jakarta/velocity/core/trunk/test/resourceinstance/compare/testfile.cmp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/resourceinstance/testfile.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/resourceinstance/testfile.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/resourceinstance/testfile.vm (original)
+++ jakarta/velocity/core/trunk/test/resourceinstance/testfile.vm Tue Jun 21 16:22:20 2005
@@ -1,12 +1,12 @@
-#*
-
-@test testfile.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 testfile.vm
+#*
+
+@test testfile.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 testfile.vm
Propchange: jakarta/velocity/core/trunk/test/resourceinstance/testfile.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/compare/curly-directive.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/curly-directive.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/curly-directive.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/curly-directive.cmp Tue Jun 21 16:22:20 2005
@@ -1,16 +1,16 @@
-
-
- this is a test
-
-sometextand yet more
-
-
-
- hello
-
-xxx
-
-#if
-#else
-#elseif
-#set
+
+
+ this is a test
+
+sometextand yet more
+
+
+
+ hello
+
+xxx
+
+#if
+#else
+#elseif
+#set
Propchange: jakarta/velocity/core/trunk/test/templates/compare/curly-directive.cmp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/compare/encodingtest.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/encodingtest.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/encodingtest.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/encodingtest.cmp Tue Jun 21 16:22:20 2005
@@ -1,4 +1,4 @@
-Thanks to Kent Johnson for this example and the nudge.
-
-<p>Chinese: ç½ç«ç»å½</p>
-<p>Spanish: niño</p>
+Thanks to Kent Johnson for this example and the nudge.
+
+<p>Chinese: ç½ç«ç»å½</p>
+<p>Spanish: niño</p>
Modified: jakarta/velocity/core/trunk/test/templates/compare/encodingtest2.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/encodingtest2.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/encodingtest2.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/encodingtest2.cmp Tue Jun 21 16:22:20 2005
@@ -1,3 +1,3 @@
-This is an example of chinese code encoding:
-
-The chinese string is ä¸ç½, its length is 2
+This is an example of chinese code encoding:
+
+The chinese string is ä¸ç½, its length is 2
Modified: jakarta/velocity/core/trunk/test/templates/compare/encodingtest3.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/encodingtest3.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/encodingtest3.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/encodingtest3.cmp Tue Jun 21 16:22:20 2005
@@ -1,19 +1,19 @@
-<table>
-<tr>
-<td>
-<strong>
-Chinese/GBK
-</strong>
-</td>
-<td>
-<p>
-50ÄêÇ°µÄ½ñÌ죬ÖйúÈËÃñÖ¾Ô¸¾üÐÛôñôñÆø°º°º£¬ÔÚÈýǧÀï½É½ÉÏ¿ªÊ¼¿¹ÃÀÔ®³¯£¬±£¼ÒÎÀ¹ú¡£ÔÚÄǶοɸè¿ÉÆüµÄËêÔÂÖУ¬¶àÉÙÖйúÈËΪǰ·½Ö¾Ô¸¾ü½«Ê¿µÄ¾«ÉñËù¹ÄÎ裬ÔÚ¼ÄÍÐÃÀºÃ×£Ô¸µÄͬʱ£¬Ò²½«¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕâÁ½¸öÃû´ÊƵƵΪ×Ô¼º¸Õ³öÉúµÄ×ÓÅ®ÃüÃû¡£50ÄêÀ´£¬¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÃÇ´ø×ÅÕⳡսÕùµÄÀúÊ·ºÛ¼££¬Ò»¸ö¸öµ½Á˽«½ü°ë°ÙµÄÄêÁ䣬½ñÌ죬ËûÃǹ¤×÷¡¢Éú»îµÃÈçºÎ£¿ÄǶÎÀúÊ·ÔÚ½ñÌìµÄËûÃÇÑÛÀÓÖÊÇÔõÑùÒ»·¬¾°Ï󣿱¾±¨¼ÇÕß×òÌìÏÂÎçÆð·ÖÍ·×·×Ù£¬Ñ°·ÃÄϾ©´ó½ÖСÏïÖеġ°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£
-<p>
-×·×ÙÒÁʼ£¬ÎÒÃÇÊ×ÏȺÍÄϾ©Êй«°²¾ÖµÄ»§Õþ¹ÜÀí²¿ÃÅÈ¡µÃÁËÁªÏµ£¬Ï£ÍûÄÜͨ¹ýËûÃDz鵽ÄϾ©Êе½µ×ÓжàÉÙ¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£ÄϾ©ÊÐÇø250ÍòÈË¿Ú£¬¼ÓÉÏÎåÏس¬¹ý500ÍòÈË¿Ú£¬²éÒ»±éÈËÃûÆÄ·Ñʱ¼ä¡£ËûÃÇ´óÁ¦Ö§³Ö£¬ÔÚ¹¤×÷Öмû·ì²åÕëΪÎÒÃÇ°²ÅÅÁËÉÏ»ú²éѯ£¬ÎÒÃÇÏÈ´Ó¡°Ô®³¯¡±²éÆ𣬾¹ý½üÁ½¸öСʱµÄµçÄÔ²éѯ£¬ÄϾ©ÊÐÇø¹²²éµ½ÓÐ233λÊÐÃñµÄÃû×ÖÖк¬ÓС°Ô®³¯¡±¡£²é¡°¿¹ÃÀ¡±ÎÒÃDz»¸ÒÔÙ¡°É§ÈÅ¡±ËûÃÇÈç´Ë·ÑÁ¦²éѯ£¬±ã½øÐÐÁ˳éÑù²éѯ£¬½á¹û²éµÃÄϾ©Ãû½Ð¡°ÕÅ¿¹ÃÀ¡±µÄÓÐ6¸ö£¬¡°Íõ¿¹ÃÀ¡±8¸ö£¬¡°ËÃÀ¡±3¸ö£¬¡°ÀÃÀ¡±2¸ö£¬±ÈÆð¡°Ô®³¯¡±£¬¡°¿¹ÃÀ¡±Ò²²»ÔÚÉÙÊý¡£
-<p>
-ÔÚ²éѯ¡°Ô®³¯¡±µÄ¹ý³ÌÖУ¬ÓÉÓÚÊÇûÓÐÉ趨±»²éѯÕßµÄÄêÁäµÄ£¬½á¹û233¸ö¡°Ô®³¯¡±ÖУ¬²¢²»ÊÇÎÒÃÇÏëÏñÖж¼ÊÇ1950ÄêÖÁ1954ÄêÕâ¶Îʱ¼äÄÚ³öÉúµÄ£¬ÓÐЩÈ˵ijöÉúÄê·ÝÊÇ1944Äê¡¢1945Ä꣬¸ÃÊй«°²¾Ö»§Õþ¿ÆµÄͬ־˵£¬ÕâЩÈ˺ܿÉÄÜÊÇÔÚÉÏСѧʱȡµÄÃû»ò¸ÄµÄÃû£¬ÄÇʱÕýÖµ³¯ÏÊÕ½ÕùÆڼ䣬¸¸Ä¸Ëæ×ŵ±Ê±³±Á÷Ò²¸øº¢×ÓÈ¡(¸Ä)ÁËÕâÑùµÄÃû¡£
-<p>
-²éѯ×ÊÁÏÏÔʾ£¬¾ø´ó¶àÊý¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¶¼ÊÇ50Äê´ú³õµÄ¼¸Äê¼ä³öÊÀ¡£»§Õþ¿ÆµÄһλŮͬ־»ØÒä˵£¬ÄÇ»á½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕæÊÇÒ»ÖÖʱ´úµÄ³±Á÷£¬Ëý¼ÇµÃµ±Ê±ÁÚ¾Ó¼ÒÓÐ4¸öСº¢£¬ÒÀ´Î¾Í½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡¢¡°±£¼Ò¡±¡¢¡°ÎÀ¹ú¡±£¬½ÐÒ»±é×Ô¼Òº¢×ÓµÄÃû×Ö£¬Õæ¸öÊÇÓÐÖÖ¡°ÐÛôñôñÆø°º°º¡±µÄ¸Ð¾õÔÚÐļ䡣
-<td>
-</tr>
+<table>
+<tr>
+<td>
+<strong>
+Chinese/GBK
+</strong>
+</td>
+<td>
+<p>
+50ÄêÇ°µÄ½ñÌ죬ÖйúÈËÃñÖ¾Ô¸¾üÐÛôñôñÆø°º°º£¬ÔÚÈýǧÀï½É½ÉÏ¿ªÊ¼¿¹ÃÀÔ®³¯£¬±£¼ÒÎÀ¹ú¡£ÔÚÄǶοɸè¿ÉÆüµÄËêÔÂÖУ¬¶àÉÙÖйúÈËΪǰ·½Ö¾Ô¸¾ü½«Ê¿µÄ¾«ÉñËù¹ÄÎ裬ÔÚ¼ÄÍÐÃÀºÃ×£Ô¸µÄͬʱ£¬Ò²½«¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕâÁ½¸öÃû´ÊƵƵΪ×Ô¼º¸Õ³öÉúµÄ×ÓÅ®ÃüÃû¡£50ÄêÀ´£¬¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÃÇ´ø×ÅÕⳡսÕùµÄÀúÊ·ºÛ¼££¬Ò»¸ö¸öµ½Á˽«½ü°ë°ÙµÄÄêÁ䣬½ñÌ죬ËûÃǹ¤×÷¡¢Éú»îµÃÈçºÎ£¿ÄǶÎÀúÊ·ÔÚ½ñÌìµÄËûÃÇÑÛÀÓÖÊÇÔõÑùÒ»·¬¾°Ï󣿱¾±¨¼ÇÕß×òÌìÏÂÎçÆð·ÖÍ·×·×Ù£¬Ñ°·ÃÄϾ©´ó½ÖСÏïÖеġ°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£
+<p>
+×·×ÙÒÁʼ£¬ÎÒÃÇÊ×ÏȺÍÄϾ©Êй«°²¾ÖµÄ»§Õþ¹ÜÀí²¿ÃÅÈ¡µÃÁËÁªÏµ£¬Ï£ÍûÄÜͨ¹ýËûÃDz鵽ÄϾ©Êе½µ×ÓжàÉÙ¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£ÄϾ©ÊÐÇø250ÍòÈË¿Ú£¬¼ÓÉÏÎåÏس¬¹ý500ÍòÈË¿Ú£¬²éÒ»±éÈËÃûÆÄ·Ñʱ¼ä¡£ËûÃÇ´óÁ¦Ö§³Ö£¬ÔÚ¹¤×÷Öмû·ì²åÕëΪÎÒÃÇ°²ÅÅÁËÉÏ»ú²éѯ£¬ÎÒÃÇÏÈ´Ó¡°Ô®³¯¡±²éÆ𣬾¹ý½üÁ½¸öСʱµÄµçÄÔ²éѯ£¬ÄϾ©ÊÐÇø¹²²éµ½ÓÐ233λÊÐÃñµÄÃû×ÖÖк¬ÓС°Ô®³¯¡±¡£²é¡°¿¹ÃÀ¡±ÎÒÃDz»¸ÒÔÙ¡°É§ÈÅ¡±ËûÃÇÈç´Ë·ÑÁ¦²éѯ£¬±ã½øÐÐÁ˳éÑù²éѯ£¬½á¹û²éµÃÄϾ©Ãû½Ð¡°ÕÅ¿¹ÃÀ¡±µÄÓÐ6¸ö£¬¡°Íõ¿¹ÃÀ¡±8¸ö£¬¡°ËÃÀ¡±3¸ö£¬¡°ÀÃÀ¡±2¸ö£¬±ÈÆð¡°Ô®³¯¡±£¬¡°¿¹ÃÀ¡±Ò²²»ÔÚÉÙÊý¡£
+<p>
+ÔÚ²éѯ¡°Ô®³¯¡±µÄ¹ý³ÌÖУ¬ÓÉÓÚÊÇûÓÐÉ趨±»²éѯÕßµÄÄêÁäµÄ£¬½á¹û233¸ö¡°Ô®³¯¡±ÖУ¬²¢²»ÊÇÎÒÃÇÏëÏñÖж¼ÊÇ1950ÄêÖÁ1954ÄêÕâ¶Îʱ¼äÄÚ³öÉúµÄ£¬ÓÐЩÈ˵ijöÉúÄê·ÝÊÇ1944Äê¡¢1945Ä꣬¸ÃÊй«°²¾Ö»§Õþ¿ÆµÄͬ־˵£¬ÕâЩÈ˺ܿÉÄÜÊÇÔÚÉÏСѧʱȡµÄÃû»ò¸ÄµÄÃû£¬ÄÇʱÕýÖµ³¯ÏÊÕ½ÕùÆڼ䣬¸¸Ä¸Ëæ×ŵ±Ê±³±Á÷Ò²¸øº¢×ÓÈ¡(¸Ä)ÁËÕâÑùµÄÃû¡£
+<p>
+²éѯ×ÊÁÏÏÔʾ£¬¾ø´ó¶àÊý¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¶¼ÊÇ50Äê´ú³õµÄ¼¸Äê¼ä³öÊÀ¡£»§Õþ¿ÆµÄһλŮͬ־»ØÒä˵£¬ÄÇ»á½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕæÊÇÒ»ÖÖʱ´úµÄ³±Á÷£¬Ëý¼ÇµÃµ±Ê±ÁÚ¾Ó¼ÒÓÐ4¸öСº¢£¬ÒÀ´Î¾Í½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡¢¡°±£¼Ò¡±¡¢¡°ÎÀ¹ú¡±£¬½ÐÒ»±é×Ô¼Òº¢×ÓµÄÃû×Ö£¬Õæ¸öÊÇÓÐÖÖ¡°ÐÛôñôñÆø°º°º¡±µÄ¸Ð¾õÔÚÐļ䡣
+<td>
+</tr>
</table>
Modified: jakarta/velocity/core/trunk/test/templates/compare/foreach-null-list.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/foreach-null-list.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/foreach-null-list.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/foreach-null-list.cmp Tue Jun 21 16:22:20 2005
@@ -1,12 +1,12 @@
-
-
-Foreach with a list that contains null.
-
- This is a.
- 1
- This is b.
- 2
- This is $element.
- 3
- This is d.
- 4
+
+
+Foreach with a list that contains null.
+
+ This is a.
+ 1
+ This is b.
+ 2
+ This is $element.
+ 3
+ This is d.
+ 4
Propchange: jakarta/velocity/core/trunk/test/templates/compare/foreach-null-list.cmp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/compare/stop1.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/stop1.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/stop1.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/stop1.cmp Tue Jun 21 16:22:20 2005
@@ -1,2 +1,2 @@
-This page checks the stop directive in the main body
-
+This page checks the stop directive in the main body
+
Propchange: jakarta/velocity/core/trunk/test/templates/compare/stop1.cmp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/compare/stop2.cmp
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/compare/stop2.cmp?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/compare/stop2.cmp (original)
+++ jakarta/velocity/core/trunk/test/templates/compare/stop2.cmp Tue Jun 21 16:22:20 2005
@@ -1,6 +1,6 @@
-This page checks the stop directive inside an if statement
-
-
-this should render
-
-
+This page checks the stop directive inside an if statement
+
+
+this should render
+
+
Propchange: jakarta/velocity/core/trunk/test/templates/compare/stop2.cmp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/curly-directive.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/curly-directive.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/curly-directive.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/curly-directive.vm Tue Jun 21 16:22:20 2005
@@ -1,34 +1,34 @@
-#*
-
-Check to see if directives with curly braces around them parse properly.
-
-*#
-
-#{if} (true)
- this is a test
-#{elseif} (true)
- more text
-#{else}
- this is a test
-#end
-
-## a more realistic example
-#if(true)sometext#{else}more text#{end}and yet more
-
-### others
-#{set} ($a = 3)
-
-#{macro}(mymacro)
- hello
-#{end}
-
-#{mymacro}()
-
-#foreach ($a in [1..3])x#{end}
-
-## Check escaped directives
-
-\#if
-\#else
-\#elseif
-\#set
+#*
+
+Check to see if directives with curly braces around them parse properly.
+
+*#
+
+#{if} (true)
+ this is a test
+#{elseif} (true)
+ more text
+#{else}
+ this is a test
+#end
+
+## a more realistic example
+#if(true)sometext#{else}more text#{end}and yet more
+
+### others
+#{set} ($a = 3)
+
+#{macro}(mymacro)
+ hello
+#{end}
+
+#{mymacro}()
+
+#foreach ($a in [1..3])x#{end}
+
+## Check escaped directives
+
+\#if
+\#else
+\#elseif
+\#set
Propchange: jakarta/velocity/core/trunk/test/templates/curly-directive.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/encodingtest.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/encodingtest.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/encodingtest.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/encodingtest.vm Tue Jun 21 16:22:20 2005
@@ -1,4 +1,4 @@
-Thanks to Kent Johnson for this example and the nudge.
-
-<p>Chinese: ç½ç«ç»å½</p>
-<p>Spanish: niño</p>
+Thanks to Kent Johnson for this example and the nudge.
+
+<p>Chinese: ç½ç«ç»å½</p>
+<p>Spanish: niño</p>
Modified: jakarta/velocity/core/trunk/test/templates/encodingtest3.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/encodingtest3.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/encodingtest3.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/encodingtest3.vm Tue Jun 21 16:22:20 2005
@@ -1,19 +1,19 @@
-<table>
-<tr>
-<td>
-<strong>
-Chinese/GBK
-</strong>
-</td>
-<td>
-<p>
-50ÄêÇ°µÄ½ñÌ죬ÖйúÈËÃñÖ¾Ô¸¾üÐÛôñôñÆø°º°º£¬ÔÚÈýǧÀï½É½ÉÏ¿ªÊ¼¿¹ÃÀÔ®³¯£¬±£¼ÒÎÀ¹ú¡£ÔÚÄǶοɸè¿ÉÆüµÄËêÔÂÖУ¬¶àÉÙÖйúÈËΪǰ·½Ö¾Ô¸¾ü½«Ê¿µÄ¾«ÉñËù¹ÄÎ裬ÔÚ¼ÄÍÐÃÀºÃ×£Ô¸µÄͬʱ£¬Ò²½«¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕâÁ½¸öÃû´ÊƵƵΪ×Ô¼º¸Õ³öÉúµÄ×ÓÅ®ÃüÃû¡£50ÄêÀ´£¬¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÃÇ´ø×ÅÕⳡսÕùµÄÀúÊ·ºÛ¼££¬Ò»¸ö¸öµ½Á˽«½ü°ë°ÙµÄÄêÁ䣬½ñÌ죬ËûÃǹ¤×÷¡¢Éú»îµÃÈçºÎ£¿ÄǶÎÀúÊ·ÔÚ½ñÌìµÄËûÃÇÑÛÀÓÖÊÇÔõÑùÒ»·¬¾°Ï󣿱¾±¨¼ÇÕß×òÌìÏÂÎçÆð·ÖÍ·×·×Ù£¬Ñ°·ÃÄϾ©´ó½ÖСÏïÖеġ°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£
-<p>
-×·×ÙÒÁʼ£¬ÎÒÃÇÊ×ÏȺÍÄϾ©Êй«°²¾ÖµÄ»§Õþ¹ÜÀí²¿ÃÅÈ¡µÃÁËÁªÏµ£¬Ï£ÍûÄÜͨ¹ýËûÃDz鵽ÄϾ©Êе½µ×ÓжàÉÙ¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£ÄϾ©ÊÐÇø250ÍòÈË¿Ú£¬¼ÓÉÏÎåÏس¬¹ý500ÍòÈË¿Ú£¬²éÒ»±éÈËÃûÆÄ·Ñʱ¼ä¡£ËûÃÇ´óÁ¦Ö§³Ö£¬ÔÚ¹¤×÷Öмû·ì²åÕëΪÎÒÃÇ°²ÅÅÁËÉÏ»ú²éѯ£¬ÎÒÃÇÏÈ´Ó¡°Ô®³¯¡±²éÆ𣬾¹ý½üÁ½¸öСʱµÄµçÄÔ²éѯ£¬ÄϾ©ÊÐÇø¹²²éµ½ÓÐ233λÊÐÃñµÄÃû×ÖÖк¬ÓС°Ô®³¯¡±¡£²é¡°¿¹ÃÀ¡±ÎÒÃDz»¸ÒÔÙ¡°É§ÈÅ¡±ËûÃÇÈç´Ë·ÑÁ¦²éѯ£¬±ã½øÐÐÁ˳éÑù²éѯ£¬½á¹û²éµÃÄϾ©Ãû½Ð¡°ÕÅ¿¹ÃÀ¡±µÄÓÐ6¸ö£¬¡°Íõ¿¹ÃÀ¡±8¸ö£¬¡°ËÃÀ¡±3¸ö£¬¡°ÀÃÀ¡±2¸ö£¬±ÈÆð¡°Ô®³¯¡±£¬¡°¿¹ÃÀ¡±Ò²²»ÔÚÉÙÊý¡£
-<p>
-ÔÚ²éѯ¡°Ô®³¯¡±µÄ¹ý³ÌÖУ¬ÓÉÓÚÊÇûÓÐÉ趨±»²éѯÕßµÄÄêÁäµÄ£¬½á¹û233¸ö¡°Ô®³¯¡±ÖУ¬²¢²»ÊÇÎÒÃÇÏëÏñÖж¼ÊÇ1950ÄêÖÁ1954ÄêÕâ¶Îʱ¼äÄÚ³öÉúµÄ£¬ÓÐЩÈ˵ijöÉúÄê·ÝÊÇ1944Äê¡¢1945Ä꣬¸ÃÊй«°²¾Ö»§Õþ¿ÆµÄͬ־˵£¬ÕâЩÈ˺ܿÉÄÜÊÇÔÚÉÏСѧʱȡµÄÃû»ò¸ÄµÄÃû£¬ÄÇʱÕýÖµ³¯ÏÊÕ½ÕùÆڼ䣬¸¸Ä¸Ëæ×ŵ±Ê±³±Á÷Ò²¸øº¢×ÓÈ¡(¸Ä)ÁËÕâÑùµÄÃû¡£
-<p>
-²éѯ×ÊÁÏÏÔʾ£¬¾ø´ó¶àÊý¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¶¼ÊÇ50Äê´ú³õµÄ¼¸Äê¼ä³öÊÀ¡£»§Õþ¿ÆµÄһλŮͬ־»ØÒä˵£¬ÄÇ»á½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕæÊÇÒ»ÖÖʱ´úµÄ³±Á÷£¬Ëý¼ÇµÃµ±Ê±ÁÚ¾Ó¼ÒÓÐ4¸öСº¢£¬ÒÀ´Î¾Í½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡¢¡°±£¼Ò¡±¡¢¡°ÎÀ¹ú¡±£¬½ÐÒ»±é×Ô¼Òº¢×ÓµÄÃû×Ö£¬Õæ¸öÊÇÓÐÖÖ¡°ÐÛôñôñÆø°º°º¡±µÄ¸Ð¾õÔÚÐļ䡣
-<td>
-</tr>
+<table>
+<tr>
+<td>
+<strong>
+Chinese/GBK
+</strong>
+</td>
+<td>
+<p>
+50ÄêÇ°µÄ½ñÌ죬ÖйúÈËÃñÖ¾Ô¸¾üÐÛôñôñÆø°º°º£¬ÔÚÈýǧÀï½É½ÉÏ¿ªÊ¼¿¹ÃÀÔ®³¯£¬±£¼ÒÎÀ¹ú¡£ÔÚÄǶοɸè¿ÉÆüµÄËêÔÂÖУ¬¶àÉÙÖйúÈËΪǰ·½Ö¾Ô¸¾ü½«Ê¿µÄ¾«ÉñËù¹ÄÎ裬ÔÚ¼ÄÍÐÃÀºÃ×£Ô¸µÄͬʱ£¬Ò²½«¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕâÁ½¸öÃû´ÊƵƵΪ×Ô¼º¸Õ³öÉúµÄ×ÓÅ®ÃüÃû¡£50ÄêÀ´£¬¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÃÇ´ø×ÅÕⳡսÕùµÄÀúÊ·ºÛ¼££¬Ò»¸ö¸öµ½Á˽«½ü°ë°ÙµÄÄêÁ䣬½ñÌ죬ËûÃǹ¤×÷¡¢Éú»îµÃÈçºÎ£¿ÄǶÎÀúÊ·ÔÚ½ñÌìµÄËûÃÇÑÛÀÓÖÊÇÔõÑùÒ»·¬¾°Ï󣿱¾±¨¼ÇÕß×òÌìÏÂÎçÆð·ÖÍ·×·×Ù£¬Ñ°·ÃÄϾ©´ó½ÖСÏïÖеġ°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£
+<p>
+×·×ÙÒÁʼ£¬ÎÒÃÇÊ×ÏȺÍÄϾ©Êй«°²¾ÖµÄ»§Õþ¹ÜÀí²¿ÃÅÈ¡µÃÁËÁªÏµ£¬Ï£ÍûÄÜͨ¹ýËûÃDz鵽ÄϾ©Êе½µ×ÓжàÉÙ¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡£ÄϾ©ÊÐÇø250ÍòÈË¿Ú£¬¼ÓÉÏÎåÏس¬¹ý500ÍòÈË¿Ú£¬²éÒ»±éÈËÃûÆÄ·Ñʱ¼ä¡£ËûÃÇ´óÁ¦Ö§³Ö£¬ÔÚ¹¤×÷Öмû·ì²åÕëΪÎÒÃÇ°²ÅÅÁËÉÏ»ú²éѯ£¬ÎÒÃÇÏÈ´Ó¡°Ô®³¯¡±²éÆ𣬾¹ý½üÁ½¸öСʱµÄµçÄÔ²éѯ£¬ÄϾ©ÊÐÇø¹²²éµ½ÓÐ233λÊÐÃñµÄÃû×ÖÖк¬ÓС°Ô®³¯¡±¡£²é¡°¿¹ÃÀ¡±ÎÒÃDz»¸ÒÔÙ¡°É§ÈÅ¡±ËûÃÇÈç´Ë·ÑÁ¦²éѯ£¬±ã½øÐÐÁ˳éÑù²éѯ£¬½á¹û²éµÃÄϾ©Ãû½Ð¡°ÕÅ¿¹ÃÀ¡±µÄÓÐ6¸ö£¬¡°Íõ¿¹ÃÀ¡±8¸ö£¬¡°ËÃÀ¡±3¸ö£¬¡°ÀÃÀ¡±2¸ö£¬±ÈÆð¡°Ô®³¯¡±£¬¡°¿¹ÃÀ¡±Ò²²»ÔÚÉÙÊý¡£
+<p>
+ÔÚ²éѯ¡°Ô®³¯¡±µÄ¹ý³ÌÖУ¬ÓÉÓÚÊÇûÓÐÉ趨±»²éѯÕßµÄÄêÁäµÄ£¬½á¹û233¸ö¡°Ô®³¯¡±ÖУ¬²¢²»ÊÇÎÒÃÇÏëÏñÖж¼ÊÇ1950ÄêÖÁ1954ÄêÕâ¶Îʱ¼äÄÚ³öÉúµÄ£¬ÓÐЩÈ˵ijöÉúÄê·ÝÊÇ1944Äê¡¢1945Ä꣬¸ÃÊй«°²¾Ö»§Õþ¿ÆµÄͬ־˵£¬ÕâЩÈ˺ܿÉÄÜÊÇÔÚÉÏСѧʱȡµÄÃû»ò¸ÄµÄÃû£¬ÄÇʱÕýÖµ³¯ÏÊÕ½ÕùÆڼ䣬¸¸Ä¸Ëæ×ŵ±Ê±³±Á÷Ò²¸øº¢×ÓÈ¡(¸Ä)ÁËÕâÑùµÄÃû¡£
+<p>
+²éѯ×ÊÁÏÏÔʾ£¬¾ø´ó¶àÊý¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¶¼ÊÇ50Äê´ú³õµÄ¼¸Äê¼ä³öÊÀ¡£»§Õþ¿ÆµÄһλŮͬ־»ØÒä˵£¬ÄÇ»á½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±ÕæÊÇÒ»ÖÖʱ´úµÄ³±Á÷£¬Ëý¼ÇµÃµ±Ê±ÁÚ¾Ó¼ÒÓÐ4¸öСº¢£¬ÒÀ´Î¾Í½Ð¡°¿¹ÃÀ¡±¡¢¡°Ô®³¯¡±¡¢¡°±£¼Ò¡±¡¢¡°ÎÀ¹ú¡±£¬½ÐÒ»±é×Ô¼Òº¢×ÓµÄÃû×Ö£¬Õæ¸öÊÇÓÐÖÖ¡°ÐÛôñôñÆø°º°º¡±µÄ¸Ð¾õÔÚÐļ䡣
+<td>
+</tr>
</table>
Modified: jakarta/velocity/core/trunk/test/templates/foreach-null-list.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/foreach-null-list.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/foreach-null-list.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/foreach-null-list.vm Tue Jun 21 16:22:20 2005
@@ -1,17 +1,17 @@
-#*
-
-@test foreach-null-list.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.
-
-*#
-
-Foreach with a list that contains null.
-
-#foreach ($element in $nullList)
- This is $element.
- $velocityCount
-#end
+#*
+
+@test foreach-null-list.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.
+
+*#
+
+Foreach with a list that contains null.
+
+#foreach ($element in $nullList)
+ This is $element.
+ $velocityCount
+#end
Propchange: jakarta/velocity/core/trunk/test/templates/foreach-null-list.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/stop1.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/stop1.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/stop1.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/stop1.vm Tue Jun 21 16:22:20 2005
@@ -1,19 +1,19 @@
-This page checks the stop directive in the main body
-
-#stop
-
-this should not render
-
-check reference
-#set($a = 10)
-$a
-
-check method call
-$a.toString()
-
-check escaped directive
-\#if
-
-check escaped reference
-\$a
-
+This page checks the stop directive in the main body
+
+#stop
+
+this should not render
+
+check reference
+#set($a = 10)
+$a
+
+check method call
+$a.toString()
+
+check escaped directive
+\#if
+
+check escaped reference
+\$a
+
Propchange: jakarta/velocity/core/trunk/test/templates/stop1.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/test/templates/stop2.vm
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/templates/stop2.vm?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/templates/stop2.vm (original)
+++ jakarta/velocity/core/trunk/test/templates/stop2.vm Tue Jun 21 16:22:20 2005
@@ -1,31 +1,31 @@
-This page checks the stop directive inside an if statement
-
-#if(false)
-
- #stop
-
-#end
-
-this should render
-
-#if(true)
-
-#stop
-
-#end
-
-this should not render
-
-check reference
-#set($a = 10)
-$a
-
-check method call
-$a.toString()
-
-check escaped directive
-\#if
-
-check escaped reference
-\$a
-
+This page checks the stop directive inside an if statement
+
+#if(false)
+
+ #stop
+
+#end
+
+this should render
+
+#if(true)
+
+#stop
+
+#end
+
+this should not render
+
+check reference
+#set($a = 10)
+$a
+
+check method call
+$a.toString()
+
+check escaped directive
+\#if
+
+check escaped reference
+\$a
+
Propchange: jakarta/velocity/core/trunk/test/templates/stop2.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/velocity/core/trunk/whiteboard/daveb/ContextTool.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/daveb/ContextTool.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/daveb/ContextTool.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/daveb/ContextTool.java Tue Jun 21 16:22:20 2005
@@ -20,7 +20,7 @@
/**
*
* @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
- * @version $Id: ContextTool.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public abstract class ContextTool implements Serializable
{
Modified: jakarta/velocity/core/trunk/whiteboard/daveb/ContextWithTools.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/daveb/ContextWithTools.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/daveb/ContextWithTools.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/daveb/ContextWithTools.java Tue Jun 21 16:22:20 2005
@@ -25,7 +25,7 @@
* Just a demo context that loads it's own tools.
*
* @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
- * @version $Id: ContextWithTools.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class ContextWithTools extends AbstractContext
{
Modified: jakarta/velocity/core/trunk/whiteboard/daveb/dajarred/Example.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/daveb/dajarred/Example.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/daveb/dajarred/Example.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/daveb/dajarred/Example.java Tue Jun 21 16:22:20 2005
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Example.java,v 1.5 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class Example
Modified: jakarta/velocity/core/trunk/whiteboard/geir/InstanceExample.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/geir/InstanceExample.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/geir/InstanceExample.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/geir/InstanceExample.java Tue Jun 21 16:22:20 2005
@@ -27,7 +27,7 @@
* of the Velocity engine.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: InstanceExample.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class InstanceExample
Modified: jakarta/velocity/core/trunk/whiteboard/geir/Local.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/geir/Local.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/geir/Local.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/geir/Local.java Tue Jun 21 16:22:20 2005
@@ -42,7 +42,7 @@
* Assumes that you can #set() the value of any reference in the list
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Local.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class Local extends Directive
{
Modified: jakarta/velocity/core/trunk/whiteboard/geir/URLResourceLoader.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/whiteboard/geir/URLResourceLoader.java?rev=191743&r1=191742&r2=191743&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/whiteboard/geir/URLResourceLoader.java (original)
+++ jakarta/velocity/core/trunk/whiteboard/geir/URLResourceLoader.java Tue Jun 21 16:22:20 2005
@@ -31,7 +31,7 @@
* This is a simple URL-based loader.
*
* @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
- * @version $Id: URLResourceLoader.java,v 1.3 2004/03/19 17:13:40 dlr Exp $
+ * @version $Id$
*/
public class URLResourceLoader extends ResourceLoader
{
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org