Author: cbrisson
Date: Mon Jul 11 12:31:48 2011
New Revision: 1145142
URL: http://svn.apache.org/viewvc?rev=1145142&view=rev
Log:
reflet shading of commons-lang and commons-collections packages
Modified:
velocity/tools/trunk/src/site/xdoc/dependencies.xml
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.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/VelocityViewServlet.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
Modified: velocity/tools/trunk/src/site/xdoc/dependencies.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/src/site/xdoc/dependencies.xml?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
--- velocity/tools/trunk/src/site/xdoc/dependencies.xml (original)
+++ velocity/tools/trunk/src/site/xdoc/dependencies.xml Mon Jul 11 12:31:48 2011
@@ -55,13 +55,6 @@
</td>
</tr>
<tr>
- <td>commons-collections</td>
- <td>3.1</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Velocity requires this.</td>
- </tr>
- <tr>
<td>commons-digester</td>
<td>1.8</td>
<td>Yes</td>
@@ -71,15 +64,6 @@
</td>
</tr>
<tr>
- <td>commons-lang</td>
- <td>2.1</td>
- <td>Yes</td>
- <td>No</td>
- <td>Required for
- <a
href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a>
- </td>
- </tr>
- <tr>
<td>commons-logging</td>
<td>1.1</td>
<td>Yes</td>
@@ -140,13 +124,6 @@
</td>
</tr>
<tr>
- <td>commons-collections</td>
- <td>3.1</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Velocity requires this.</td>
- </tr>
- <tr>
<td>commons-digester</td>
<td>1.8</td>
<td>Yes</td>
@@ -156,17 +133,6 @@
</td>
</tr>
<tr>
- <td>commons-lang</td>
- <td>2.1</td>
- <td>Yes</td>
- <td>No</td>
- <td>Required for
- <a
href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a>
- and
- <a
href="javadoc/org/apache/velocity/tools/view/VelocityViewServlet.html">VelocityViewServlet</a>
- </td>
- </tr>
- <tr>
<td>commons-logging</td>
<td>1.1</td>
<td>Yes</td>
@@ -249,13 +215,6 @@
<td>Struts 1.3+ requires this.</td>
</tr>
<tr>
- <td>commons-collections</td>
- <td>3.1</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Velocity requires this.</td>
- </tr>
- <tr>
<td>commons-digester</td>
<td>1.8</td>
<td>Yes</td>
@@ -265,17 +224,6 @@
</td>
</tr>
<tr>
- <td>commons-lang</td>
- <td>2.1</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Required for Struts,
- <a
href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a>
- and
- <a
href="javadoc/org/apache/velocity/tools/view/VelocityViewServlet.html">VelocityViewServlet</a>
- </td>
- </tr>
- <tr>
<td>commons-logging</td>
<td>1.1</td>
<td>Yes</td>
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
Mon Jul 11 12:31:48 2011
@@ -23,7 +23,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.util.Iterator;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.collections.ExtendedProperties;
+import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
/**
* <p> This reads in configuration info formatted as a property
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=1145142&r1=1145141&r2=1145142&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
Mon Jul 11 12:31:48 2011
@@ -21,7 +21,7 @@ package org.apache.velocity.tools.generi
import java.net.URLEncoder;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.velocity.shaded.commons.lang.StringEscapeUtils;
import org.apache.velocity.tools.config.DefaultKey;
/**
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Mon Jul 11 12:31:48 2011
@@ -30,7 +30,6 @@ import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
@@ -38,6 +37,7 @@ import org.apache.velocity.exception.Res
import org.apache.velocity.io.VelocityWriter;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.log.Log;
+import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
import org.apache.velocity.tools.generic.log.LogChuteCommonsLog;
import org.apache.velocity.tools.ClassUtils;
import org.apache.velocity.tools.Scope;
@@ -319,7 +319,7 @@ public class VelocityView extends ViewTo
/**
* Initializes the Velocity runtime, first calling
* loadConfiguration(JeeConfig) to get a
- * org.apache.commons.collections.ExtendedProperties
+ * org.apache.velocity.shaded.commons.collections.ExtendedProperties
* of configuration information
* and then calling velocityEngine.init(). Override this
* to do anything to the environment before the
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
Mon Jul 11 12:31:48 2011
@@ -29,12 +29,12 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.log.Log;
+import org.apache.velocity.shaded.commons.lang.StringEscapeUtils;
/**
* <p>A servlet to process Velocity templates. This is comparable to the
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
Mon Jul 11 12:31:48 2011
@@ -23,10 +23,10 @@ import java.io.File;
import java.io.InputStream;
import java.util.HashMap;
import javax.servlet.ServletContext;
-import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
/**
* Resource loader that uses the ServletContext of a webapp to
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java?rev=1145142&r1=1145141&r2=1145142&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
Mon Jul 11 12:31:48 2011
@@ -19,8 +19,8 @@ package org.apache.velocity.tools.view.s
* under the License.
*/
+import org.apache.velocity.shaded.commons.collections.ExtendedProperties;
import org.apache.velocity.tools.view.WebappResourceLoader;
-import org.apache.commons.collections.ExtendedProperties;
/**
* <p>This is basically an empty subclass of {@link WebappResourceLoader} that
exists
