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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.test.BaseTestCase; @@ -32,19 +32,19 @@ public class Velocity753TestCase extends } 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)); + { + // 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); + context.put("tool", tool); + context.put("float", f); - String template = "$tool.test($float)"; + String template = "$tool.test($float)"; // in reflection-land, Float and float are equivalent, so double is selected - assertEvalEquals("double", template); - } + assertEvalEquals("double", template); + } public static class Tool {
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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.test.BaseTestCase; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.app.event.EventCartridge; @@ -43,7 +43,7 @@ public class Velocity758TestCase extends { String nullContent = "Parse arg was null"; addTemplate("null.vm", nullContent); - + EventCartridge ec = new EventCartridge(); ec.addEventHandler(new Handler()); ec.attachToContext(context); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity762TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity762TestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity762TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity762TestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.test.BaseTestCase; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.test.BaseTestCase; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity830TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity830TestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity830TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity830TestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.issues; * "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. + * under the License. */ import org.apache.velocity.VelocityContext; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.context.InternalContextAdapter; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.app.event.IncludeEventHandler; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.exception.ResourceNotFoundException; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/GetPutObject.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/GetPutObject.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/GetPutObject.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/GetPutObject.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ public class GetPutObject Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.VelocityContext; @@ -27,8 +27,8 @@ import java.util.Map; /** * Used for testing EvaluateContext. For testing purposes, this is a case insensitive - * context. - * + * context. + * * @author <a href="mailto:wgl...@forio.com";>Will Glass-Husain</a> * @version $Id$ */ @@ -36,7 +36,7 @@ public class TestContext implements Cont { Context innerContext = new VelocityContext(); Map<String, String> originalKeys = new HashMap<String, String>(); - + public boolean containsKey(String key) { return innerContext.containsKey(normalizeKey(key)); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.slf4j.helpers.FormattingTuple; @@ -65,7 +65,7 @@ public class TestLogger extends MarkerIg startCapture(); } } - + public static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; public static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; public static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; @@ -133,7 +133,7 @@ public class TestLogger extends MarkerIg { return !suppress && level >= enabledLevel; } - + /** * Return the captured log messages to date. * @return log messages Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.util.introspection.Info; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import org.apache.velocity.util.introspection.Info; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectorTestObject.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectorTestObject.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectorTestObject.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectorTestObject.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.misc; * "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. + * under the License. */ import java.util.Map; @@ -32,7 +32,7 @@ public class UberspectorTestObject private String ambigous; private String unambiguous; - + /** * @return the premium */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/BoolObj.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/BoolObj.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/BoolObj.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/BoolObj.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/ForeachMethodCallHelper.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/ForeachMethodCallHelper.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/ForeachMethodCallHelper.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/ForeachMethodCallHelper.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NullToStringObject.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NullToStringObject.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NullToStringObject.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NullToStringObject.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NumberMethods.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NumberMethods.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NumberMethods.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/NumberMethods.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ import java.math.BigDecimal; @@ -68,8 +68,3 @@ public class NumberMethods } - - - - - Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Person.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Person.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Person.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Person.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ import org.apache.velocity.util.TemplateNumber; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.provide * "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. + * under the License. */ import java.util.ArrayList; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.sql; * "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. + * under the License. */ import org.apache.velocity.test.BaseTestCase; @@ -49,7 +49,7 @@ public abstract class BaseSQLTest hsqlDB = new HsqlDB("jdbc:hsqldb:.", path + "/create-db.sql"); } } - + public void executeSQL(String sql) throws SQLException { Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.sql; * "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. + * under the License. */ import org.hsqldb.jdbcDriver; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.util.in * "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. + * under the License. */ import junit.framework.Test; @@ -50,7 +50,7 @@ public class ClassMapTestCase Velocity.setProperty(Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); Velocity.init(); } - + public void tearDown() { } @@ -59,7 +59,7 @@ public class ClassMapTestCase throws Exception { Logger log = Velocity.getLog(); - + ClassMap c = new ClassMap(TestClassMap.class, log); assertNotNull(c.findMethod("setBoolean", new Object[] { Boolean.TRUE })); assertNotNull(c.findMethod("setByte", new Object[] { new Byte((byte) 4)})); Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java Thu Jan 26 01:57:00 2017 @@ -73,7 +73,7 @@ public class ConversionHandlerTestCase e { return new TestSuite(ConversionHandlerTestCase.class); } - + public void testConversionsWithoutHandler() throws Exception { @@ -169,7 +169,7 @@ public class ConversionHandlerTestCase e "-----Result-----\n"+ result + "----Expected----\n"+ compare + "----------------"; - + fail(msg); } } @@ -195,7 +195,7 @@ public class ConversionHandlerTestCase e ve.setProperty(RuntimeConstants.CONVERSION_HANDLER_CLASS, "none"); } ve.init(); - + return ve; } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.test.view; * "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. + * under the License. */ import org.apache.velocity.Template; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/util/SimplePoolTestCase.java Thu Jan 26 01:57:00 2017 @@ -16,7 +16,7 @@ package org.apache.velocity.util; * "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. + * under the License. */ import junit.framework.Test; Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/README.txt?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/README.txt (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/README.txt Thu Jan 26 01:57:00 2017 @@ -27,7 +27,7 @@ Change to the /build directory in the Ve This will invoke ant and tell it to build the examples for you. -Finally, note that more examples of using Velocity can be found in the +Finally, note that more examples of using Velocity can be found in the Velocity-Tools subject. Of special note is the VelocityViewServlet, a quick and easy way to build a web application that uses Velocity. @@ -37,7 +37,7 @@ a quick and easy way to build a web appl Velocity Examples ================= -app_example1 +app_example1 ------------ This simple example shows how to use the Velocity Template Engine in a standalone program. It should be pre-compiled for you. Run it using the example @@ -45,7 +45,7 @@ template provided (example.vm): ./example.sh -app_example2 +app_example2 ------------ Another simple example showing how to use Velocity in a standalone program. This examples uses the org.apache.velocity.util.Velocity application utility @@ -58,26 +58,24 @@ context_example -------------- This is a demonstration of 2 different context implementations : - a context implementation that uses a database as the storage. - Use the DBContextTest program to test. See the DBContextTest.java file for the - db table info. Unsupported demonstration code. You may need to futz with - it to get it to work in your environment. To run, use the dbcontexttest.sh + Use the DBContextTest program to test. See the DBContextTest.java file for the + db table info. Unsupported demonstration code. You may need to futz with + it to get it to work in your environment. To run, use the dbcontexttest.sh script. - a context implementation that uses a TreeMap for storage. Very simple. xmlapp_example -------------- -This is simple example that demonstrates direct access of XML data via +This is simple example that demonstrates direct access of XML data via Velocity templates, as well as Velocimacro recursion. event_example ------------- This is a more advanced example, and shows how to use the event handling -features of Velocity. This is an advanced topic, so if you are just +features of Velocity. This is an advanced topic, so if you are just starting with Velocity, you can come back to it later. Thanks for using Velocity! - the Velocity team - - Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/README.txt?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/README.txt (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/README.txt Thu Jan 26 01:57:00 2017 @@ -15,7 +15,7 @@ As always, the if you have any questions and then follow the links to join the lists. -app_example1 +app_example1 ------------ This simple example shows how to use the Velocity Template Engine Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/appendVELCP.bat URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/appendVELCP.bat?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/appendVELCP.bat (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/app_example1/appendVELCP.bat Thu Jan 26 01:57:00 2017 @@ -14,6 +14,6 @@ rem software distributed under the Licen rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations -rem under the License. +rem under the License. set VELCP=%VELCP%;%1 Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/README.txt?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/README.txt (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/README.txt Thu Jan 26 01:57:00 2017 @@ -15,12 +15,12 @@ As always, the if you have any questions and then follow the links to join the lists. -app_example2 +app_example2 ------------ Another simple example showing how to use Velocity in a standalone program. This examples uses the org.apache.velocity.util.Velocity application utility -class, which provides a few convenient methods for application programmers. +class, which provides a few convenient methods for application programmers. Please see the build instructions found in examples/README.txt @@ -31,4 +31,3 @@ To run : or example2.bat - Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/appendVELCP.bat URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/appendVELCP.bat?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/appendVELCP.bat (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/app_example2/appendVELCP.bat Thu Jan 26 01:57:00 2017 @@ -14,6 +14,6 @@ rem software distributed under the Licen rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations -rem under the License. +rem under the License. set VELCP=%VELCP%;%1 Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/context_example/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/context_example/README.txt?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/context_example/README.txt (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/context_example/README.txt Thu Jan 26 01:57:00 2017 @@ -20,9 +20,9 @@ context_example This is a demonstration of 2 different context implementations : - a context implementation that uses a database as the storage. - Use the DBContextTest program to test. See the DBContextTest.java file for the - db table info. Unsupported demonstration code. You may need to futz with - it to get it to work in your environment. To run, use the dbcontexttest.sh + Use the DBContextTest program to test. See the DBContextTest.java file for the + db table info. Unsupported demonstration code. You may need to futz with + it to get it to work in your environment. To run, use the dbcontexttest.sh script. - a context implementation that uses a TreeMap for storage. Very simple. @@ -30,4 +30,3 @@ This is a demonstration of 2 different c Thanks for using Velocity! - the Velocity team - Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/README.txt URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/README.txt?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/README.txt (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/README.txt Thu Jan 26 01:57:00 2017 @@ -15,14 +15,14 @@ As always, the if you have any questions and then follow the links to join the lists. -xmlapp_example +xmlapp_example -------------- Another simple example showing how to use Velocity in a standalone -program. This example shows how to use Velocity to access XML data +program. This example shows how to use Velocity to access XML data directly from an XML input file within the template. It also demonstrates velocimacro recursion. - ./xmlapp_example.sh -or + ./xmlapp_example.sh +or xmlapp_example.bat Modified: velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/appendVELCP.bat URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/appendVELCP.bat?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/appendVELCP.bat (original) +++ velocity/engine/trunk/velocity-engine-examples/src/etc/xmlapp_example/appendVELCP.bat Thu Jan 26 01:57:00 2017 @@ -14,6 +14,6 @@ rem software distributed under the Licen rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations -rem under the License. +rem under the License. set VELCP=%VELCP%;%1 Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/Example.java Thu Jan 26 01:57:00 2017 @@ -15,7 +15,7 @@ package org.apache.velocity.example; * "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. + * under the License. */ import org.apache.velocity.app.Velocity; Modified: velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/XMLTest.java Thu Jan 26 01:57:00 2017 @@ -15,7 +15,7 @@ package org.apache.velocity.example; * "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. + * under the License. */ import java.io.BufferedWriter; @@ -119,4 +119,3 @@ public class XMLTest t = new XMLTest(args[0]); } } - Modified: velocity/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/resources/dbtest.vm Thu Jan 26 01:57:00 2017 @@ -13,7 +13,6 @@ ## "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. +## under the License. $string $hashtable.Bar - Modified: velocity/engine/trunk/velocity-engine-examples/src/main/resources/example.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/resources/example.vm?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/resources/example.vm (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/resources/example.vm Thu Jan 26 01:57:00 2017 @@ -13,7 +13,7 @@ ## "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. +## under the License. #set( $this = "Velocity") Modified: velocity/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/resources/example2.vm Thu Jan 26 01:57:00 2017 @@ -13,5 +13,5 @@ ## "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. +## under the License. Hello from $name in the $project project. Modified: velocity/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/resources/velocity.properties Thu Jan 26 01:57:00 2017 @@ -13,6 +13,5 @@ # "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. +# under the License. runtime.log = velocity_example.log - Modified: velocity/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm (original) +++ velocity/engine/trunk/velocity-engine-examples/src/main/resources/xml.vm Thu Jan 26 01:57:00 2017 @@ -13,7 +13,7 @@ ## "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. +## under the License. #macro ( recursive $e $indent ) #if( $e.getChildren().size() > 0 ) $indent <$e.getName()> Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java Thu Jan 26 01:57:00 2017 @@ -1,24 +1,24 @@ package org.apache.velocity.script; /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * 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 + * 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. + * 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 + * 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. @@ -123,7 +123,7 @@ public class VelocityScriptEngine extend */ public Object eval(String str, ScriptContext ctx) throws ScriptException - { + { return eval(new StringReader(str), ctx); } @@ -138,7 +138,7 @@ public class VelocityScriptEngine extend */ public Object eval(Reader reader, ScriptContext ctx) throws ScriptException - { + { initVelocityEngine(ctx); String fileName = getFilename(ctx); VelocityContext vctx = getVelocityContext(ctx); @@ -229,7 +229,7 @@ public class VelocityScriptEngine extend protected static VelocityContext getVelocityContext(ScriptContext ctx) { ctx.setAttribute("context", ctx, ScriptContext.ENGINE_SCOPE); - Bindings globalScope = ctx.getBindings(ScriptContext.GLOBAL_SCOPE); + Bindings globalScope = ctx.getBindings(ScriptContext.GLOBAL_SCOPE); Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE); if (globalScope != null) { @@ -267,14 +267,14 @@ public class VelocityScriptEngine extend Properties p = new Properties(); p.load(new FileInputStream(propsFile)); return p; - } + } } } } catch (Exception exp) { System.err.println(exp); - } + } return null; } 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=1780307&r1=1780306&r2=1780307&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 Thu Jan 26 01:57:00 2017 @@ -1,24 +1,24 @@ package org.apache.velocity.script; /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * 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 + * 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. + * 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 + * 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. @@ -52,7 +52,7 @@ public class VelocityScriptEngineFactory private static List<String> mimeTypes; private static Properties parameters; - + static { names = new ArrayList(); @@ -81,7 +81,7 @@ public class VelocityScriptEngineFactory * @return engine name, aka "Velocity" */ public String getEngineName() - { + { return VELOCITY_NAME; } @@ -145,7 +145,7 @@ public class VelocityScriptEngineFactory buf.append(", "); } buf.append("$" + args[i]); - } + } buf.append(")}"); return buf.toString(); } Modified: velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java Thu Jan 26 01:57:00 2017 @@ -94,5 +94,5 @@ public class ScriptEngineTest extends Ab String result = engine.eval(script).toString(); assertEquals("javax.script.SimpleScriptContext java.io.StringWriter java.io.InputStreamReader java.io.PrintWriter", result); } - + } Modified: velocity/engine/trunk/velocity-engine-scripting/src/test/resources/velocity.properties URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/test/resources/velocity.properties?rev=1780307&r1=1780306&r2=1780307&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-scripting/src/test/resources/velocity.properties (original) +++ velocity/engine/trunk/velocity-engine-scripting/src/test/resources/velocity.properties Thu Jan 26 01:57:00 2017 @@ -13,6 +13,5 @@ # "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. +# under the License. runtime.log = velocity_example.log -
