svn commit: r1842428 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: michaelo
Date: Mon Oct 1 07:08:50 2018
New Revision: 1842428
URL: http://svn.apache.org/viewvc?rev=1842428=rev
Log:
[VELTOOLS-178] Move groupId to org.apache.velocity.tools
Modified:
velocity/tools/trunk/ (props changed)
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-examples/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
velocity/tools/trunk/velocity-tools-generic/ (props changed)
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-view/ (props changed)
velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
velocity/tools/trunk/velocity-tools-view/pom.xml
Propchange: velocity/tools/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 07:08:50 2018
@@ -1 +1,2 @@
/velocity/tools/branches/VELTOOLS-177:1841696-1842346
+/velocity/tools/branches/VELTOOLS-178:1842409-1842427
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842428=1842427=1842428=diff
==
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Oct 1 07:08:50 2018
@@ -29,6 +29,7 @@
3
+ org.apache.velocity.tools
velocity-tools-parent
3.0-SNAPSHOT
pom
Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842428=1842427=1842428=diff
==
--- velocity/tools/trunk/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 07:08:50
2018
@@ -24,7 +24,7 @@
4.0.0
-org.apache.velocity
+org.apache.velocity.tools
velocity-tools-parent
3.0-SNAPSHOT
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842428=1842427=1842428=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
Mon Oct 1 07:08:50 2018
@@ -24,7 +24,7 @@
4.0.0
-org.apache.velocity
+org.apache.velocity.tools
velocity-tools-examples
3.0-SNAPSHOT
@@ -42,7 +42,7 @@
provided
- org.apache.velocity
+ org.apache.velocity.tools
velocity-tools-view
${project.version}
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842428=1842427=1842428=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
Mon Oct 1 07:08:50 2018
@@ -24,7 +24,7 @@
4.0.0
-org.apache.velocity
+org.apache.velocity.tools
velocity-tools-examples
3.0-SNAPSHOT
@@ -47,13 +47,13 @@
provided
- org.apache.velocity
+ org.apache.velocity.tools
velocity-tools-view
${project.version}
runtime
- org.apache.velocity
+ org.apache.velocity.tools
velocity-tools-view-jsp
${project.version}
runtime
Propchange: velocity/tools/trunk/velocity-tools-generic/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 07:08:50 2018
@@ -1,2 +1,3 @@
/velocity/tools/branches/VELTOOLS-177/velocity-tools-generic:1841696-1842346
+/velocity/tools/branches/VELTOOLS-178/velocity-tools-generic:1842409-1842427
/velocity/tools/trunk:990897-995744
Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1842428=1842427=1842428=diff
==
--- velocity/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-generic/pom.xml Mon Oct 1 07:08:50 2018
@@ -24,7 +24,7 @@
4.0.0
-org.apache.velocity
+org.apache.velocity.tools
velocity-tools-parent
3.0-SNAPSHOT
Propchange: velocity/tools/trunk/velocity-tools-view/
svn commit: r1842453 - /velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext
Author: cbrisson Date: Mon Oct 1 10:11:23 2018 New Revision: 1842453 URL: http://svn.apache.org/viewvc?rev=1842453=rev Log: [site/tools] update dependencies page Modified: velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext Modified: velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext?rev=1842453=1842452=1842453=diff == --- velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext Mon Oct 1 10:11:23 2018 @@ -16,7 +16,7 @@ Jar Name | Version | Compile | Tests | R velocity | 2.0+ | Yes | Yes | Yes | Required for core infrastructure and several tools commons-beanutils | 1.9.3 | Yes | Yes | Yes | Required for core infrastructure and several tools commons-digester3 | 3.2 | Yes | Yes | Yes | Required for [xml configuration](config-xml.html) (and [UIDependencyTool](apidocs/org/apache/velocity/tools/view/UiDependencyTool.html) view tool) -com.googlecode.json-simple | 1.1.1 | Yes | No | No | Required only at compilation time for [JsonTool](apidocs/org/apache/velocity/tools/generic/JsonTool.html) +com.github.cliftonlabs.json-simple | 1.1.1 | Yes | No | No | Required for [JsonTool](apidocs/org/apache/velocity/tools/generic/JsonTool.html) junit | 4.12 | No | Yes | No | Only required for tests. ### VelocityView @@ -24,7 +24,7 @@ junit | 4.12 | No | Yes | No | Only requ Jar Name | Version | Compile | Tests | Runtime | Notes -|-|-|---|-|-- velocity-tools-generic | 3.0 | Yes | Yes | Yes | -servletapi | 3.0.1+ | Yes | Yes | No | Required for most view tools (provided by the J2EE container) +servletapi | 3.1.0 | Yes | Yes | No | Required for most view tools (provided by the J2EE container) junit | 4.12 | No | Yes | No | Only required for tests easymock | 3.6 | No | Yes | No | Only required for tests
svn commit: r1842429 - in /velocity/tools/trunk: ./ velocity-tools-generic/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/
Author: michaelo
Date: Mon Oct 1 07:15:17 2018
New Revision: 1842429
URL: http://svn.apache.org/viewvc?rev=1842429=rev
Log:
[VELTOOLS-179] Move JSON Simple to new fork on GH and don't shade it
Modified:
velocity/tools/trunk/ (props changed)
velocity/tools/trunk/velocity-tools-generic/ (props changed)
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonTool.java
Propchange: velocity/tools/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 07:15:17 2018
@@ -1,2 +1,3 @@
/velocity/tools/branches/VELTOOLS-177:1841696-1842346
/velocity/tools/branches/VELTOOLS-178:1842409-1842427
+/velocity/tools/branches/VELTOOLS-179:1842406-1842428
Propchange: velocity/tools/trunk/velocity-tools-generic/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 1 07:15:17 2018
@@ -1,3 +1,4 @@
/velocity/tools/branches/VELTOOLS-177/velocity-tools-generic:1841696-1842346
/velocity/tools/branches/VELTOOLS-178/velocity-tools-generic:1842409-1842427
+/velocity/tools/branches/VELTOOLS-179/velocity-tools-generic:1842406-1842428
/velocity/tools/trunk:990897-995744
Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1842429=1842428=1842429=diff
==
--- velocity/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-generic/pom.xml Mon Oct 1 07:15:17 2018
@@ -57,9 +57,9 @@
slf4j-api
- com.googlecode.json-simple
+ com.github.cliftonlabs
json-simple
- 1.1.1
+ 3.0.2
junit
@@ -72,40 +72,4 @@
test
-
-
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-
-
-shade
-package
-
- shade
-
-
-
-
- com.googlecode.json-simple:json-simple
-
-
-
-
- org.json.simple
-
org.apache.velocity.tools.shaded.org.json.simple
-
-
- org.json.simple.parser
-
org.apache.velocity.tools.shaded.org.json.simple.parser
-
-
- true
-
-
-
-
-
-
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java?rev=1842429=1842428=1842429=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java
Mon Oct 1 07:15:17 2018
@@ -22,8 +22,8 @@ package org.apache.velocity.tools.generi
import java.util.Iterator;
import java.util.Set;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
+import com.github.cliftonlabs.json_simple.JsonArray;
+import com.github.cliftonlabs.json_simple.JsonObject;
/**
* Container for *either* an array *or* an object
@@ -34,12 +34,12 @@ public class JsonContent
/**
* JSONObject content
*/
-private JSONObject jsonObject = null;
-
+private JsonObject jsonObject = null;
+
/**
* JSONArray content
*/
-private JSONArray jsonArray = null;
+private JsonArray jsonArray = null;
/**
* wraps the object into an hybrid JSON container if necessary
@@ -50,24 +50,24 @@ public class JsonContent
{
return obj;
}
-else if (obj instanceof JSONArray)
+else if (obj instanceof JsonArray)
{
-return new JsonContent((JSONArray)obj);
+return new JsonContent((JsonArray)obj);
}
-else if (obj instanceof JSONObject)
+else if (obj instanceof JsonObject)
{
-return new JsonContent((JSONObject)obj);
+return new JsonContent((JsonObject)obj);
}
else
{
return obj;
}
}
-
+
/**
* wraps an object
*/
-public JsonContent(JSONObject object)
+public JsonContent(JsonObject object)
{
jsonObject = object;
}
@@
svn commit: r1842430 - in /velocity/tools/branches: VELTOOLS-178/ VELTOOLS-179/
Author: michaelo Date: Mon Oct 1 07:17:05 2018 New Revision: 1842430 URL: http://svn.apache.org/viewvc?rev=1842430=rev Log: Branches merged Removed: velocity/tools/branches/VELTOOLS-178/ velocity/tools/branches/VELTOOLS-179/
svn commit: r1842446 - /velocity/tools/trunk/src/changes/changes.xml
Author: cbrisson Date: Mon Oct 1 09:57:29 2018 New Revision: 1842446 URL: http://svn.apache.org/viewvc?rev=1842446=rev Log: [tools] fix changelog (Maintaining this changelog is rather tedious and ankward. There are no dates, no references to commits, what to include or not is not very clear...) Modified: velocity/tools/trunk/src/changes/changes.xml Modified: velocity/tools/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/changes/changes.xml?rev=1842446=1842445=1842446=diff == --- velocity/tools/trunk/src/changes/changes.xml (original) +++ velocity/tools/trunk/src/changes/changes.xml Mon Oct 1 09:57:29 2018 @@ -25,6 +25,9 @@ + +upgraded to servlet API 3.1.0 + JsonTool now uses an explicit dependency to com.github.cliftonlabs.json-simple @@ -114,9 +117,6 @@ full review of BrowserTool implementation, update user-agents detection algorithm - -upgraded to servlet API 3.0.1 - Removed deprecated 1.x configuration handling and depreacted 1.x tools initialization support
svn commit: r1842450 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
Author: cbrisson
Date: Mon Oct 1 10:05:58 2018
New Revision: 1842450
URL: http://svn.apache.org/viewvc?rev=1842450=rev
Log:
[tools] fix previous commit
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
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=1842450=1842449=1842450=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
Mon Oct 1 10:05:58 2018
@@ -957,9 +957,9 @@ public class LinkTool extends SafeConfig
{
if (opaque)
{
-if (query != null && query.size() > 0
+if (query != null && query.size() > 0)
{
-getLog().warn("Ignoring given parameters in opaque
URI: {}", getQuery())
+getLog().warn("Ignoring given parameters in opaque
URI: {}", getQuery());
}
// path is used as scheme-specific part
return new URI(scheme, path, fragment);
svn commit: r1842449 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
Author: cbrisson
Date: Mon Oct 1 10:04:36 2018
New Revision: 1842449
URL: http://svn.apache.org/viewvc?rev=1842449=rev
Log:
[VELTOOLS-143] Not fixed, but at least emit a warning
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
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=1842449=1842448=1842449=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
Mon Oct 1 10:04:36 2018
@@ -957,6 +957,10 @@ public class LinkTool extends SafeConfig
{
if (opaque)
{
+if (query != null && query.size() > 0
+{
+getLog().warn("Ignoring given parameters in opaque
URI: {}", getQuery())
+}
// path is used as scheme-specific part
return new URI(scheme, path, fragment);
}
svn commit: r1842441 - /velocity/tools/trunk/src/changes/changes.xml
Author: cbrisson Date: Mon Oct 1 09:21:32 2018 New Revision: 1842441 URL: http://svn.apache.org/viewvc?rev=1842441=rev Log: [tools] Update changelog Modified: velocity/tools/trunk/src/changes/changes.xml Modified: velocity/tools/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/changes/changes.xml?rev=1842441=1842440=1842441=diff == --- velocity/tools/trunk/src/changes/changes.xml (original) +++ velocity/tools/trunk/src/changes/changes.xml Mon Oct 1 09:21:32 2018 @@ -25,6 +25,26 @@ + +JsonTool now uses an explicit dependency to com.github.cliftonlabs.json-simple + + +The tools.xml file can now use XInclude file inclusion mechanism + + +Most tools are now serializable + + +CollectionTool.sort() now filters out null elements + + +ViewLayoutServlet layout cannot be changed using GET parameters, unless configured with the +tools.view.servlet.layout.dynamic servlet param to true + + +Review tools-view initialization: default tools are now loaded only when asked for via the org.apache.velocity.tools.loadDefaults +parameter (as an init or servlet parameter). + Drop undocumented autoloaded tools feature, and have org.apache.velocity.tools.loadDefaults default to false
svn commit: r1842451 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
Author: cbrisson
Date: Mon Oct 1 10:07:18 2018
New Revision: 1842451
URL: http://svn.apache.org/viewvc?rev=1842451=rev
Log:
[VELTOOLS-167] Not fixed, but at least emit a warning in the logs
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
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=1842451=1842450=1842451=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
Mon Oct 1 10:07:18 2018
@@ -437,6 +437,7 @@ public class ResourceTool extends Locale
}
if (!getExists())
{
+getLog().warn("missing key: {}", this.key);
return "???"+this.key+"???";
}
return ResourceTool.this.render(this.rawValue, this.args);
svn commit: r1842514 [1/2] - in /velocity/tools/trunk: ./ velocity-tools-generic/src/main/java/org/apache/velocity/tools/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ velocit
Author: cbrisson
Date: Mon Oct 1 16:09:11 2018
New Revision: 1842514
URL: http://svn.apache.org/viewvc?rev=1842514=rev
Log:
[tools] More javadoc fixes
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolInfo.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/XmlUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/Data.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FileFactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.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/ContextTool.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/FormatConfig.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ImportSupport.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ImportTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonContent.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/JsonTool.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/LocaleConfig.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/MarkupTool.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/main/java/org/apache/velocity/tools/generic/XmlTool.java
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842514=1842513=1842514=diff
==
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Oct 1 16:09:11 2018
@@ -199,6 +199,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
+3.0.1
org.apache.velocity.tools.examples
${javadoc.opts}
@@ -211,6 +212,7 @@
aggregate
+ 1.8
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolInfo.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolInfo.java?rev=1842514=1842513=1842514=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolInfo.java
(original)
+++
svn commit: r1842514 [2/2] - in /velocity/tools/trunk: ./ velocity-tools-generic/src/main/java/org/apache/velocity/tools/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ velocit
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=1842514=1842513=1842514=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
Mon Oct 1 16:09:11 2018
@@ -221,6 +221,7 @@ public class LinkTool extends SafeConfig
* Equivalent to clone, but with no checked exceptions.
* If for some unfathomable reason clone() doesn't work,
* this will throw a RuntimeException.
+ * @return new LinkTool
*/
protected LinkTool duplicate()
{
@@ -232,6 +233,8 @@ public class LinkTool extends SafeConfig
* If for some unfathomable reason clone() doesn't work,
* this will throw a RuntimeException. If doing a deep
* clone, then the parameter Map will also be cloned.
+ * @param deep whether to make a deep copy
+ * @return new LinkTool
*/
protected LinkTool duplicate(boolean deep)
{
@@ -278,6 +281,7 @@ public class LinkTool extends SafeConfig
* Sets whether or not the {@link #setParam} method
* will override existing query values for the same key or simply append
* the new value to a list of existing values.
+ * @param addParams whether to add or replace params
*/
public void setAppendParams(boolean addParams)
{
@@ -291,6 +295,7 @@ public class LinkTool extends SafeConfig
* one. NOTE: using {@link #absolute()}, {@link #absolute(Object)},
* {@link #relative()}, or {@link #relative(Object)} will alter this
* setting accordingly on the new instances they return.
+ * @param forceRelative whether to force a relative URI
*/
public void setForceRelative(boolean forceRelative)
{
@@ -300,6 +305,7 @@ public class LinkTool extends SafeConfig
/**
* This will treat empty strings like null values
* and will trim any trailing ':' character.
+ * @param obj scheme
*/
public void setScheme(Object obj)
{
@@ -321,11 +327,19 @@ public class LinkTool extends SafeConfig
}
}
+/**
+ * Sets user info
+ * @param obj user info
+ */
public void setUserInfo(Object obj)
{
this.user = obj == null ? null : String.valueOf(obj);
}
+/**
+ Sets host
+ @param obj host
+ */
public void setHost(Object obj)
{
this.host = obj == null ? null : String.valueOf(obj);
@@ -335,6 +349,7 @@ public class LinkTool extends SafeConfig
* If the specified object is null, this will set the port value
* to -1 to indicate that. If it is non-null and cannot be converted
* to an integer, then it will be set to -2 to indicate an error.
+ * @param obj port
*/
public void setPort(Object obj)
{
@@ -364,6 +379,7 @@ public class LinkTool extends SafeConfig
* If this instance is not opaque and the specified value does
* not start with a '/' character, then that will be prepended
* automatically.
+ * @param obj path
*/
public void setPath(Object obj)
{
@@ -386,6 +402,7 @@ public class LinkTool extends SafeConfig
* to the current {@link #getPath} value. If the specified
* value is null or this instance is opaque, then this is
* a no-op.
+ * @param obj path
*/
public void appendPath(Object obj)
{
@@ -400,6 +417,9 @@ public class LinkTool extends SafeConfig
* If neither is null, this will append the end to the start,
* making sure that there is only one '/' character between
* the two values.
+ * @param start start path
+ * @param end end path
+ * @return combined path
*/
protected String combinePath(String start, String end)
{
@@ -435,6 +455,7 @@ public class LinkTool extends SafeConfig
* replace any current query value with that. If it is a String,
* it will use {@link #parseQuery(String)} to parse it into a map
* of keys to values.
+ * @param obj query
*/
public void setQuery(Object obj)
{
@@ -481,6 +502,10 @@ public class LinkTool extends SafeConfig
}
}
+/**
+ * @param qs query string
+ * @return normalized string
+ */
protected String normalizeQuery(String qs)
{
// if we have multiple pairs...
@@ -495,6 +520,8 @@ public class LinkTool extends SafeConfig
/**
* Converts the map of keys to values into a query string.
+ * @param parameters parameters
+ * @return query string
*/
public String toQuery(Map parameters)
{
@@ -519,6 +546,7 @@ public class LinkTool extends
svn commit: r1842484 - in /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools: ./ generic/
Author: cbrisson
Date: Mon Oct 1 12:22:05 2018
New Revision: 1842484
URL: http://svn.apache.org/viewvc?rev=1842484=rev
Log:
[tools] javadoc fixes
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ClassUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolContext.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolInfo.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolManager.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/XmlUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/Alternator.java
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/CollectionTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ClassUtils.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ClassUtils.java?rev=1842484=1842483=1842484=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ClassUtils.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ClassUtils.java
Mon Oct 1 12:22:05 2018
@@ -394,6 +394,9 @@ public class ClassUtils
* This method is almost entirely copied from Engine's UberspectImpl class.
* @param obj the target obj
* @return an iterator over the content of obj, or null if not found
+ * @throws NoSuchMethodException if no iterator() method
+ * @throws IllegalAccessException if iterator() method not callable
+ * @throws InvocationTargetException if iterator() method throwed
*/
public static Iterator getIterator(Object obj)
throws NoSuchMethodException, IllegalAccessException,
InvocationTargetException
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolContext.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolContext.java?rev=1842484=1842483=1842484=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolContext.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolContext.java
Mon Oct 1 12:22:05 2018
@@ -65,6 +65,7 @@ public class ToolContext implements Cont
/**
* Creates an instance that automatically has the specified
* VelocityEngine and related tool properties set.
+ * @param engine VelocityEngine instance
*/
public ToolContext(VelocityEngine engine)
{
@@ -75,6 +76,7 @@ public class ToolContext implements Cont
/**
* Creates an instance starting with the specified tool properties.
+ * @param toolProps tools properties
*/
public ToolContext(Map toolProps)
{
@@ -91,6 +93,7 @@ public class ToolContext implements Cont
* The default value is {@code true}. Set this to false if you want to
* ensure that your tool references are never replaced within the course
* of a template.
+ * @param overwrite flag value
*/
public void setUserCanOverwriteTools(boolean overwrite)
{
@@ -99,6 +102,7 @@ public class ToolContext implements Cont
/**
* Default is {@code true}.
+ * @return flag value
* @see #setUserCanOverwriteTools
*/
public boolean getUserCanOverwriteTools()
@@ -115,6 +119,7 @@ public class ToolContext implements Cont
* Returns a {@link Map} of all tools available to this
* context. NOTE: this is not a cheap operation as it will
* request and initialize an instance of every available tool.
+ * @return aggregated toolbox of all available tools
*/
public Map getToolbox()
{
@@ -130,6 +135,7 @@ public class ToolContext implements Cont
/**
* Gets a map of keys to classes for all available tools.
* This does not include any data nor any local context values.
+ * @return aggregated map of all available tools classes
*/
public Map getToolClassMap()
{
@@ -161,6 +167,7 @@ public class ToolContext implements Cont
* engine has a MethodExceptionEventHandler configured, then
* this will
svn commit: r1842462 - in /velocity/site/cms/trunk/content/tools/devel: generic.mdtext view.mdtext
Author: cbrisson Date: Mon Oct 1 10:25:01 2018 New Revision: 1842462 URL: http://svn.apache.org/viewvc?rev=1842462=rev Log: [site/tools] Install section with maven dependency block on main subprojects page Modified: velocity/site/cms/trunk/content/tools/devel/generic.mdtext velocity/site/cms/trunk/content/tools/devel/view.mdtext Modified: velocity/site/cms/trunk/content/tools/devel/generic.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/generic.mdtext?rev=1842462=1842461=1842462=diff == --- velocity/site/cms/trunk/content/tools/devel/generic.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/generic.mdtext Mon Oct 1 10:25:01 2018 @@ -4,6 +4,19 @@ Title: Apache Velocity Tools - Generic T GenericTools is the set of classes that provide basic infrastructure for using tools in standard Java SE Velocity projects, as well as a set of tools for use in generic Velocity templates. These tools have no Java EE dependencies and are often safe to use as "singletons". Some of them are not thread-safe to allow both a no-arg constructor and configurability, but the state-changing methods are declared protected with the exception of configure(Map) which is--by default--rendered useless after being used just once. If you require strict thread-safety, be cautious in using any configurable tools and consider [restricting the abilities of template authors](http://wiki.apache.org/velocity/BuildingSecureWebApplications) to prevent circumvention of the lockdown placed on configuration methods. +## Installation + +For inclusion in a Maven project, use the following dependency block: + +:::xml + +org.apache.velocity.tools +velocity-tools-generic +3.0 + + +Otherwise, see the [download page](/download.html#tools) for how to get the Velocity Generic Tools jar. + ## Usage + Initialization with only standard generic tools, using the default configuration file: Modified: velocity/site/cms/trunk/content/tools/devel/view.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/view.mdtext?rev=1842462=1842461=1842462=diff == --- velocity/site/cms/trunk/content/tools/devel/view.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/view.mdtext Mon Oct 1 10:25:01 2018 @@ -12,6 +12,19 @@ Key features: + A number of useful, extendable tools for developing web applications are already provided for your convenience. + Logging is made through the SLF4J logging facade. It can be directed to the log infrastructure of the Web application (using the logging facility provided by the Servlet API) by addind the [webapp slf4j logger](https://github.com/arkanovicz/webapp-slf4j-logger) into the classpath. +## Installation + +For inclusion in a Maven project, use the following dependency block: + +:::xml + +org.apache.velocity.tools +velocity-tools-view +3.0 + + +Otherwise, see the [download page](/download.html#tools) for how to get the Velocity View Tools jar. + ## Default Configuration The default configuration provided for VelocityView is [here](http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml?view=markup;) and [here](http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/resources/org/apache/velocity/tools/view/tools.xml?view=markup).
svn commit: r1842456 - /velocity/site/cms/trunk/content/tools/devel/index.mdtext
Author: cbrisson Date: Mon Oct 1 10:14:45 2018 New Revision: 1842456 URL: http://svn.apache.org/viewvc?rev=1842456=rev Log: [site/tools] New Features section Modified: velocity/site/cms/trunk/content/tools/devel/index.mdtext Modified: velocity/site/cms/trunk/content/tools/devel/index.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/index.mdtext?rev=1842456=1842455=1842456=diff == --- velocity/site/cms/trunk/content/tools/devel/index.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/index.mdtext Mon Oct 1 10:14:45 2018 @@ -20,8 +20,10 @@ In recognition of these varying aims, th Velocity Tools 3.0 new features: -+ A [Maven plugin](maven-velocity-tools-plugin/index.html) to allow embedding of JSP tag libraries inside Velocity templates. ++ New generic [CollectionTool](apidocs/org/apache/velocity/tools/generic/CollectionTool.html) which replaces and enhances the former SortTool. ++ New generic [JsonTool](apidocs/org/apache/velocity/tools/generic/JsonTool.html) and view [JsonTool](apidocs/org/apache/velocity/tools/view/JsonTool.html). + New generic [LogTool](apidocs/org/apache/velocity/tools/generic/LogTool.html). ++ A [Maven plugin](maven-velocity-tools-plugin/index.html) to allow embedding of JSP tag libraries inside Velocity templates. See the [Upgrading section](upgrading.html) for a complete list of changes.
svn commit: r1842455 - /velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext
Author: cbrisson Date: Mon Oct 1 10:14:06 2018 New Revision: 1842455 URL: http://svn.apache.org/viewvc?rev=1842455=rev Log: [site/tools] Fix links Modified: velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext Modified: velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext?rev=1842455=1842454=1842455=diff == --- velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext Mon Oct 1 10:14:06 2018 @@ -6,7 +6,9 @@ Title: Apache Velocity Tools - Framework ## Overview -VelocityTools is not meant to be a framework in itself, but rather should ideally be integrated with other frameworks for applications of much size. The simplest means of integration is to have your framework handle requests, placing contextual data into the request, session or servlet context attributes where templates and/or tools can find them, then forward those requests to a VelocityViewServlet or VelocityLayoutServlet, letting those servlets manage your VelocityView support for you and render your templates into the response. If, however, your framework is one like Spring MVC and you either cannot or do not wish to forward requests to one of the provided servlets, then the instructions, tips and code below should make it easy for you to integrate VelocityTools support into your framework of choice. +This section covers the integration of the Velocity Tools in a J2EE environment. + +Although VelocityTools can be used without any specific framework, it is rather meant to be integrated with other frameworks for applications of much size. The simplest means of integration is to have your framework handle requests, placing contextual data into the request, session or servlet context attributes where templates and/or tools can find them, then forward those requests to a VelocityViewServlet or VelocityLayoutServlet, letting those servlets manage your VelocityView support for you and render your templates into the response. If, however, your framework is one like Spring MVC and you either cannot or do not wish to forward requests to one of the provided servlets, then the instructions, tips and code below should make it easy for you to integrate VelocityTools support into your framework of choice. ## Integration Via VelocityView @@ -14,29 +16,28 @@ VelocityTools is not meant to be a frame [VelocityView](apidocs/org/apache/velocity/tools/view/VelocityView.html) supports the following configuration parameters as application s or as specific servlet s in web.xml: -**org.apache.velocity.toolbox** -: Path and name of the toolbox configuration file. The path must be relative to the web application root directory. If this parameter is not found, the servlet will check for a toolbox file at `/WEB-INF/tools.xml`. - -**org.apache.velocity.properties** -: Path and name of the Velocity configuration file. The path must be relative to the web application root directory. If this parameter is not present, Velocity will check for a properties file at `/WEB-INF/velocity.properties`. If no file is found there, then Velocity is initialized with the settings in the classpath at `org.apache.velocity.tools.view.velocity.properties`. +**org.apache.velocity.properties** = `/WEB-INF/velocity.properties` +: Path and name of the Velocity engine configuration file. The path must be relative to the web application root directory. First and foremost, the engine configuration is initialized with default settings found in the classpath at `org.apache.velocity.tools.view.velocity.properties`. If this parameter is not present, Velocity will check for a properties file at `/WEB-INF/velocity.properties`. -**org.apache.velocity.tools.deprecationSupportMode** -: Tells VelocityView whether or not it should -: + support old tools that rely on init(Object) methods, -: + look for and translate old toolbox.xml configurations, and -: + use the deprecated ChainedContext class instead of ViewToolContext. -: By default, this is true, so turn it to false if you want to fully upgrade to the new systems. Also, specific tools may look for and respect the deprecationSupportMode setting (e.g. ValueParser, ResourceTool) to provide old behavior where it has otherwise changed. +**`org.apache.velocity.tools`** = `/WEB-INF/tools.xml` +: Path and name of the tools configuration file. The path must be relative to the web application root directory. If this parameter is not found, the servlet will check for a toolbox file at `/WEB-INF/tools.xml`. -**org.apache.velocity.tools.loadDefaults** +**`org.apache.velocity.tools.loadDefaults`** = `true` | **`false`** : Tells VelocityView whether or not it should include the default tools.xml configurations provided in the
svn commit: r1842464 - in /velocity/site/production: tools/devel/changes.html tools/devel/dependencies.html tools/devel/frameworks.html tools/devel/generic.html tools/devel/index.html tools/devel/upgr
Author: cbrisson Date: Mon Oct 1 10:26:56 2018 New Revision: 1842464 URL: http://svn.apache.org/viewvc?rev=1842464=rev Log: [site] Push previous tools change (plus how-we-are page) to production Modified: velocity/site/production/tools/devel/changes.html velocity/site/production/tools/devel/dependencies.html velocity/site/production/tools/devel/frameworks.html velocity/site/production/tools/devel/generic.html velocity/site/production/tools/devel/index.html velocity/site/production/tools/devel/upgrading.html velocity/site/production/tools/devel/view.html velocity/site/production/who-we-are.html Modified: velocity/site/production/tools/devel/changes.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/changes.html?rev=1842464=1842463=1842464=diff == --- velocity/site/production/tools/devel/changes.html (original) +++ velocity/site/production/tools/devel/changes.html Mon Oct 1 10:26:56 2018 @@ -280,6 +280,55 @@ h2:hover > .headerlink, h3:hover > .head + + + upgraded to servlet API 3.1.0 . +michaelo + + + + + + JsonTool now uses an explicit dependency to com.github.cliftonlabs.json-simple . +michaelo + + + + + + The tools.xml file can now use XInclude file inclusion mechanism . +cbrisson + + + + + + Most tools are now serializable . +cbrisson + + + + + + CollectionTool.sort() now filters out null elements . +cbrisson + + + + + + ViewLayoutServlet layout cannot be changed using GET parameters, unless configured with the tools.view.servlet.layout.dynamic servlet param to true . +cbrisson + + + + + + Review tools-view initialization: default tools are now loaded only when asked for via the org.apache.velocity.tools.loadDefaults parameter (as an init or servlet parameter). . +cbrisson + + + Drop undocumented autoloaded tools feature, and have org.apache.velocity.tools.loadDefaults default to false . @@ -412,13 +461,6 @@ h2:hover > .headerlink, h3:hover > .head cbrisson - - - - upgraded to servlet API 3.0.1 . -cbrisson - - Modified: velocity/site/production/tools/devel/dependencies.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/dependencies.html?rev=1842464=1842463=1842464=diff == --- velocity/site/production/tools/devel/dependencies.html (original) +++ velocity/site/production/tools/devel/dependencies.html Mon Oct 1 10:26:56 2018 @@ -251,12 +251,12 @@ h2:hover > .headerlink, h3:hover > .head Required for xml configuration (and UIDependencyTool view tool) -com.googlecode.json-simple +com.github.cliftonlabs.json-simple 1.1.1 Yes No No -Required only at compilation time for JsonTool +Required for JsonTool junit @@ -291,7 +291,7 @@ h2:hover > .headerlink, h3:hover > .head servletapi -3.0.1+ +3.1.0 Yes Yes No Modified: velocity/site/production/tools/devel/frameworks.html URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/frameworks.html?rev=1842464=1842463=1842464=diff == --- velocity/site/production/tools/devel/frameworks.html (original) +++ velocity/site/production/tools/devel/frameworks.html Mon Oct 1 10:26:56 2018 @@ -227,54 +227,62 @@ h2:hover > .headerlink, h3:hover > .head Overview -VelocityTools is not meant to be a framework in itself, but rather should ideally be integrated with other frameworks for applications of much size. The simplest means of integration is to have your framework handle requests, placing contextual data into the request, session or servlet context attributes where templates and/or tools can find them, then forward those requests to a VelocityViewServlet or VelocityLayoutServlet, letting those servlets manage your VelocityView support for you and render your templates into the response. If, however, your framework is one like Spring MVC and you either cannot or do not wish to forward requests to one of the provided servlets, then the instructions, tips and code below should make it easy for you to integrate VelocityTools support into your framework of choice. +This section covers the integration of the Velocity Tools in a J2EE environment. +Although VelocityTools can be used without any specific framework, it is rather meant to be integrated with
svn commit: r1842528 - /velocity/site/cms/trunk/content/tools/devel/index.mdtext
Author: cbrisson Date: Mon Oct 1 17:31:23 2018 New Revision: 1842528 URL: http://svn.apache.org/viewvc?rev=1842528=rev Log: [site/tools] Mention the tools now use Velocity Engine v2.0 Modified: velocity/site/cms/trunk/content/tools/devel/index.mdtext Modified: velocity/site/cms/trunk/content/tools/devel/index.mdtext URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/devel/index.mdtext?rev=1842528=1842527=1842528=diff == --- velocity/site/cms/trunk/content/tools/devel/index.mdtext (original) +++ velocity/site/cms/trunk/content/tools/devel/index.mdtext Mon Oct 1 17:31:23 2018 @@ -20,6 +20,7 @@ In recognition of these varying aims, th Velocity Tools 3.0 new features: ++ Use of Velocity Engine v2.0. + New generic [CollectionTool](apidocs/org/apache/velocity/tools/generic/CollectionTool.html) which replaces and enhances the former SortTool. + New generic [JsonTool](apidocs/org/apache/velocity/tools/generic/JsonTool.html) and view [JsonTool](apidocs/org/apache/velocity/tools/view/JsonTool.html). + New generic [LogTool](apidocs/org/apache/velocity/tools/generic/LogTool.html).
svn commit: r1842529 - in /velocity/site/cms/trunk/content/tools/3.0: ./ dependencies.mdtext frameworks.mdtext generic.mdtext index.mdtext upgrading.mdtext view.mdtext
Author: cbrisson Date: Mon Oct 1 17:43:17 2018 New Revision: 1842529 URL: http://svn.apache.org/viewvc?rev=1842529=rev Log: [site/tools] Prepare tools 3.0 site Added: velocity/site/cms/trunk/content/tools/3.0/ - copied from r1842441, velocity/site/cms/trunk/content/tools/devel/ velocity/site/cms/trunk/content/tools/3.0/dependencies.mdtext - copied unchanged from r1842453, velocity/site/cms/trunk/content/tools/devel/dependencies.mdtext velocity/site/cms/trunk/content/tools/3.0/frameworks.mdtext - copied unchanged from r1842455, velocity/site/cms/trunk/content/tools/devel/frameworks.mdtext velocity/site/cms/trunk/content/tools/3.0/generic.mdtext - copied unchanged from r1842462, velocity/site/cms/trunk/content/tools/devel/generic.mdtext velocity/site/cms/trunk/content/tools/3.0/index.mdtext - copied, changed from r1842528, velocity/site/cms/trunk/content/tools/devel/index.mdtext velocity/site/cms/trunk/content/tools/3.0/upgrading.mdtext - copied unchanged from r1842457, velocity/site/cms/trunk/content/tools/devel/upgrading.mdtext velocity/site/cms/trunk/content/tools/3.0/view.mdtext - copied unchanged from r1842462, velocity/site/cms/trunk/content/tools/devel/view.mdtext Copied: velocity/site/cms/trunk/content/tools/3.0/index.mdtext (from r1842528, velocity/site/cms/trunk/content/tools/devel/index.mdtext) URL: http://svn.apache.org/viewvc/velocity/site/cms/trunk/content/tools/3.0/index.mdtext?p2=velocity/site/cms/trunk/content/tools/3.0/index.mdtext=velocity/site/cms/trunk/content/tools/devel/index.mdtext=1842528=1842529=1842529=diff == --- velocity/site/cms/trunk/content/tools/devel/index.mdtext (original) +++ velocity/site/cms/trunk/content/tools/3.0/index.mdtext Mon Oct 1 17:43:17 2018 @@ -28,16 +28,6 @@ Velocity Tools 3.0 new features: See the [Upgrading section](upgrading.html) for a complete list of changes. -## Why 2.0? - -Those already familiar with VelocityTools 1.x may be curious about the goals and motivations behind developing VelocityTools 2. In planning and developing the 2.0 release, there were three main goals: - -+ Transparent, on-demand tool instantiation (aka lazy loading for tools) - This allows you to have many tools available (even ones that are expensive to instantiate), but not waste time instantiating or initializing/configuring those you don't use for every request. -+ More accessible, reusable infrastructure - This allows easier access to tools outside of your templates and provides better means to integrate VelocityTools support into other web frameworks or even other view technologies (e.g. VelocityViewTag). -+ Simpler, more flexible toolbox [configuration](configuration.html) - Now you can configure via a [properties file](config-properties.html), [plain java](config-java.html), or really whatever you want (though perhaps with a bit more work). No [XML](config-xml.html) required anymore; though, if you do use it, it's now a lot better than it was. - -These things could not have been accomplished without rewriting most of the core infrastructure and configuration code. At the same time, we wanted to make it easy for people to upgrade from the 1.x series. This led to the decision to aim for complete backwards compatibility. Granted much has been deprecated and those who directly used or extended the 1.x infrastructure will have to update their code in just a few releases, but for the time being they should be able to use 2.0 in their applications with few problems. Those who merely used the old toolbox.xml format or the old tools directly will be immediately able to take advantage of the new infrastructure without even updating their configuration, though eventually even the old toolbox.xml format may be retired. Don't cry. You'll like the [new one](config-xml.html) better once you get to know it! It can do much more with much less typing. - ## Subversion Repository All VelocityTools project code is maintained in the Subversion repository which can be reached in a number of ways. The most direct method of accessing the repository is through a web browser, but to effectively work on the code, a [Subversion client](http://svn.tigris.org/links.html#clients) is required.
svn commit: r1842530 - in /velocity/site/production/tools: 3.0/ 3.0/apidocs/ 3.0/apidocs/org/ 3.0/apidocs/org/apache/ 3.0/apidocs/org/apache/velocity/ 3.0/apidocs/org/apache/velocity/tools/ 3.0/apidoc
Author: cbrisson Date: Mon Oct 1 17:54:48 2018 New Revision: 1842530 URL: http://svn.apache.org/viewvc?rev=1842530=rev Log: [site/tools] tools 3.0 pages in prod [This commit notification would consist of 111 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1842523 - in /velocity/tools/trunk: velocity-tools-generic/src/main/java/org/apache/velocity/tools/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ velocity-tools-g
Author: cbrisson
Date: Mon Oct 1 17:27:15 2018
New Revision: 1842523
URL: http://svn.apache.org/viewvc?rev=1842523=rev
Log:
[tools] Still some javadoc fixes
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.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/ResourceTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserToolDeprecatedMethods.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.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/JsonTool.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/PagerTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ServletUtils.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContext.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewImportSupport.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XmlTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java?rev=1842523=1842522=1842523=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java
Mon Oct 1 17:27:15 2018
@@ -47,8 +47,8 @@ import org.apache.velocity.tools.config.
*
* Of course, most users will not have to do any of this
* as much of it is handled for them by some combination of
- * {@link ToolManager} or {@link org.apache.velocity.tools.view.VelocityView}
- * and a {@link ToolContext} or {@link
org.apache.velocity.tools.view.ViewToolContext}.
+ * {@link ToolManager} or org.apache.velocity.tools.view.VelocityView
+ * and a {@link ToolContext} or org.apache.velocity.tools.view.ViewToolContext.
*
* NOTE: While you are free to pass in new configuration info
* at any time, that data will only affect {@link Toolbox}es created
subsequently.
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java?rev=1842523=1842522=1842523=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
(original)
+++
svn commit: r1842525 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: cbrisson
Date: Mon Oct 1 17:29:13 2018
New Revision: 1842525
URL: http://svn.apache.org/viewvc?rev=1842525=rev
Log:
[maven-release-plugin] prepare release 3.0
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-examples/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
velocity/tools/trunk/velocity-tools-view/pom.xml
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842525=1842524=1842525=diff
==
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Oct 1 17:29:13 2018
@@ -19,8 +19,7 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
@@ -31,7 +30,7 @@
org.apache.velocity.tools
velocity-tools-parent
- 3.0-SNAPSHOT
+ 3.0
pom
VelocityTools
@@ -56,9 +55,9 @@
-
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk
-
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk
-https://svn.apache.org/viewvc/velocity/tools/trunk
+
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0
+
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0
+https://svn.apache.org/viewvc/velocity/tools/tags/3.0
jira
@@ -203,7 +202,7 @@
org.apache.velocity.tools.examples
${javadoc.opts}
-
+
Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842525=1842524=1842525=diff
==
--- velocity/tools/trunk/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 17:29:13
2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-parent
-3.0-SNAPSHOT
+3.0
velocity-tools-examples
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842525=1842524=1842525=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
Mon Oct 1 17:29:13 2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-examples
-3.0-SNAPSHOT
+3.0
velocity-tools-examples-showcase
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842525=1842524=1842525=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
Mon Oct 1 17:29:13 2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
svn commit: r1842527 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: cbrisson Date: Mon Oct 1 17:29:31 2018 New Revision: 1842527 URL: http://svn.apache.org/viewvc?rev=1842527=rev Log: [maven-release-plugin] prepare for next development iteration Modified: velocity/tools/trunk/pom.xml velocity/tools/trunk/velocity-tools-examples/pom.xml velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml velocity/tools/trunk/velocity-tools-generic/pom.xml velocity/tools/trunk/velocity-tools-view-jsp/pom.xml velocity/tools/trunk/velocity-tools-view/pom.xml Modified: velocity/tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/pom.xml (original) +++ velocity/tools/trunk/pom.xml Mon Oct 1 17:29:31 2018 @@ -30,7 +30,7 @@ org.apache.velocity.tools velocity-tools-parent - 3.0 + 3.1-SNAPSHOT pom VelocityTools @@ -55,9 +55,9 @@ - scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0 - scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0 -https://svn.apache.org/viewvc/velocity/tools/tags/3.0 + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk +https://svn.apache.org/viewvc/velocity/tools/trunk jira Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-examples/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-examples Modified: velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-examples -3.0 +3.1-SNAPSHOT velocity-tools-examples-showcase Modified: velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-examples -3.0 +3.1-SNAPSHOT velocity-tools-examples-simple Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-generic/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-generic/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-generic Modified: velocity/tools/trunk/velocity-tools-view-jsp/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view-jsp/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-view-jsp/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-view-jsp/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-view-jsp Modified: velocity/tools/trunk/velocity-tools-view/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/pom.xml?rev=1842527=1842526=1842527=diff == --- velocity/tools/trunk/velocity-tools-view/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-view/pom.xml Mon Oct 1 17:29:31 2018 @@ -25,7 +25,7 @@
svn commit: r1842526 - /velocity/tools/tags/3.0/
Author: cbrisson Date: Mon Oct 1 17:29:27 2018 New Revision: 1842526 URL: http://svn.apache.org/viewvc?rev=1842526=rev Log: [maven-release-plugin] copy for tag 3.0 Added: velocity/tools/tags/3.0/ (props changed) - copied from r1842525, velocity/tools/trunk/ Propchange: velocity/tools/tags/3.0/ -- --- svn:ignore (added) +++ svn:ignore Mon Oct 1 17:29:27 2018 @@ -0,0 +1,7 @@ +target +build +classes +dist +lib +docs +.* Propchange: velocity/tools/tags/3.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 1 17:29:27 2018 @@ -0,0 +1,3 @@ +/velocity/tools/branches/VELTOOLS-177:1841696-1842346 +/velocity/tools/branches/VELTOOLS-178:1842409-1842427 +/velocity/tools/branches/VELTOOLS-179:1842406-1842428
svn commit: r1842551 - /velocity/tools/tags/3.0/
Author: cbrisson Date: Mon Oct 1 20:08:28 2018 New Revision: 1842551 URL: http://svn.apache.org/viewvc?rev=1842551=rev Log: [tools] drop premature 3.0 tag Removed: velocity/tools/tags/3.0/
svn commit: r1842554 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: cbrisson
Date: Mon Oct 1 20:12:04 2018
New Revision: 1842554
URL: http://svn.apache.org/viewvc?rev=1842554=rev
Log:
[tools] revert release candidate (missing correct version in changelog)
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-examples/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
velocity/tools/trunk/velocity-tools-view/pom.xml
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842554=1842553=1842554=diff
==
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Oct 1 20:12:04 2018
@@ -19,7 +19,8 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
@@ -30,7 +31,7 @@
org.apache.velocity.tools
velocity-tools-parent
- 3.1-SNAPSHOT
+ 3.0-SNAPSHOT
pom
VelocityTools
@@ -202,7 +203,7 @@
org.apache.velocity.tools.examples
${javadoc.opts}
-
+
Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842554=1842553=1842554=diff
==
--- velocity/tools/trunk/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 20:12:04
2018
@@ -19,13 +19,14 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-parent
-3.1-SNAPSHOT
+3.0-SNAPSHOT
velocity-tools-examples
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842554=1842553=1842554=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
Mon Oct 1 20:12:04 2018
@@ -19,13 +19,14 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-examples
-3.1-SNAPSHOT
+3.0-SNAPSHOT
velocity-tools-examples-showcase
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842554=1842553=1842554=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
Mon Oct 1 20:12:04 2018
@@ -19,13 +19,14 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-examples
-3.1-SNAPSHOT
+3.0-SNAPSHOT
velocity-tools-examples-simple
Modified:
svn commit: r1842555 - /velocity/tools/trunk/src/changes/changes.xml
Author: cbrisson Date: Mon Oct 1 20:14:07 2018 New Revision: 1842555 URL: http://svn.apache.org/viewvc?rev=1842555=rev Log: [tools] Fix changelog Modified: velocity/tools/trunk/src/changes/changes.xml Modified: velocity/tools/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/changes/changes.xml?rev=1842555=1842554=1842555=diff == --- velocity/tools/trunk/src/changes/changes.xml (original) +++ velocity/tools/trunk/src/changes/changes.xml Mon Oct 1 20:14:07 2018 @@ -24,17 +24,17 @@ Changelog - + upgraded to servlet API 3.1.0 - + JsonTool now uses an explicit dependency to com.github.cliftonlabs.json-simple - + The tools.xml file can now use XInclude file inclusion mechanism - + Most tools are now serializable @@ -139,7 +139,7 @@ Switched log system facade to SLF4j -Upgraded to JUnit 4.12, Servlet API 3.0.1, Dom4j 1.6.1, commons-beanutils 1.9.3, commons-digester 3.2, and Velocity Engine 2.0. +Upgraded to JUnit 4.12, commons-beanutils 1.9.3, commons-digester 3.2, and Velocity Engine 2.0.
svn commit: r1842556 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: cbrisson
Date: Mon Oct 1 20:15:09 2018
New Revision: 1842556
URL: http://svn.apache.org/viewvc?rev=1842556=rev
Log:
[maven-release-plugin] prepare release 3.0
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-examples/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
velocity/tools/trunk/velocity-tools-view/pom.xml
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842556=1842555=1842556=diff
==
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Mon Oct 1 20:15:09 2018
@@ -19,8 +19,7 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
@@ -31,7 +30,7 @@
org.apache.velocity.tools
velocity-tools-parent
- 3.0-SNAPSHOT
+ 3.0
pom
VelocityTools
@@ -56,9 +55,9 @@
-
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk
-
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk
-https://svn.apache.org/viewvc/velocity/tools/trunk
+
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0
+
scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0
+https://svn.apache.org/viewvc/velocity/tools/tags/3.0
jira
@@ -203,7 +202,7 @@
org.apache.velocity.tools.examples
${javadoc.opts}
-
+
Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842556=1842555=1842556=diff
==
--- velocity/tools/trunk/velocity-tools-examples/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 20:15:09
2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-parent
-3.0-SNAPSHOT
+3.0
velocity-tools-examples
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842556=1842555=1842556=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
Mon Oct 1 20:15:09 2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
org.apache.velocity.tools
velocity-tools-examples
-3.0-SNAPSHOT
+3.0
velocity-tools-examples-showcase
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842556=1842555=1842556=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml
Mon Oct 1 20:15:09 2018
@@ -19,14 +19,13 @@
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
svn commit: r1842557 - /velocity/tools/tags/3.0/
Author: cbrisson Date: Mon Oct 1 20:15:23 2018 New Revision: 1842557 URL: http://svn.apache.org/viewvc?rev=1842557=rev Log: [maven-release-plugin] copy for tag 3.0 Added: velocity/tools/tags/3.0/ (props changed) - copied from r1842556, velocity/tools/trunk/ Propchange: velocity/tools/tags/3.0/ -- --- svn:ignore (added) +++ svn:ignore Mon Oct 1 20:15:23 2018 @@ -0,0 +1,7 @@ +target +build +classes +dist +lib +docs +.* Propchange: velocity/tools/tags/3.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 1 20:15:23 2018 @@ -0,0 +1,3 @@ +/velocity/tools/branches/VELTOOLS-177:1841696-1842346 +/velocity/tools/branches/VELTOOLS-178:1842409-1842427 +/velocity/tools/branches/VELTOOLS-179:1842406-1842428
svn commit: r29832 - in /dev/velocity/velocity-tools: ./ 3.0/
Author: cbrisson Date: Mon Oct 1 20:32:11 2018 New Revision: 29832 Log: [dist/tools] velocity-tools 3.0 RC1 distribution files Added: dev/velocity/velocity-tools/ dev/velocity/velocity-tools/3.0/ dev/velocity/velocity-tools/3.0/release-notes.html dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-javadoc.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-javadoc.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-javadoc.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-javadoc.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-sources.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-sources.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-sources.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0-sources.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-generic-3.0.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-javadoc.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-javadoc.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-javadoc.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-javadoc.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-sources.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-sources.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-sources.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0-sources.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-3.0.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-javadoc.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-sources.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-sources.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-sources.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0-sources.jar.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0.jar (with props) dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0.jar.asc dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0.jar.asc.sha1 dev/velocity/velocity-tools/3.0/velocity-tools-view-jsp-3.0.jar.sha1 Added: dev/velocity/velocity-tools/3.0/release-notes.html == --- dev/velocity/velocity-tools/3.0/release-notes.html (added) +++ dev/velocity/velocity-tools/3.0/release-notes.html Mon Oct 1 20:32:11 2018 @@ -0,0 +1,195 @@ + + + + +Velocity Tools 3.0 + + +Velocity Tools 3.0 Release Notes +The Velocity team is pleased to announce the availability of Velocity Tools 3.0. +Main changes: + + Velocity Tools now relies on Velocity Engine 2.0. + New tools: CollectionTool, JsonTool. + Some tools have been completely rewritten: BrowserTool, ImportTool, XmlTool. + The groupId is now org.apache.velocity.tools. + +Here is the full list of changes: + +New Features + + [VELTOOLS-88] - LinkTool could easily be modified to support current-request parameter duplication + + [VELTOOLS-119] - use input.encoding since 1.4 + + [VELTOOLS-132] - Allow use of JSP tag libraries + + [VELTOOLS-144] - DateTool can be improved to allow cross-localization of format strings + + [VELTOOLS-156] - SortTool should allow arbitrary Comparators to be specified + + New generic LogTool to emit logs from inside templates + Added a new JsonTool for parsing json. It is in two flavors, the generic tools one and the view tools one. The view tools flavor +allows the parsing of http query json post data. + + +Improvements + + [VELTOOLS-62] - New empty interfaces that allow one to enforce the scope of a tool + + [VELTOOLS-75] - Add MessageTool.get method that accepts an explicit Locale + + [VELTOOLS-81] - Patch to add escaping for
svn commit: r1842558 - in /velocity/tools/trunk: ./ velocity-tools-examples/ velocity-tools-examples/velocity-tools-examples-showcase/ velocity-tools-examples/velocity-tools-examples-simple/ velocity-
Author: cbrisson Date: Mon Oct 1 20:15:28 2018 New Revision: 1842558 URL: http://svn.apache.org/viewvc?rev=1842558=rev Log: [maven-release-plugin] prepare for next development iteration Modified: velocity/tools/trunk/pom.xml velocity/tools/trunk/velocity-tools-examples/pom.xml velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml velocity/tools/trunk/velocity-tools-generic/pom.xml velocity/tools/trunk/velocity-tools-view-jsp/pom.xml velocity/tools/trunk/velocity-tools-view/pom.xml Modified: velocity/tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/pom.xml (original) +++ velocity/tools/trunk/pom.xml Mon Oct 1 20:15:28 2018 @@ -30,7 +30,7 @@ org.apache.velocity.tools velocity-tools-parent - 3.0 + 3.1-SNAPSHOT pom VelocityTools @@ -55,9 +55,9 @@ - scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0 - scm:svn:https://svn.apache.org/repos/asf/velocity/tools/tags/3.0 -https://svn.apache.org/viewvc/velocity/tools/tags/3.0 + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk + scm:svn:https://svn.apache.org/repos/asf/velocity/tools/trunk +https://svn.apache.org/viewvc/velocity/tools/trunk jira Modified: velocity/tools/trunk/velocity-tools-examples/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-examples/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-examples Modified: velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-examples -3.0 +3.1-SNAPSHOT velocity-tools-examples-showcase Modified: velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-simple/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-examples -3.0 +3.1-SNAPSHOT velocity-tools-examples-simple Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-generic/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-generic/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-generic Modified: velocity/tools/trunk/velocity-tools-view-jsp/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view-jsp/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-view-jsp/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-view-jsp/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@ org.apache.velocity.tools velocity-tools-parent -3.0 +3.1-SNAPSHOT velocity-tools-view-jsp Modified: velocity/tools/trunk/velocity-tools-view/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/pom.xml?rev=1842558=1842557=1842558=diff == --- velocity/tools/trunk/velocity-tools-view/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-view/pom.xml Mon Oct 1 20:15:28 2018 @@ -25,7 +25,7 @@
