2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java 2024-02-25 20:10:38.639408321 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringEscapeUtils;
|
|
|
|
+import org.apache.commons.lang3.StringEscapeUtils;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Escape all HTML entities.
|
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
*/
|
|
|
|
protected String escape(Object text)
|
|
|
|
{
|
|
|
|
- return StringEscapeUtils.escapeHtml(text.toString());
|
|
|
|
+ return StringEscapeUtils.escapeHtml4(text.toString());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java 2024-02-25 20:10:38.639408321 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringEscapeUtils;
|
|
|
|
+import org.apache.commons.lang3.StringEscapeUtils;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Escapes the characters in a String to be suitable for use in JavaScript.
|
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
*/
|
|
|
|
protected String escape(Object text)
|
|
|
|
{
|
|
|
|
- return StringEscapeUtils.escapeJavaScript(text.toString());
|
|
|
|
+ return StringEscapeUtils.escapeEcmaScript(text.toString());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java 2024-02-25 20:10:38.642741661 +0100
|
|
|
|
@@ -19,8 +19,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringEscapeUtils;
|
2024-02-25 21:26:53 +01:00
|
|
|
-
|
2023-09-27 01:14:14 +02:00
|
|
|
/**
|
|
|
|
* Escapes the characters in a String to be suitable to pass to an SQL query.
|
2024-02-25 21:26:53 +01:00
|
|
|
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)">StringEscapeUtils</a>
|
|
|
|
@@ -39,7 +37,8 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
*/
|
|
|
|
protected String escape(Object text)
|
|
|
|
{
|
|
|
|
- return StringEscapeUtils.escapeSql(text.toString());
|
|
|
|
+ // See https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/org/apache/commons/lang/StringEscapeUtils.html#escapeSql(java.lang.String)
|
2024-02-25 21:26:53 +01:00
|
|
|
+ return text.toString().replaceAll("'", "''");
|
2023-09-27 01:14:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java 2024-02-25 20:14:52.949919458 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringEscapeUtils;
|
|
|
|
+import org.apache.commons.lang3.StringEscapeUtils;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Escape all XML entities.
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
*/
|
|
|
|
protected String escape(Object text)
|
|
|
|
{
|
|
|
|
- return StringEscapeUtils.escapeXml(text.toString());
|
|
|
|
+ return StringEscapeUtils.escapeXml10(text.toString());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/Block.java 2024-02-25 20:19:30.850478725 +0100
|
|
|
|
@@ -23,7 +23,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.io.StringWriter;
|
|
|
|
import java.io.Writer;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.TemplateInitException;
|
|
|
|
import org.apache.velocity.runtime.Renderable;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -110,7 +109,7 @@
|
|
|
|
*/
|
|
|
|
protected String id(InternalContextAdapter context)
|
|
|
|
{
|
|
|
|
- StrBuilder str = new StrBuilder(100)
|
|
|
|
+ StringBuilder str = new StringBuilder(100)
|
|
|
|
.append("block $").append(key);
|
|
|
|
if (!context.getCurrentTemplateName().equals(getTemplateName()))
|
|
|
|
{
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java 2024-02-25 20:09:56.325990176 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/directive/RuntimeMacro.java 2024-02-25 20:59:50.755384801 +0100
|
|
|
|
@@ -23,7 +23,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.io.Writer;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.MethodInvocationException;
|
|
|
|
import org.apache.velocity.exception.ParseErrorException;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -184,7 +183,7 @@
|
|
|
|
{
|
|
|
|
if (literal == null)
|
|
|
|
{
|
|
|
|
- StrBuilder buffer = new StrBuilder();
|
|
|
|
+ StringBuilder buffer = new StringBuilder();
|
|
|
|
Token t = node.getFirstToken();
|
|
|
|
|
|
|
|
while (t != null && t != node.getLastToken())
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java 2024-02-25 20:10:38.642741661 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.Writer;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.builder.ToStringBuilder;
|
|
|
|
+import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.MethodInvocationException;
|
|
|
|
import org.apache.velocity.exception.ParseErrorException;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java 2024-02-25 20:10:38.642741661 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -21,8 +21,8 @@
|
|
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.ArrayUtils;
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.app.event.EventHandlerUtil;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.MethodInvocationException;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java 2024-02-25 21:05:38.532745163 +0100
|
|
|
|
@@ -21,7 +21,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.io.StringReader;
|
|
|
|
import java.io.StringWriter;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.TemplateInitException;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -227,14 +226,13 @@
|
|
|
|
*/
|
|
|
|
private String replaceQuotes(String s, char literalQuoteChar)
|
|
|
|
{
|
|
|
|
- if( (literalQuoteChar == '"' && s.indexOf("\"") == -1) ||
|
|
|
|
- (literalQuoteChar == '\'' && s.indexOf("'") == -1) )
|
|
|
|
+ if( (literalQuoteChar == '"' && !s.contains("\"")) ||
|
|
|
|
+ (literalQuoteChar == '\'' && !s.contains("'")) )
|
|
|
|
{
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
- StrBuilder result = new StrBuilder(s.length());
|
|
|
|
- char prev = ' ';
|
|
|
|
+ StringBuilder result = new StringBuilder(s.length());
|
|
|
|
for(int i = 0, is = s.length(); i < is; i++)
|
|
|
|
{
|
|
|
|
char c = s.charAt(i);
|
|
|
|
@@ -264,7 +262,7 @@
|
|
|
|
int u = string.indexOf("\\u");
|
|
|
|
if (u < 0) return string;
|
|
|
|
|
|
|
|
- StrBuilder result = new StrBuilder();
|
|
|
|
+ StringBuilder result = new StringBuilder();
|
|
|
|
|
|
|
|
int lastCopied = 0;
|
|
|
|
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java 2024-02-25 21:11:08.083396305 +0100
|
|
|
|
@@ -19,7 +19,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.context.Context;
|
|
|
|
import org.apache.velocity.exception.MethodInvocationException;
|
|
|
|
import org.apache.velocity.runtime.parser.ParserConstants;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -55,11 +54,11 @@
|
|
|
|
* special tokens, this is simply a way to
|
|
|
|
* extract them.
|
|
|
|
* @param t the Token
|
|
|
|
- * @return StrBuilder with the special tokens.
|
|
|
|
+ * @return StringBuilder with the special tokens.
|
|
|
|
*/
|
|
|
|
- public static StrBuilder getSpecialText(Token t)
|
|
|
|
+ public static StringBuilder getSpecialText(Token t)
|
|
|
|
{
|
|
|
|
- StrBuilder sb = new StrBuilder();
|
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
|
|
|
|
|
Token tmp_t = t.specialToken;
|
|
|
|
|
|
|
|
@@ -153,7 +152,7 @@
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
- StrBuilder special = getSpecialText(t);
|
|
|
|
+ StringBuilder special = getSpecialText(t);
|
|
|
|
if (special.length() > 0)
|
|
|
|
{
|
|
|
|
return special.append(t.image).toString();
|
|
|
|
@@ -187,7 +186,7 @@
|
|
|
|
if( argStr.indexOf('$') == -1 )
|
|
|
|
return argStr;
|
|
|
|
|
|
|
|
- StrBuilder argBuf = new StrBuilder();
|
|
|
|
+ StringBuilder argBuf = new StringBuilder();
|
|
|
|
|
|
|
|
for (int cIdx = 0, is = argStr.length(); cIdx < is;)
|
|
|
|
{
|
|
|
|
@@ -195,7 +194,7 @@
|
|
|
|
|
|
|
|
if( ch == '$' )
|
|
|
|
{
|
|
|
|
- StrBuilder nameBuf = new StrBuilder();
|
|
|
|
+ StringBuilder nameBuf = new StringBuilder();
|
|
|
|
for (++cIdx ; cIdx < is; ++cIdx)
|
|
|
|
{
|
|
|
|
ch = argStr.charAt(cIdx);
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
|
|
|
import org.apache.velocity.runtime.RuntimeLogger;
|
|
|
|
import org.apache.velocity.runtime.log.Log;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java 2024-02-25 21:13:00.260284591 +0100
|
|
|
|
@@ -21,8 +21,7 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
|
|
|
import org.apache.velocity.runtime.log.Log;
|
|
|
|
import org.apache.velocity.util.introspection.Introspector;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -81,7 +80,7 @@
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
- StrBuilder sb = new StrBuilder("set");
|
|
|
|
+ StringBuilder sb = new StringBuilder("set");
|
|
|
|
sb.append(property);
|
|
|
|
|
|
|
|
setMethod(introspector.getMethod(clazz, sb.toString(), params));
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java 2024-02-25 21:14:08.087085246 +0100
|
|
|
|
@@ -22,8 +22,7 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.Writer;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.builder.ToStringBuilder;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
+import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
|
|
import org.apache.velocity.context.InternalContextAdapter;
|
|
|
|
import org.apache.velocity.exception.MethodInvocationException;
|
|
|
|
import org.apache.velocity.exception.ParseErrorException;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -280,7 +279,7 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
Token t = first;
|
|
|
|
- StrBuilder sb = new StrBuilder(NodeUtils.tokenLiteral(t));
|
|
|
|
+ StringBuilder sb = new StringBuilder(NodeUtils.tokenLiteral(t));
|
|
|
|
while (t != last)
|
|
|
|
{
|
|
|
|
t = t.next;
|
|
|
|
@@ -414,7 +413,7 @@
|
|
|
|
*/
|
|
|
|
public String toString()
|
|
|
|
{
|
|
|
|
- StrBuilder tokens = new StrBuilder();
|
|
|
|
+ StringBuilder tokens = new StringBuilder();
|
|
|
|
|
|
|
|
for (Token t = getFirstToken(); t != null; )
|
|
|
|
{
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/Parser.java 2024-02-25 21:14:59.367186560 +0100
|
|
|
|
@@ -10,7 +10,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import org.apache.velocity.runtime.directive.Macro;
|
|
|
|
import org.apache.velocity.runtime.directive.MacroParseException;
|
|
|
|
import org.apache.velocity.util.StringUtils;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.runtime.RuntimeConstants;
|
|
|
|
|
|
|
|
/**
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java 2024-02-25 21:15:47.777282210 +0100
|
|
|
|
@@ -9,7 +9,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import org.apache.velocity.runtime.directive.Macro;
|
|
|
|
import org.apache.velocity.runtime.directive.MacroParseException;
|
|
|
|
import org.apache.velocity.util.StringUtils;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.runtime.RuntimeConstants;
|
|
|
|
|
|
|
|
/** Token Manager. */
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -5158,8 +5157,8 @@
|
|
|
|
protected CharStream input_stream;
|
|
|
|
private final int[] jjrounds = new int[105];
|
|
|
|
private final int[] jjstateSet = new int[210];
|
|
|
|
-private final StrBuilder jjimage = new StrBuilder();
|
|
|
|
-private StrBuilder image = jjimage;
|
|
|
|
+private final StringBuilder jjimage = new StringBuilder();
|
|
|
|
+private StringBuilder image = jjimage;
|
|
|
|
private int jjimageLen;
|
|
|
|
private int lengthOfMatch;
|
|
|
|
protected char curChar;
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
|
|
|
import org.apache.commons.collections.ExtendedProperties;
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.exception.ResourceNotFoundException;
|
|
|
|
import org.apache.velocity.runtime.resource.Resource;
|
|
|
|
import org.apache.velocity.util.ClassUtils;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -218,7 +218,7 @@
|
|
|
|
public synchronized InputStream getResourceStream(final String name)
|
|
|
|
throws ResourceNotFoundException
|
|
|
|
{
|
|
|
|
- if (org.apache.commons.lang.StringUtils.isEmpty(name))
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(name))
|
|
|
|
{
|
|
|
|
throw new ResourceNotFoundException("DataSourceResourceLoader: Template name was empty or null");
|
|
|
|
}
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -118,7 +118,7 @@
|
|
|
|
/*
|
|
|
|
* Make sure we have a valid templateName.
|
|
|
|
*/
|
|
|
|
- if (org.apache.commons.lang.StringUtils.isEmpty(templateName))
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(templateName))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If we don't get a properly formed templateName then
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -195,7 +195,7 @@
|
|
|
|
{
|
|
|
|
InputStream results = null;
|
|
|
|
|
|
|
|
- if (org.apache.commons.lang.StringUtils.isEmpty(source))
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isEmpty(source))
|
|
|
|
{
|
|
|
|
throw new ResourceNotFoundException("Need to have a resource!");
|
|
|
|
}
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
import java.io.InputStream;
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
|
import org.apache.commons.collections.ExtendedProperties;
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.exception.ResourceNotFoundException;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
|
|
|
import org.apache.velocity.runtime.resource.Resource;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
import java.net.URLConnection;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import org.apache.commons.collections.ExtendedProperties;
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
|
|
|
import org.apache.velocity.exception.ResourceNotFoundException;
|
|
|
|
import org.apache.velocity.runtime.resource.Resource;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -158,7 +158,7 @@
|
|
|
|
|
|
|
|
Object cacheObject = null;
|
|
|
|
|
|
|
|
- if (org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName))
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(cacheClassName))
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
@@ -534,7 +534,7 @@
|
|
|
|
* this strikes me as bad...
|
|
|
|
*/
|
|
|
|
|
|
|
|
- if (!org.apache.commons.lang.StringUtils.equals(resource.getEncoding(), encoding))
|
|
|
|
+ if (!org.apache.commons.lang3.StringUtils.equals(resource.getEncoding(), encoding))
|
|
|
|
{
|
|
|
|
log.warn("Declared encoding for template '" +
|
|
|
|
resource.getName() +
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java 2024-02-25 20:09:56.329323516 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/RuntimeInstance.java 2024-02-25 21:17:20.747465879 +0100
|
|
|
|
@@ -32,7 +32,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.util.Properties;
|
|
|
|
|
|
|
|
import org.apache.commons.collections.ExtendedProperties;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.Template;
|
|
|
|
import org.apache.velocity.app.event.EventCartridge;
|
|
|
|
import org.apache.velocity.app.event.EventHandler;
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -1469,7 +1468,7 @@
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now just create the VM call, and use evaluate */
|
|
|
|
- StrBuilder template = new StrBuilder("#");
|
|
|
|
+ StringBuilder template = new StringBuilder("#");
|
|
|
|
template.append(vmName);
|
|
|
|
template.append("(");
|
|
|
|
for( int i = 0; i < params.length; i++)
|
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java 2024-02-25 20:09:56.332656856 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/runtime/VelocimacroFactory.java 2024-02-25 20:10:38.646075001 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
import java.util.Vector;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.velocity.Template;
|
|
|
|
import org.apache.velocity.exception.VelocityException;
|
|
|
|
import org.apache.velocity.runtime.directive.Directive;
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java 2024-02-25 20:09:56.332656856 +0100
|
|
|
|
+++ velocity-1.7/src/java/org/apache/velocity/util/introspection/ClassMap.java 2024-02-25 21:20:43.131199017 +0100
|
|
|
|
@@ -23,7 +23,6 @@
|
2023-09-27 01:14:14 +02:00
|
|
|
import java.lang.reflect.Modifier;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.Map;
|
|
|
|
-import org.apache.commons.lang.text.StrBuilder;
|
|
|
|
import org.apache.velocity.runtime.log.Log;
|
|
|
|
import org.apache.velocity.util.MapFactory;
|
|
|
|
|
2024-02-25 21:26:53 +01:00
|
|
|
@@ -314,7 +313,7 @@
|
|
|
|
return method.getName();
|
|
|
|
}
|
|
|
|
|
|
|
|
- StrBuilder methodKey = new StrBuilder((args+1)*16).append(method.getName());
|
|
|
|
+ StringBuilder methodKey = new StringBuilder((args+1)*16).append(method.getName());
|
|
|
|
|
|
|
|
for (int j = 0; j < args; j++)
|
|
|
|
{
|
|
|
|
@@ -349,7 +348,7 @@
|
|
|
|
return method;
|
|
|
|
}
|
|
|
|
|
|
|
|
- StrBuilder methodKey = new StrBuilder((args+1)*16).append(method);
|
|
|
|
+ StringBuilder methodKey = new StringBuilder((args+1)*16).append(method);
|
|
|
|
|
|
|
|
for (int j = 0; j < args; j++)
|
|
|
|
{
|
|
|
|
--- velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java 2024-02-25 20:09:56.332656856 +0100
|
|
|
|
+++ velocity-1.7/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java 2024-02-25 20:10:38.649408341 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -27,7 +27,7 @@
|
|
|
|
import junit.framework.TestCase;
|
|
|
|
import junit.framework.TestSuite;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.ArrayUtils;
|
|
|
|
+import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java 2024-02-25 20:09:56.335990196 +0100
|
|
|
|
+++ velocity-1.7/src/test/org/apache/velocity/test/BaseTestCase.java 2024-02-25 20:10:38.649408341 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -353,7 +353,7 @@
|
|
|
|
buf.append(baseFile.getPath());
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (org.apache.commons.lang.StringUtils.isNotEmpty(ext))
|
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(ext))
|
|
|
|
{
|
|
|
|
buf.append('.').append(ext);
|
|
|
|
}
|
2024-02-25 21:26:53 +01:00
|
|
|
--- velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java 2024-02-25 20:09:56.335990196 +0100
|
|
|
|
+++ velocity-1.7/src/test/org/apache/velocity/test/MethodCacheKeyTestCase.java 2024-02-25 20:10:38.649408341 +0100
|
2023-09-27 01:14:14 +02:00
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
|
|
import junit.framework.TestCase;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang.ArrayUtils;
|
|
|
|
+import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
import org.apache.velocity.runtime.parser.node.ASTMethod;
|
|
|
|
|
|
|
|
/**
|