Author: sdumitriu
Date: Sun Mar 1 05:45:34 2015
New Revision: 1663025
URL: http://svn.apache.org/r1663025
Log:
Use the native endline instead of the hardcoded Windows one
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/resources/absolute/compare/absolute.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/evaluate/compare/eval1.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test1.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test2.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test3.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test4.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test5.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-580/compare/velocity580.vm.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/parseexception/badtemplate.vm
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/include/include1.vm
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/testincludeparse.vm
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/comment-eof.vm
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/comment-eof.cmp
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/stop3.cmp
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
Sun Mar 1 05:45:34 2015
@@ -1,78 +1,78 @@
-package org.apache.velocity.runtime;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.util.SimplePool;
-import org.apache.velocity.runtime.parser.CharStream;
-
-/**
- * This wraps the original parser SimplePool class. It also handles
- * instantiating ad-hoc parsers if none are available.
- *
- * @author <a href="mailto:[email protected]";>Serge Knystautas</a>
- * @version $Id: RuntimeInstance.java 384374 2006-03-08 23:19:30Z nbubna $
- * @since 1.5
- */
-public class ParserPoolImpl implements ParserPool {
-
- SimplePool pool = null;
- int max = RuntimeConstants.NUMBER_OF_PARSERS;
-
- /**
- * Create the underlying "pool".
- * @param rsvc
- */
- public void initialize(RuntimeServices rsvc)
- {
- max = rsvc.getInt(RuntimeConstants.PARSER_POOL_SIZE,
RuntimeConstants.NUMBER_OF_PARSERS);
- pool = new SimplePool(max);
-
- for (int i = 0; i < max; i++)
- {
- pool.put(rsvc.createNewParser());
- }
-
- if (rsvc.getLog().isDebugEnabled())
- {
- rsvc.getLog().debug("Created '" + max + "' parsers.");
- }
- }
-
- /**
- * Call the wrapped pool. If none are available, it will create a new
- * temporary one.
- * @return A parser Object.
- */
- public Parser get()
- {
- return (Parser) pool.get();
- }
-
- /**
- * Call the wrapped pool.
- * @param parser
- */
- public void put(Parser parser)
- {
- parser.ReInit((CharStream) null);
- pool.put(parser);
- }
-}
+package org.apache.velocity.runtime;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.velocity.runtime.parser.Parser;
+import org.apache.velocity.util.SimplePool;
+import org.apache.velocity.runtime.parser.CharStream;
+
+/**
+ * This wraps the original parser SimplePool class. It also handles
+ * instantiating ad-hoc parsers if none are available.
+ *
+ * @author <a href="mailto:[email protected]";>Serge Knystautas</a>
+ * @version $Id: RuntimeInstance.java 384374 2006-03-08 23:19:30Z nbubna $
+ * @since 1.5
+ */
+public class ParserPoolImpl implements ParserPool {
+
+ SimplePool pool = null;
+ int max = RuntimeConstants.NUMBER_OF_PARSERS;
+
+ /**
+ * Create the underlying "pool".
+ * @param rsvc
+ */
+ public void initialize(RuntimeServices rsvc)
+ {
+ max = rsvc.getInt(RuntimeConstants.PARSER_POOL_SIZE,
RuntimeConstants.NUMBER_OF_PARSERS);
+ pool = new SimplePool(max);
+
+ for (int i = 0; i < max; i++)
+ {
+ pool.put(rsvc.createNewParser());
+ }
+
+ if (rsvc.getLog().isDebugEnabled())
+ {
+ rsvc.getLog().debug("Created '" + max + "' parsers.");
+ }
+ }
+
+ /**
+ * Call the wrapped pool. If none are available, it will create a new
+ * temporary one.
+ * @return A parser Object.
+ */
+ public Parser get()
+ {
+ return (Parser) pool.get();
+ }
+
+ /**
+ * Call the wrapped pool.
+ * @param parser
+ */
+ public void put(Parser parser)
+ {
+ parser.ReInit((CharStream) null);
+ pool.put(parser);
+ }
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/ForeachScope.java
Sun Mar 1 05:45:34 2015
@@ -1,79 +1,79 @@
-package org.apache.velocity.runtime.directive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-/**
- * This represents scoping and metadata for #foreach,
- * adding index, count, hasNext, isFirst and isLast info.
- *
- * @author Nathan Bubna
- * @version $Id$
- */
-public class ForeachScope extends Scope
-{
- protected int index = -1;
- protected boolean hasNext = false;
-
- public ForeachScope(Object owner, Object replaces)
- {
- super(owner, replaces);
- }
-
- public int getIndex()
- {
- return index;
- }
-
- public int getCount()
- {
- return index + 1;
- }
-
- public boolean hasNext()
- {
- return getHasNext();
- }
-
- public boolean getHasNext()
- {
- return hasNext;
- }
-
- public boolean isFirst()
- {
- return index < 1;
- }
-
- public boolean getFirst()
- {
- return isFirst();
- }
-
- public boolean isLast()
- {
- return !hasNext;
- }
-
- public boolean getLast()
- {
- return isLast();
- }
-
-}
+package org.apache.velocity.runtime.directive;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * This represents scoping and metadata for #foreach,
+ * adding index, count, hasNext, isFirst and isLast info.
+ *
+ * @author Nathan Bubna
+ * @version $Id$
+ */
+public class ForeachScope extends Scope
+{
+ protected int index = -1;
+ protected boolean hasNext = false;
+
+ public ForeachScope(Object owner, Object replaces)
+ {
+ super(owner, replaces);
+ }
+
+ public int getIndex()
+ {
+ return index;
+ }
+
+ public int getCount()
+ {
+ return index + 1;
+ }
+
+ public boolean hasNext()
+ {
+ return getHasNext();
+ }
+
+ public boolean getHasNext()
+ {
+ return hasNext;
+ }
+
+ public boolean isFirst()
+ {
+ return index < 1;
+ }
+
+ public boolean getFirst()
+ {
+ return isFirst();
+ }
+
+ public boolean isLast()
+ {
+ return !hasNext;
+ }
+
+ public boolean getLast()
+ {
+ return isLast();
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Scope.java
Sun Mar 1 05:45:34 2015
@@ -1,298 +1,298 @@
-package org.apache.velocity.runtime.directive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import org.apache.velocity.Template;
-
-/**
- * This handles context scoping and metadata for directives.
- *
- * @author Nathan Bubna
- * @version $Id$
- */
-public class Scope extends AbstractMap
-{
- private static final String setReturnValue = "";
- private Map storage;
- private Object replaced;
- private Scope parent;
- private Info info;
- protected final Object owner;
-
- public Scope(Object owner, Object previous)
- {
- this.owner = owner;
- if (previous != null)
- {
- try
- {
- this.parent = (Scope)previous;
- }
- catch (ClassCastException cce)
- {
- this.replaced = previous;
- }
- }
- }
-
- private Map getStorage()
- {
- if (storage == null)
- {
- storage = new HashMap();
- }
- return storage;
- }
-
- public Set entrySet()
- {
- return getStorage().entrySet();
- }
-
- @Override
- public Object get(Object key)
- {
- Object o = super.get(key);
- if (o == null && parent != null && !containsKey(key))
- {
- return parent.get(key);
- }
- return o;
- }
-
- @Override
- public Object put(Object key, Object value)
- {
- return getStorage().put(key, value);
- }
-
- /**
- * Convenience method to call put(key,val) in a template
- * without worrying about what is returned/rendered by the call.
- * This should ALWAYS return an empty string.
- */
- public String set(Object key, Object value)
- {
- put(key, value);
- return setReturnValue;
- }
-
- /**
- * Allows #stop to easily trigger the proper StopCommand for this scope.
- */
- protected void stop()
- {
- throw new StopCommand(owner);
- }
-
- /**
- * Returns the number of control arguments of this type
- * that are stacked up. This is the distance between this
- * instance and the topmost instance, plus one. This value
- * will never be negative or zero.
- */
- protected int getDepth()
- {
- if (parent == null)
- {
- return 1;
- }
- return parent.getDepth() + 1;
- }
-
- /**
- * Returns the topmost parent control reference, retrieved
- * by simple recursion on {@link #getParent}.
- */
- public Scope getTopmost()
- {
- if (parent == null)
- {
- return this;
- }
- return parent.getTopmost();
- }
-
- /**
- * Returns the parent control reference overridden by the placement
- * of this instance in the context.
- */
- public Scope getParent()
- {
- return parent;
- }
-
- /**
- * Returns the user's context reference overridden by the placement
- * of this instance in the context. If there was none (as is hoped),
- * then this will return null. This never returns parent controls;
- * those are returned by {@link #getParent}.
- */
- public Object getReplaced()
- {
- if (replaced == null && parent != null)
- {
- return parent.getReplaced();
- }
- return replaced;
- }
-
- /**
- * Returns info about the current scope for debugging purposes.
- */
- public Info getInfo()
- {
- if (info == null)
- {
- info = new Info(this, owner);
- }
- return info;
- }
-
- /**
- * Class to encapsulate and provide access to info about
- * the current scope for debugging.
- */
- public static class Info
- {
- private Scope scope;
- private Directive directive;
- private Template template;
-
- public Info(Scope scope, Object owner)
- {
- if (owner instanceof Directive)
- {
- directive = (Directive)owner;
- }
- if (owner instanceof Template)
- {
- template = (Template)owner;
- }
- this.scope = scope;
- }
-
- public String getName()
- {
- if (directive != null)
- {
- return directive.getName();
- }
- if (template != null)
- {
- return template.getName();
- }
- return null;
- }
-
- public String getType()
- {
- if (directive != null)
- {
- switch (directive.getType())
- {
- case Directive.BLOCK:
- return "block";
- case Directive.LINE:
- return "line";
- }
- }
- if (template != null)
- {
- return template.getEncoding();
- }
- return null;
- }
-
- public int getDepth()
- {
- return scope.getDepth();
- }
-
- public String getTemplate()
- {
- if (directive != null)
- {
- return directive.getTemplateName();
- }
- if (template != null)
- {
- return template.getName();
- }
- return null;
- }
-
- public int getLine()
- {
- if (directive != null)
- {
- return directive.getLine();
- }
- return 0;
- }
-
- public int getColumn()
- {
- if (directive != null)
- {
- return directive.getColumn();
- }
- return 0;
- }
-
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
- if (directive != null)
- {
- sb.append('#');
- }
- sb.append(getName());
- sb.append("[type:").append(getType());
- int depth = getDepth();
- if (depth > 1)
- {
- sb.append(" depth:").append(depth);
- }
- if (template == null)
- {
- String vtl = getTemplate();
- sb.append(" template:");
- if (vtl.indexOf(" ") < 0)
- {
- sb.append(vtl);
- }
- else
- {
- sb.append('"').append(vtl).append('"');
- }
- sb.append(" line:").append(getLine());
- sb.append(" column:").append(getColumn());
- }
- sb.append(']');
- return sb.toString();
- }
- }
-
-}
+package org.apache.velocity.runtime.directive;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import org.apache.velocity.Template;
+
+/**
+ * This handles context scoping and metadata for directives.
+ *
+ * @author Nathan Bubna
+ * @version $Id$
+ */
+public class Scope extends AbstractMap
+{
+ private static final String setReturnValue = "";
+ private Map storage;
+ private Object replaced;
+ private Scope parent;
+ private Info info;
+ protected final Object owner;
+
+ public Scope(Object owner, Object previous)
+ {
+ this.owner = owner;
+ if (previous != null)
+ {
+ try
+ {
+ this.parent = (Scope)previous;
+ }
+ catch (ClassCastException cce)
+ {
+ this.replaced = previous;
+ }
+ }
+ }
+
+ private Map getStorage()
+ {
+ if (storage == null)
+ {
+ storage = new HashMap();
+ }
+ return storage;
+ }
+
+ public Set entrySet()
+ {
+ return getStorage().entrySet();
+ }
+
+ @Override
+ public Object get(Object key)
+ {
+ Object o = super.get(key);
+ if (o == null && parent != null && !containsKey(key))
+ {
+ return parent.get(key);
+ }
+ return o;
+ }
+
+ @Override
+ public Object put(Object key, Object value)
+ {
+ return getStorage().put(key, value);
+ }
+
+ /**
+ * Convenience method to call put(key,val) in a template
+ * without worrying about what is returned/rendered by the call.
+ * This should ALWAYS return an empty string.
+ */
+ public String set(Object key, Object value)
+ {
+ put(key, value);
+ return setReturnValue;
+ }
+
+ /**
+ * Allows #stop to easily trigger the proper StopCommand for this scope.
+ */
+ protected void stop()
+ {
+ throw new StopCommand(owner);
+ }
+
+ /**
+ * Returns the number of control arguments of this type
+ * that are stacked up. This is the distance between this
+ * instance and the topmost instance, plus one. This value
+ * will never be negative or zero.
+ */
+ protected int getDepth()
+ {
+ if (parent == null)
+ {
+ return 1;
+ }
+ return parent.getDepth() + 1;
+ }
+
+ /**
+ * Returns the topmost parent control reference, retrieved
+ * by simple recursion on {@link #getParent}.
+ */
+ public Scope getTopmost()
+ {
+ if (parent == null)
+ {
+ return this;
+ }
+ return parent.getTopmost();
+ }
+
+ /**
+ * Returns the parent control reference overridden by the placement
+ * of this instance in the context.
+ */
+ public Scope getParent()
+ {
+ return parent;
+ }
+
+ /**
+ * Returns the user's context reference overridden by the placement
+ * of this instance in the context. If there was none (as is hoped),
+ * then this will return null. This never returns parent controls;
+ * those are returned by {@link #getParent}.
+ */
+ public Object getReplaced()
+ {
+ if (replaced == null && parent != null)
+ {
+ return parent.getReplaced();
+ }
+ return replaced;
+ }
+
+ /**
+ * Returns info about the current scope for debugging purposes.
+ */
+ public Info getInfo()
+ {
+ if (info == null)
+ {
+ info = new Info(this, owner);
+ }
+ return info;
+ }
+
+ /**
+ * Class to encapsulate and provide access to info about
+ * the current scope for debugging.
+ */
+ public static class Info
+ {
+ private Scope scope;
+ private Directive directive;
+ private Template template;
+
+ public Info(Scope scope, Object owner)
+ {
+ if (owner instanceof Directive)
+ {
+ directive = (Directive)owner;
+ }
+ if (owner instanceof Template)
+ {
+ template = (Template)owner;
+ }
+ this.scope = scope;
+ }
+
+ public String getName()
+ {
+ if (directive != null)
+ {
+ return directive.getName();
+ }
+ if (template != null)
+ {
+ return template.getName();
+ }
+ return null;
+ }
+
+ public String getType()
+ {
+ if (directive != null)
+ {
+ switch (directive.getType())
+ {
+ case Directive.BLOCK:
+ return "block";
+ case Directive.LINE:
+ return "line";
+ }
+ }
+ if (template != null)
+ {
+ return template.getEncoding();
+ }
+ return null;
+ }
+
+ public int getDepth()
+ {
+ return scope.getDepth();
+ }
+
+ public String getTemplate()
+ {
+ if (directive != null)
+ {
+ return directive.getTemplateName();
+ }
+ if (template != null)
+ {
+ return template.getName();
+ }
+ return null;
+ }
+
+ public int getLine()
+ {
+ if (directive != null)
+ {
+ return directive.getLine();
+ }
+ return 0;
+ }
+
+ public int getColumn()
+ {
+ if (directive != null)
+ {
+ return directive.getColumn();
+ }
+ return 0;
+ }
+
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+ if (directive != null)
+ {
+ sb.append('#');
+ }
+ sb.append(getName());
+ sb.append("[type:").append(getType());
+ int depth = getDepth();
+ if (depth > 1)
+ {
+ sb.append(" depth:").append(depth);
+ }
+ if (template == null)
+ {
+ String vtl = getTemplate();
+ sb.append(" template:");
+ if (vtl.indexOf(" ") < 0)
+ {
+ sb.append(vtl);
+ }
+ else
+ {
+ sb.append('"').append(vtl).append('"');
+ }
+ sb.append(" line:").append(getLine());
+ sb.append(" column:").append(getColumn());
+ }
+ sb.append(']');
+ return sb.toString();
+ }
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/StopCommand.java
Sun Mar 1 05:45:34 2015
@@ -1,88 +1,88 @@
-package org.apache.velocity.runtime.directive;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.velocity.Template;
-import org.apache.velocity.runtime.RuntimeInstance;
-
-/**
- * Stop command for directive Control objects. In an ideal JDK,
- * this would be able to extend a RuntimeThrowable class, but we
- * don't have that. So to avoid the interface changes needed by
- * extending Throwable and the potential errant catches were we
- * to extend RuntimeException, we'll have to extend Error,
- * despite the fact that this is never an error.
- *
- * @author Nathan Bubna
- * @version $Id$
- */
-public class StopCommand extends Error
-{
- private static final long serialVersionUID = 2577683435802825964L;
- private Object stopMe;
- private boolean nearest = false;
-
- public StopCommand()
- {
- this.nearest = true;
- }
-
- public StopCommand(String message)
- {
- super(message);
- }
-
- public StopCommand(Object stopMe)
- {
- this.stopMe = stopMe;
- }
-
- public String getMessage()
- {
- if (stopMe != null)
- {
- // only create a useful message if requested (which is unlikely)
- return "StopCommand: "+stopMe;
- }
- else
- {
- return "StopCommand: "+super.getMessage();
- }
- }
-
- public boolean isFor(Object that)
- {
- if (nearest) // if we're stopping at the first chance
- {
- // save that for message
- stopMe = that;
- return true;
- }
- else if (stopMe != null) // if we have a specified stopping point
- {
- return (that == stopMe);
- }
- else // only stop for the top :)
- {
- return (that instanceof Template ||
- that instanceof RuntimeInstance);
- }
- }
-}
+package org.apache.velocity.runtime.directive;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.velocity.Template;
+import org.apache.velocity.runtime.RuntimeInstance;
+
+/**
+ * Stop command for directive Control objects. In an ideal JDK,
+ * this would be able to extend a RuntimeThrowable class, but we
+ * don't have that. So to avoid the interface changes needed by
+ * extending Throwable and the potential errant catches were we
+ * to extend RuntimeException, we'll have to extend Error,
+ * despite the fact that this is never an error.
+ *
+ * @author Nathan Bubna
+ * @version $Id$
+ */
+public class StopCommand extends Error
+{
+ private static final long serialVersionUID = 2577683435802825964L;
+ private Object stopMe;
+ private boolean nearest = false;
+
+ public StopCommand()
+ {
+ this.nearest = true;
+ }
+
+ public StopCommand(String message)
+ {
+ super(message);
+ }
+
+ public StopCommand(Object stopMe)
+ {
+ this.stopMe = stopMe;
+ }
+
+ public String getMessage()
+ {
+ if (stopMe != null)
+ {
+ // only create a useful message if requested (which is unlikely)
+ return "StopCommand: "+stopMe;
+ }
+ else
+ {
+ return "StopCommand: "+super.getMessage();
+ }
+ }
+
+ public boolean isFor(Object that)
+ {
+ if (nearest) // if we're stopping at the first chance
+ {
+ // save that for message
+ stopMe = that;
+ return true;
+ }
+ else if (stopMe != null) // if we have a specified stopping point
+ {
+ return (that == stopMe);
+ }
+ else // only stop for the top :)
+ {
+ return (that instanceof Template ||
+ that instanceof RuntimeInstance);
+ }
+ }
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java
Sun Mar 1 05:45:34 2015
@@ -1,70 +1,70 @@
-package org.apache.velocity.test.issues;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.velocity.test.BaseTestCase;
-
-/**
- * This class tests VELOCITY-701.
- */
-public class Velocity701TestCase extends BaseTestCase
-{
- public Velocity701TestCase(String name)
- {
- super(name);
- //DEBUG = true;
- }
-
- public void testAbstractClass()
- {
- context.put("foo", new Foo() {
- public String getBar() {
- return "bar";
- }
- });
- assertEvalEquals("bar", "$foo.bar");
- }
-
- public static abstract class Foo {
-
- public abstract String getBar();
-
- }
-
- public void testEnum()
- {
- context.put("bar", Bar.ONE);
- assertEvalEquals("foo", "$bar.foo");
- }
-
- public static enum Bar {
-
- ONE(){
- public String getFoo() {
- return "foo";
- }
- };
-
- //This was an abstract method, but Velocity 1.6 quit working with it.
- public abstract String getFoo();
-
- }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-701.
+ */
+public class Velocity701TestCase extends BaseTestCase
+{
+ public Velocity701TestCase(String name)
+ {
+ super(name);
+ //DEBUG = true;
+ }
+
+ public void testAbstractClass()
+ {
+ context.put("foo", new Foo() {
+ public String getBar() {
+ return "bar";
+ }
+ });
+ assertEvalEquals("bar", "$foo.bar");
+ }
+
+ public static abstract class Foo {
+
+ public abstract String getBar();
+
+ }
+
+ public void testEnum()
+ {
+ context.put("bar", Bar.ONE);
+ assertEvalEquals("foo", "$bar.foo");
+ }
+
+ public static enum Bar {
+
+ ONE(){
+ public String getFoo() {
+ return "foo";
+ }
+ };
+
+ //This was an abstract method, but Velocity 1.6 quit working with it.
+ public abstract String getFoo();
+
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java
Sun Mar 1 05:45:34 2015
@@ -1,63 +1,63 @@
-package org.apache.velocity.test.issues;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.text.NumberFormat;
-import org.apache.velocity.test.BaseTestCase;
-
-/**
- * This class tests VELOCITY-753.
- */
-public class Velocity753TestCase extends BaseTestCase
-{
- public Velocity753TestCase(String name)
- {
- super(name);
- }
-
- public void testFloatArg() throws Exception
- {
- // verify precedence outside of Velocity
- Tool tool = new Tool();
- Float f = new Float(5.23);
- assertEquals("object", tool.test(f));
-
- context.put("tool", tool);
- context.put("float", f);
-
- String template = "$tool.test($float)";
- // in reflection-land, Float and float are equivalent, so double is
selected
- assertEvalEquals("double", template);
- }
-
- public static class Tool
- {
- public String test(double d)
- {
- return "double";
- }
-
- public String test(Object o)
- {
- return "object";
- }
- }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.text.NumberFormat;
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-753.
+ */
+public class Velocity753TestCase extends BaseTestCase
+{
+ public Velocity753TestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testFloatArg() throws Exception
+ {
+ // verify precedence outside of Velocity
+ Tool tool = new Tool();
+ Float f = new Float(5.23);
+ assertEquals("object", tool.test(f));
+
+ context.put("tool", tool);
+ context.put("float", f);
+
+ String template = "$tool.test($float)";
+ // in reflection-land, Float and float are equivalent, so double is
selected
+ assertEvalEquals("double", template);
+ }
+
+ public static class Tool
+ {
+ public String test(double d)
+ {
+ return "double";
+ }
+
+ public String test(Object o)
+ {
+ return "object";
+ }
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity755TestCase.java
Sun Mar 1 05:45:34 2015
@@ -1,41 +1,41 @@
-package org.apache.velocity.test.issues;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.velocity.test.BaseTestCase;
-
-/**
- * This class tests VELOCITY-755.
- */
-public class Velocity755TestCase extends BaseTestCase
-{
- public Velocity755TestCase(String name)
- {
- super(name);
- }
-
- public void testMapOrder()
- {
- String template = "#set( $map = {'a': 1, 'b': true, 'c': 3, 'd':
false, 'e': 5} )"+
- "#foreach( $i in $map )$i#end";
- assertEvalEquals("1true3false5", template);
- }
-
-}
+package org.apache.velocity.test.issues;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-755.
+ */
+public class Velocity755TestCase extends BaseTestCase
+{
+ public Velocity755TestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testMapOrder()
+ {
+ String template = "#set( $map = {'a': 1, 'b': true, 'c': 3, 'd':
false, 'e': 5} )"+
+ "#foreach( $i in $map )$i#end";
+ assertEvalEquals("1true3false5", template);
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/absolute/compare/absolute.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/absolute/compare/absolute.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/absolute/compare/absolute.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/absolute/compare/absolute.cmp
Sun Mar 1 05:45:34 2015
@@ -1,3 +1,3 @@
-
-
-I am absolute.vm
+
+
+I am absolute.vm
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/evaluate/compare/eval1.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/evaluate/compare/eval1.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/evaluate/compare/eval1.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/evaluate/compare/eval1.cmp
Sun Mar 1 05:45:34 2015
@@ -1,8 +1,8 @@
-
-basic string
-
-embedded reference zz
-zz
-
-reference zz changes to xx
-test1: xx
+
+basic string
+
+embedded reference zz
+zz
+
+reference zz changes to xx
+test1: xx
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test1.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test1.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test1.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test1.cmp
Sun Mar 1 05:45:34 2015
@@ -1,3 +1,3 @@
-Test File 1
-include file a
+Test File 1
+include file a
parse file a
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test2.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test2.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test2.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test2.cmp
Sun Mar 1 05:45:34 2015
@@ -1,5 +1,5 @@
-Test File 2
-Good include file b
-Good parse file b
-Good include file c
-Good parse file c
+Test File 2
+Good include file b
+Good parse file b
+Good include file c
+Good parse file c
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test3.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test3.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test3.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test3.cmp
Sun Mar 1 05:45:34 2015
@@ -1,2 +1,2 @@
-Test File 3
-
+Test File 3
+
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test4.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test4.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test4.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test4.cmp
Sun Mar 1 05:45:34 2015
@@ -1,2 +1,2 @@
-Test File 4
+Test File 4
page not found (subdir)
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test5.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test5.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test5.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/includeevent/compare/test5.cmp
Sun Mar 1 05:45:34 2015
@@ -1,2 +1,2 @@
-Test File 5
+Test File 5
page not found
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-580/compare/velocity580.vm.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-580/compare/velocity580.vm.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-580/compare/velocity580.vm.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-580/compare/velocity580.vm.cmp
Sun Mar 1 05:45:34 2015
@@ -1 +1 @@
-beforeafter
+beforeafter
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/parseexception/badtemplate.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/parseexception/badtemplate.vm?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/parseexception/badtemplate.vm
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/parseexception/badtemplate.vm
Sun Mar 1 05:45:34 2015
@@ -1,7 +1,7 @@
-ok
-ok
-ok
-ok
- #set($s)
-ok
+ok
+ok
+ok
+ok
+ #set($s)
+ok
ok
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/include/include1.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/include/include1.vm?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/include/include1.vm
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/include/include1.vm
Sun Mar 1 05:45:34 2015
@@ -1 +1 @@
-test
+test
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/testincludeparse.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/testincludeparse.vm?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/testincludeparse.vm
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/resourcecaching/testincludeparse.vm
Sun Mar 1 05:45:34 2015
@@ -1,5 +1,5 @@
-line 1
-#include("include/include1.vm")
-line 2
-#parse("include/include1.vm")
+line 1
+#include("include/include1.vm")
+line 2
+#parse("include/include1.vm")
line 3
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/comment-eof.vm
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/comment-eof.vm?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/comment-eof.vm
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/comment-eof.vm
Sun Mar 1 05:45:34 2015
@@ -1,3 +1,3 @@
-## Test to see if ##EOF gives an error
-test
+## Test to see if ##EOF gives an error
+test
##
\ No newline at end of file
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/comment-eof.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/comment-eof.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/comment-eof.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/comment-eof.cmp
Sun Mar 1 05:45:34 2015
@@ -1 +1 @@
-test
+test
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/stop3.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/stop3.cmp?rev=1663025&r1=1663024&r2=1663025&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/stop3.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/compare/stop3.cmp
Sun Mar 1 05:45:34 2015
@@ -1,4 +1,4 @@
-This test checks the stop directive when included from a parse directive.
-
-Foo is: stop3-include.vm
-A line from stop3-include.vm
+This test checks the stop directive when included from a parse directive.
+
+Foo is: stop3-include.vm
+A line from stop3-include.vm
