Author: sdumitriu
Date: Mon Nov 7 16:45:06 2016
New Revision: 1768552
URL: http://svn.apache.org/viewvc?rev=1768552&view=rev
Log:
[cleanup] Use platform newlines
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java?rev=1768552&r1=1768551&r2=1768552&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity736TestCase.java
Mon Nov 7 16:45:06 2016
@@ -1,76 +1,76 @@
-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-736.
- */
-public class Velocity736TestCase extends BaseTestCase
-{
- public Velocity736TestCase(String name)
- {
- super(name);
- DEBUG = true;
- }
-
- public void testPublicMethodInheritedFromAbstractProtectedClass() throws
Exception
- {
- try
- {
- toobig(100);
- }
- catch (Exception e)
- {
- context.put("e", e);
- assertEvalEquals("100", "$e.permittedSize");
- }
- }
-
- public void toobig(long permitted) throws Exception
- {
- throw new FileSizeLimitExceededException(permitted);
- }
-
- public static class FileUploadException extends Exception {}
-
- protected abstract static class SizeException extends FileUploadException
- {
- private final long permitted;
- protected SizeException(long permitted)
- {
- this.permitted = permitted;
- }
- public long getPermittedSize()
- {
- return this.permitted;
- }
- }
-
- public static class FileSizeLimitExceededException extends SizeException
- {
- public FileSizeLimitExceededException(long permitted)
- {
- super(permitted);
- }
- }
-
-}
+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-736.
+ */
+public class Velocity736TestCase extends BaseTestCase
+{
+ public Velocity736TestCase(String name)
+ {
+ super(name);
+ DEBUG = true;
+ }
+
+ public void testPublicMethodInheritedFromAbstractProtectedClass() throws
Exception
+ {
+ try
+ {
+ toobig(100);
+ }
+ catch (Exception e)
+ {
+ context.put("e", e);
+ assertEvalEquals("100", "$e.permittedSize");
+ }
+ }
+
+ public void toobig(long permitted) throws Exception
+ {
+ throw new FileSizeLimitExceededException(permitted);
+ }
+
+ public static class FileUploadException extends Exception {}
+
+ protected abstract static class SizeException extends FileUploadException
+ {
+ private final long permitted;
+ protected SizeException(long permitted)
+ {
+ this.permitted = permitted;
+ }
+ public long getPermittedSize()
+ {
+ return this.permitted;
+ }
+ }
+
+ public static class FileSizeLimitExceededException extends SizeException
+ {
+ public FileSizeLimitExceededException(long permitted)
+ {
+ super(permitted);
+ }
+ }
+
+}
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props?rev=1768552&r1=1768551&r2=1768552&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/issues/velocity-747/vel.props
Mon Nov 7 16:45:06 2016
@@ -1,6 +1,6 @@
-file.resource.loader.cache = true
-file.resource.loader.modificationCheckInterval = -1
-
-velocimacro.permissions.allow.inline.local.scope = true
-directive.set.null.allowed = true
-velocimacro.max.depth = -1
+file.resource.loader.cache = true
+file.resource.loader.modificationCheckInterval = -1
+
+velocimacro.permissions.allow.inline.local.scope = true
+directive.set.null.allowed = true
+velocimacro.max.depth = -1
Modified:
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java?rev=1768552&r1=1768551&r2=1768552&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
(original)
+++
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
Mon Nov 7 16:45:06 2016
@@ -1,217 +1,217 @@
-package org.apache.velocity.script;
-
-/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- *
- * Redistribution and use in source and binary forms, with or without
modification, are
- * permitted provided that the following conditions are met: Redistributions
of source code
- * must retain the above copyright notice, this list of conditions and the
following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
this list of
- * conditions and the following disclaimer in the documentation and/or other
materials
- * provided with the distribution. Neither the name of the Sun Microsystems
nor the names of
- * is contributors may be used to endorse or promote products derived from
this software
- * without specific prior written permission.
-
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Factory class for the Velocity scripting interface. Please refer to the
- * javax.script.ScriptEngineFactory documentation for details.
- *
- * @author A. Sundararajan
- * @author <a href="mailto:[email protected]";>Claude Brisson</a>
- * @version $Id: VelocityScriptEngineFactory.java$
- */
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-public class VelocityScriptEngineFactory implements ScriptEngineFactory
-{
-
- private static final String VELOCITY_NAME = "Velocity";
- private static final String VELOCITY_VERSION = "2.0";
- private static final String VELOCITY_LANGUAGE = "VTL";
-
- private static List<String> names;
- private static List<String> extensions;
- private static List<String> mimeTypes;
-
- private static Properties parameters;
-
- static
- {
- names = new ArrayList();
- names.add("velocity");
- names.add("Velocity");
- names = Collections.unmodifiableList(names);
- extensions = new ArrayList();
- extensions.add("vm");
- extensions.add("vtl");
- extensions.add("vhtml");
- extensions = Collections.unmodifiableList(extensions);
- mimeTypes = new ArrayList();
- mimeTypes.add("text/x-velocity");
- mimeTypes = Collections.unmodifiableList(mimeTypes);
- parameters = new Properties();
- parameters.put(ScriptEngine.NAME, VELOCITY_NAME);
- parameters.put(ScriptEngine.ENGINE_VERSION, VELOCITY_VERSION);
- parameters.put(ScriptEngine.ENGINE, VELOCITY_NAME);
- parameters.put(ScriptEngine.LANGUAGE, VELOCITY_LANGUAGE);
- parameters.put(ScriptEngine.LANGUAGE_VERSION, VELOCITY_VERSION);
- parameters.put("THREADING", "MULTITHREADED");
- }
-
- /**
- * get engine name
- * @return engine name, aka "Velocity"
- */
- public String getEngineName()
- {
- return VELOCITY_NAME;
- }
-
- /**
- * get engine version
- * @return engine version string
- */
- public String getEngineVersion()
- {
- return VELOCITY_VERSION;
- }
-
- /**
- * get the list of file extensions handled by Velocity: vm, vtl, vhtml
- * @return extentions list
- */
- public List<String> getExtensions()
- {
- return extensions;
- }
-
- /**
- * get language name
- * @return language name, aka "VTL"
- */
- public String getLanguageName()
- {
- return VELOCITY_NAME;
- }
-
- /**
- * get language version (same as engine version)
- * @return language version string
- */
- public String getLanguageVersion()
- {
- return VELOCITY_VERSION;
- }
-
- /**
- * get Velocity syntax for calling method 'm' on bject 'obj' with provided
arguments
- * @param obj
- * @param m
- * @param args
- * @return VTL call ${obj.m(args...)}
- */
- public String getMethodCallSyntax(String obj, String m, String... args)
- {
- StringBuilder buf = new StringBuilder();
- buf.append("${");
- buf.append(obj);
- buf.append(".");
- buf.append(m);
- buf.append("(");
- if (args.length != 0)
- {
- int i = 0;
- for (; i < args.length - 1; i++)
- {
- buf.append("$" + args[i]);
- buf.append(", ");
- }
- buf.append("$" + args[i]);
- }
- buf.append(")}");
- return buf.toString();
- }
-
- /**
- * get the list of Velocity mime types
- * @return singleton { 'text/x-velocity' }
- */
- public List<String> getMimeTypes()
- {
- return mimeTypes;
- }
-
- /**
- * get the list of names
- * @return { 'velocity', 'Velocity' }
- */
- public List<String> getNames()
- {
- return names;
- }
-
- /**
- * get VTL expression used to display specified string
- * @param toDisplay
- * @return escaped string #[[toDisplay]]#
- */
- public String getOutputStatement(String toDisplay)
- {
- StringBuilder buf = new StringBuilder();
- buf.append("#[[").append(toDisplay).append("]]#");
- return buf.toString();
- }
-
- /**
- * get engine parameter for provided key
- * @param key
- * @return found parameter, or null
- */
- public String getParameter(String key)
- {
- return parameters.getProperty(key);
- }
-
- /**
- * get whole VTL program given VTL lines
- * @param statements VTL lines
- * @return lines concatenated with carriage returns
- */
- public String getProgram(String... statements)
- {
- StringBuilder buf = new StringBuilder();
- for (int i = 0; i < statements.length; i++)
- {
- buf.append(statements[i]);
- buf.append("\n");
- }
- return buf.toString();
- }
-
- /**
- * get a Velocity script engine
- * @return a new Velocity script engine
- */
- public ScriptEngine getScriptEngine()
- {
- return new VelocityScriptEngine(this);
- }
-}
+package org.apache.velocity.script;
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Redistribution and use in source and binary forms, with or without
modification, are
+ * permitted provided that the following conditions are met: Redistributions
of source code
+ * must retain the above copyright notice, this list of conditions and the
following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
this list of
+ * conditions and the following disclaimer in the documentation and/or other
materials
+ * provided with the distribution. Neither the name of the Sun Microsystems
nor the names of
+ * is contributors may be used to endorse or promote products derived from
this software
+ * without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Factory class for the Velocity scripting interface. Please refer to the
+ * javax.script.ScriptEngineFactory documentation for details.
+ *
+ * @author A. Sundararajan
+ * @author <a href="mailto:[email protected]";>Claude Brisson</a>
+ * @version $Id: VelocityScriptEngineFactory.java$
+ */
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+public class VelocityScriptEngineFactory implements ScriptEngineFactory
+{
+
+ private static final String VELOCITY_NAME = "Velocity";
+ private static final String VELOCITY_VERSION = "2.0";
+ private static final String VELOCITY_LANGUAGE = "VTL";
+
+ private static List<String> names;
+ private static List<String> extensions;
+ private static List<String> mimeTypes;
+
+ private static Properties parameters;
+
+ static
+ {
+ names = new ArrayList();
+ names.add("velocity");
+ names.add("Velocity");
+ names = Collections.unmodifiableList(names);
+ extensions = new ArrayList();
+ extensions.add("vm");
+ extensions.add("vtl");
+ extensions.add("vhtml");
+ extensions = Collections.unmodifiableList(extensions);
+ mimeTypes = new ArrayList();
+ mimeTypes.add("text/x-velocity");
+ mimeTypes = Collections.unmodifiableList(mimeTypes);
+ parameters = new Properties();
+ parameters.put(ScriptEngine.NAME, VELOCITY_NAME);
+ parameters.put(ScriptEngine.ENGINE_VERSION, VELOCITY_VERSION);
+ parameters.put(ScriptEngine.ENGINE, VELOCITY_NAME);
+ parameters.put(ScriptEngine.LANGUAGE, VELOCITY_LANGUAGE);
+ parameters.put(ScriptEngine.LANGUAGE_VERSION, VELOCITY_VERSION);
+ parameters.put("THREADING", "MULTITHREADED");
+ }
+
+ /**
+ * get engine name
+ * @return engine name, aka "Velocity"
+ */
+ public String getEngineName()
+ {
+ return VELOCITY_NAME;
+ }
+
+ /**
+ * get engine version
+ * @return engine version string
+ */
+ public String getEngineVersion()
+ {
+ return VELOCITY_VERSION;
+ }
+
+ /**
+ * get the list of file extensions handled by Velocity: vm, vtl, vhtml
+ * @return extentions list
+ */
+ public List<String> getExtensions()
+ {
+ return extensions;
+ }
+
+ /**
+ * get language name
+ * @return language name, aka "VTL"
+ */
+ public String getLanguageName()
+ {
+ return VELOCITY_NAME;
+ }
+
+ /**
+ * get language version (same as engine version)
+ * @return language version string
+ */
+ public String getLanguageVersion()
+ {
+ return VELOCITY_VERSION;
+ }
+
+ /**
+ * get Velocity syntax for calling method 'm' on bject 'obj' with provided
arguments
+ * @param obj
+ * @param m
+ * @param args
+ * @return VTL call ${obj.m(args...)}
+ */
+ public String getMethodCallSyntax(String obj, String m, String... args)
+ {
+ StringBuilder buf = new StringBuilder();
+ buf.append("${");
+ buf.append(obj);
+ buf.append(".");
+ buf.append(m);
+ buf.append("(");
+ if (args.length != 0)
+ {
+ int i = 0;
+ for (; i < args.length - 1; i++)
+ {
+ buf.append("$" + args[i]);
+ buf.append(", ");
+ }
+ buf.append("$" + args[i]);
+ }
+ buf.append(")}");
+ return buf.toString();
+ }
+
+ /**
+ * get the list of Velocity mime types
+ * @return singleton { 'text/x-velocity' }
+ */
+ public List<String> getMimeTypes()
+ {
+ return mimeTypes;
+ }
+
+ /**
+ * get the list of names
+ * @return { 'velocity', 'Velocity' }
+ */
+ public List<String> getNames()
+ {
+ return names;
+ }
+
+ /**
+ * get VTL expression used to display specified string
+ * @param toDisplay
+ * @return escaped string #[[toDisplay]]#
+ */
+ public String getOutputStatement(String toDisplay)
+ {
+ StringBuilder buf = new StringBuilder();
+ buf.append("#[[").append(toDisplay).append("]]#");
+ return buf.toString();
+ }
+
+ /**
+ * get engine parameter for provided key
+ * @param key
+ * @return found parameter, or null
+ */
+ public String getParameter(String key)
+ {
+ return parameters.getProperty(key);
+ }
+
+ /**
+ * get whole VTL program given VTL lines
+ * @param statements VTL lines
+ * @return lines concatenated with carriage returns
+ */
+ public String getProgram(String... statements)
+ {
+ StringBuilder buf = new StringBuilder();
+ for (int i = 0; i < statements.length; i++)
+ {
+ buf.append(statements[i]);
+ buf.append("\n");
+ }
+ return buf.toString();
+ }
+
+ /**
+ * get a Velocity script engine
+ * @return a new Velocity script engine
+ */
+ public ScriptEngine getScriptEngine()
+ {
+ return new VelocityScriptEngine(this);
+ }
+}
