Author: cbrisson
Date: Thu Nov 10 08:01:41 2016
New Revision: 1769055
URL: http://svn.apache.org/viewvc?rev=1769055&view=rev
Log:
[tools] a tool should either be Serializable or forbid Session scope
Modified:
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/AlternatorTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/NumberTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/ClassToolTests.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-generic/pom.xml Thu Nov 10 08:01:41 2016
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/AlternatorTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/AlternatorTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/AlternatorTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/AlternatorTool.java
Thu Nov 10 08:01:41 2016
@@ -20,7 +20,10 @@ package org.apache.velocity.tools.generi
*/
import java.util.Collection;
+
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* Simple tool to provide easy in-template instantiation of
@@ -55,6 +58,8 @@ import org.apache.velocity.tools.config.
* @since Velocity Tools 1.2
* @version $Revision$ $Date$
*/
+
+@ValidScope(Scope.APPLICATION)
@DefaultKey("alternator")
public class AlternatorTool extends SafeConfig
{
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
Thu Nov 10 08:01:41 2016
@@ -36,7 +36,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.velocity.tools.ClassUtils;
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* <p>
@@ -67,7 +69,9 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 2.0
* @version $Id: ClassTool.java 463298 2006-10-12 16:10:32Z henning $
*/
+
@DefaultKey("class")
+@ValidScope(Scope.APPLICATION)
public class ClassTool extends SafeConfig
{
public static final String INSPECT_KEY = "inspect";
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ComparisonDateTool.java
Thu Nov 10 08:01:41 2016
@@ -28,6 +28,9 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.apache.velocity.tools.Scope;
+import org.apache.velocity.tools.config.ValidScope;
+
/**
* Tool for comparing {@link java.util.Date} and {@link Calendar} values
* in Velocity templates. This is a subclass of {@link DateTool}
@@ -65,6 +68,8 @@ import java.util.ResourceBundle;
* @since VelocityTools 1.4
* @version $Revision$ $Date: 2006-04-04 12:35:17 -0700 (Tue, 04 Apr 2006) $
*/
+
+@ValidScope(Scope.APPLICATION)
public class ComparisonDateTool extends DateTool
{
/** The number of milliseconds in a second. */
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
Thu Nov 10 08:01:41 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.generi
* under the License.
*/
+import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Date;
@@ -53,9 +54,10 @@ import org.apache.velocity.tools.config.
* @version $Revision$ $Date: 2007-02-26 11:24:39 -0800 (Mon, 26 Feb 2007) $
* @since VelocityTools 2.0
*/
+
@DefaultKey("convert")
@SkipSetters
-public class ConversionTool extends LocaleConfig
+public class ConversionTool extends LocaleConfig implements Serializable
{
public static final String STRINGS_DELIMITER_FORMAT_KEY =
"stringsDelimiter";
public static final String STRINGS_TRIM_KEY = "trimStrings";
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DateTool.java
Thu Nov 10 08:01:41 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.generi
* under the License.
*/
+import java.io.Serializable;
import java.lang.reflect.Field;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -67,8 +68,9 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 1.0
* @version $Revision$ $Date$
*/
+
@DefaultKey("date")
-public class DateTool extends FormatConfig
+public class DateTool extends FormatConfig implements Serializable
{
/**
* The key used for specifying a default timezone via tool configuration.
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/DisplayTool.java
Thu Nov 10 08:01:41 2016
@@ -27,8 +27,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.regex.Pattern;
+import org.apache.velocity.tools.Scope;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* Provides general utility methods for controlling the display of references.
@@ -70,7 +72,9 @@ import org.apache.velocity.tools.config.
* @author Nathan Bubna
* @version $Id: DisplayTool.java 463298 2006-10-12 16:10:32Z henning $
*/
+
@DefaultKey("display")
+@ValidScope(Scope.APPLICATION)
public class DisplayTool extends LocaleConfig
{
public static final String LIST_DELIM_KEY = "listDelim";
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
Thu Nov 10 08:01:41 2016
@@ -19,10 +19,13 @@ package org.apache.velocity.tools.generi
* under the License.
*/
-import java.net.URLEncoder;
import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
import org.apache.velocity.shaded.commons.lang3.StringEscapeUtils;
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* Tool for working with escaping in Velocity templates.
@@ -92,7 +95,9 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 1.2
* @see StringEscapeUtils
*/
+
@DefaultKey("esc")
+@ValidScope(Scope.APPLICATION)
public class EscapeTool extends SafeConfig
{
public static final String DEFAULT_KEY = "esc";
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
Thu Nov 10 08:01:41 2016
@@ -28,7 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.velocity.tools.ClassUtils;
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* <p>
@@ -77,7 +79,9 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 2.0
* @version $Id: FieldTool.java 463298 2006-10-12 16:10:32Z henning $
*/
+
@DefaultKey("field")
+@ValidScope(Scope.APPLICATION)
public class FieldTool extends SafeConfig
{
/**
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
Thu Nov 10 08:01:41 2016
@@ -79,6 +79,7 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 2.0
* @version $Id: LinkTool.java 601976 2007-12-07 03:50:51Z nbubna $
*/
+
@DefaultKey("link")
@SkipSetters
@ValidScope(Scope.REQUEST)
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
Thu Nov 10 08:01:41 2016
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
* @since VelocityTools 3.0
* @version $Id: $
*/
+
@DefaultKey("log")
@ValidScope(Scope.APPLICATION)
public class LogTool
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
Thu Nov 10 08:01:41 2016
@@ -92,6 +92,7 @@ import org.slf4j.LoggerFactory;
* @author Nathan Bubna
* @version $Id: LoopTool.java 590893 2007-11-01 04:40:21Z nbubna $
*/
+
@DefaultKey("loop")
@ValidScope(Scope.REQUEST)
public class LoopTool
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Thu Nov 10 08:01:41 2016
@@ -22,9 +22,12 @@ package org.apache.velocity.tools.generi
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
+
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.velocity.tools.ConversionUtils;
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.ValidScope;
/**
* <p>Tool for performing math in Velocity.</p>
@@ -54,7 +57,9 @@ import org.apache.velocity.tools.config.
* @author Leon Messerschmidt
* @version $Revision$ $Date$
*/
+
@DefaultKey("math")
+@ValidScope(Scope.APPLICATION)
public class MathTool extends FormatConfig
{
/* Old non-vararg methods (can be removed once we require Velocity 1.6) */
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/NumberTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/NumberTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/NumberTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/NumberTool.java
Thu Nov 10 08:01:41 2016
@@ -19,8 +19,10 @@ package org.apache.velocity.tools.generi
* under the License.
*/
+import java.io.Serializable;
import java.text.NumberFormat;
import java.util.Locale;
+
import org.apache.velocity.tools.ConversionUtils;
import org.apache.velocity.tools.ToolContext;
import org.apache.velocity.tools.config.DefaultKey;
@@ -33,7 +35,7 @@ import org.apache.velocity.tools.config.
* or make conversions to and from various number types.
* <p><pre>
* Example uses:
- * $myNumber -> 13.55
+ * $myNumber -> 13.55
* $number.format($myNumber) -> 13.6
* $number.currency($myNumber) -> $13.55
* $number.integer($myNumber) -> 13
@@ -57,8 +59,9 @@ import org.apache.velocity.tools.config.
* @since VelocityTools 1.2
* @version $Id$
*/
+
@DefaultKey("number")
-public class NumberTool extends FormatConfig
+public class NumberTool extends FormatConfig implements Serializable
{
// ------------------------- formatting methods ---------------------------
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
Thu Nov 10 08:01:41 2016
@@ -31,6 +31,7 @@ import org.apache.velocity.context.Conte
import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.ToolContext;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.InvalidScope;
/**
* This tool exposes methods to evaluate the given
@@ -103,7 +104,9 @@ import org.apache.velocity.tools.config.
* @author Nathan Bubna
* @version $Revision$ $Date$
*/
+
@DefaultKey("render")
+@InvalidScope(Scope.SESSION)
public class RenderTool extends SafeConfig
{
/**
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
Thu Nov 10 08:01:41 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.generi
* under the License.
*/
+import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -73,8 +74,9 @@ import org.apache.velocity.tools.config.
* @version $Revision$ $Date: 2006-11-27 10:49:37 -0800 (Mon, 27 Nov 2006) $
* @since VelocityTools 1.3
*/
+
@DefaultKey("text")
-public class ResourceTool extends LocaleConfig
+public class ResourceTool extends LocaleConfig implements Serializable
{
public static final String BUNDLES_KEY = "bundles";
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java
Thu Nov 10 08:01:41 2016
@@ -26,7 +26,9 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.Collection;
+import org.apache.velocity.tools.Scope;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.InvalidScope;
/**
* <p>Utility class for easy parsing of String values held in a Map.</p>
@@ -43,7 +45,9 @@ import org.apache.velocity.tools.config.
* @version $Revision$ $Date$
* @since VelocityTools 1.2
*/
+
@DefaultKey("parser")
+@InvalidScope(Scope.SESSION) /* session scope forbidden: Object may not be
Serializable */
public class ValueParser extends ConversionTool implements Map<String,Object>
{
private Map<String,Object> source = null;
Modified:
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/ClassToolTests.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/ClassToolTests.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/ClassToolTests.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/ClassToolTests.java
Thu Nov 10 08:01:41 2016
@@ -26,12 +26,16 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.InvalidScope;
import org.apache.velocity.tools.config.SkipSetters;
import org.junit.Test;
@@ -111,12 +115,19 @@ public class ClassToolTests {
classTool.setType(MyDeprecated.class);
assertEquals(1, classTool.getAnnotations().size());
classTool.setType(ValueParser.class);
- assertEquals(2, classTool.getAnnotations().size());
- Class type0 = classTool.getAnnotations().get(0).annotationType();
- Class type1 = classTool.getAnnotations().get(1).annotationType();
- assertTrue(type0 != type1);
- assertTrue(type0 == DefaultKey.class || type1 == DefaultKey.class);
- assertTrue(type0 == SkipSetters.class || type1 == SkipSetters.class);
+ List<Annotation> annotations = classTool.getAnnotations();
+ assertEquals(3, annotations.size());
+ Collections.sort(annotations, new Comparator<Annotation>()
+ {
+ @Override
+ public int compare(Annotation o1, Annotation o2)
+ {
+ return o1.toString().compareTo(o2.toString());
+ }
+ });
+ assertTrue(annotations.get(0).annotationType() == DefaultKey.class);
+ assertTrue(annotations.get(1).annotationType() == InvalidScope.class);
+ assertTrue(annotations.get(2).annotationType() == SkipSetters.class);
}
public @Test void methodGetConstructors() throws Exception
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
Thu Nov 10 08:01:41 2016
@@ -43,6 +43,7 @@ import org.apache.velocity.tools.view.Im
* @since VelocityTools 2.0
* @version $Revision$ $Date$
*/
+
@DefaultKey("import")
@ValidScope(Scope.REQUEST)
public class ImportTool extends ImportSupport
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
Thu Nov 10 08:01:41 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.view;
* under the License.
*/
+import java.io.Serializable;
import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -48,9 +49,10 @@ import org.apache.velocity.tools.view.Vi
* @author Nathan Bubna
* @since VelocityTools 2.0
*/
+
@DefaultKey("include")
@InvalidScope(Scope.APPLICATION)
-public class IncludeTool
+public class IncludeTool implements Serializable
{
/**
* The key used to search initialization, context, and JVM
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
Thu Nov 10 08:01:41 2016
@@ -64,6 +64,7 @@ import org.apache.velocity.tools.view.Se
* @since VelocityTools 2.0
* @version $Id$
*/
+
public class LinkTool extends org.apache.velocity.tools.generic.LinkTool
{
public static final String INCLUDE_REQUEST_PARAMS_KEY =
"includeRequestParams";
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
Thu Nov 10 08:01:41 2016
@@ -115,6 +115,7 @@ import org.apache.velocity.tools.config.
* @author Nathan Bubna
* @version $Revision: 16660 $
*/
+
@DefaultKey("depends")
@ValidScope(Scope.REQUEST)
public class UiDependencyTool {
Modified:
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java?rev=1769055&r1=1769054&r2=1769055&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
Thu Nov 10 08:01:41 2016
@@ -19,6 +19,7 @@ package org.apache.velocity.tools.generi
* under the License.
*/
+import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -74,8 +75,9 @@ import org.apache.velocity.tools.config.
* @version $Revision$ $Date: 2006-11-27 10:49:37 -0800 (Mon, 27 Nov 2006) $
* @since VelocityTools 2.0
*/
+
@DefaultKey("xml")
-public class XmlTool extends SafeConfig
+public class XmlTool extends SafeConfig implements Serializable
{
public static final String FILE_KEY = "file";
