You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/12/07 16:01:27 UTC
svn commit: r1043077 - in /velocity/engine/trunk/velocity-engine-core: ./
src/main/java/org/apache/velocity/app/event/implement/
src/main/java/org/apache/velocity/runtime/
src/main/java/org/apache/velocity/runtime/parser/node/
src/main/java/org/apache/...
Author: apetrelli
Date: Tue Dec 7 15:01:25 2010
New Revision: 1043077
URL: http://svn.apache.org/viewvc?rev=1043077&view=rev
Log:
VELOCITY-789
Removed copied code and included shaded code from Commons Lang and Commons Collections (that will be removed).
Removed:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/thirdparty/
Modified:
velocity/engine/trunk/velocity-engine-core/pom.xml
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java
Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Tue Dec 7 15:01:25 2010
@@ -26,8 +26,48 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.collections</pattern>
+ <shadedPattern>org.apache.velocity.shaded.commons.collections</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.lang</pattern>
+ <shadedPattern>org.apache.velocity.shaded.commons.lang</shadedPattern>
+ </relocation>
+ </relocations>
+ <minimizeJar>true</minimizeJar>
+ <filters>
+ <filter>
+ <artifact>commons-lang:commons-lang</artifact>
+ <includes>
+ <include>org/apache/commons/lang/Entities*</include>
+ <include>org/apache/commons/lang/StringEscapeUtils*</include>
+ <include>org/apache/commons/lang/StringUtils*</include>
+ <include>org/apache/commons/lang/UnhandledException*</include>
+ <include>org/apache/commons/lang/exception/NestableRuntimeException*</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skip>true</skip>
<systemProperties>
<property>
<name>test.compare.dir</name>
@@ -39,6 +79,18 @@
</property>
</systemProperties>
</configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -52,7 +104,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeHtmlReference.java Tue Dec 7 15:01:25 2010
@@ -1,6 +1,6 @@
package org.apache.velocity.app.event.implement;
-import org.apache.velocity.thirdparty.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeJavaScriptReference.java Tue Dec 7 15:01:25 2010
@@ -1,6 +1,6 @@
package org.apache.velocity.app.event.implement;
-import org.apache.velocity.thirdparty.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeSqlReference.java Tue Dec 7 15:01:25 2010
@@ -1,6 +1,5 @@
package org.apache.velocity.app.event.implement;
-import org.apache.velocity.thirdparty.commons.lang.StringEscapeUtils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -39,7 +38,7 @@ public class EscapeSqlReference extends
*/
protected String escape(Object text)
{
- return StringEscapeUtils.escapeSql(text.toString());
+ return text.toString().replaceAll("'", "''");
}
/**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeXmlReference.java Tue Dec 7 15:01:25 2010
@@ -1,6 +1,6 @@
package org.apache.velocity.app.event.implement;
-import org.apache.velocity.thirdparty.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringEscapeUtils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java Tue Dec 7 15:01:25 2010
@@ -20,12 +20,13 @@ package org.apache.velocity.runtime;
*/
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import java.util.ArrayList;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.Template;
import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.directive.Directive;
@@ -34,7 +35,6 @@ import org.apache.velocity.runtime.direc
import org.apache.velocity.runtime.log.LogDisplayWrapper;
import org.apache.velocity.runtime.parser.ParseException;
import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
/**
* VelocimacroFactory.java
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java Tue Dec 7 15:01:25 2010
@@ -21,6 +21,7 @@ package org.apache.velocity.runtime.pars
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.app.event.EventHandlerUtil;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.exception.MethodInvocationException;
@@ -29,7 +30,6 @@ import org.apache.velocity.exception.Vel
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.directive.StopCommand;
import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
import org.apache.velocity.util.ClassUtils;
import org.apache.velocity.util.introspection.Info;
import org.apache.velocity.util.introspection.VelMethod;
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java Tue Dec 7 15:01:25 2010
@@ -21,9 +21,9 @@ package org.apache.velocity.runtime.pars
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
import org.apache.velocity.util.introspection.Introspector;
/**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SetPropertyExecutor.java Tue Dec 7 15:01:25 2010
@@ -21,9 +21,9 @@ package org.apache.velocity.runtime.pars
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
import org.apache.velocity.util.introspection.Introspector;
/**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Tue Dec 7 15:01:25 2010
@@ -158,7 +158,7 @@ public class ResourceManagerImpl
Object cacheObject = null;
- if (org.apache.velocity.thirdparty.commons.lang.StringUtils.isNotEmpty(cacheClassName))
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(cacheClassName))
{
try
{
@@ -533,7 +533,7 @@ public class ResourceManagerImpl
* this strikes me as bad...
*/
- if (!org.apache.velocity.thirdparty.commons.lang.StringUtils.equals(resource.getEncoding(), encoding))
+ if (!org.apache.commons.lang.StringUtils.equals(resource.getEncoding(), encoding))
{
log.warn("Declared encoding for template '%s' is different on reload. Old = '%s' New = '%s'",
resource.getName(), resource.getEncoding(), encoding);
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -22,9 +22,9 @@ package org.apache.velocity.runtime.reso
import java.io.InputStream;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
import org.apache.velocity.util.ClassUtils;
/**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -26,9 +26,11 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
+
import org.apache.commons.collections.ExtendedProperties;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
@@ -217,7 +219,7 @@ public class DataSourceResourceLoader ex
public synchronized InputStream getResourceStream(final String name)
throws ResourceNotFoundException
{
- if (org.apache.velocity.thirdparty.commons.lang.StringUtils.isEmpty(name))
+ if (org.apache.commons.lang.StringUtils.isEmpty(name))
{
throw new ResourceNotFoundException("DataSourceResourceLoader: Template name was empty or null");
}
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -118,7 +118,7 @@ public class FileResourceLoader extends
/*
* Make sure we have a valid templateName.
*/
- if (org.apache.velocity.thirdparty.commons.lang.StringUtils.isEmpty(templateName))
+ if (org.apache.commons.lang.StringUtils.isEmpty(templateName))
{
/*
* If we don't get a properly formed templateName then
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -178,7 +178,7 @@ public class JarResourceLoader extends R
{
InputStream results = null;
- if (org.apache.velocity.thirdparty.commons.lang.StringUtils.isEmpty(source))
+ if (org.apache.commons.lang.StringUtils.isEmpty(source))
{
throw new ResourceNotFoundException("Need to have a resource!");
}
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -32,7 +32,7 @@ import org.apache.velocity.runtime.resou
import org.apache.velocity.runtime.resource.util.StringResource;
import org.apache.velocity.runtime.resource.util.StringResourceRepository;
import org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.util.ClassUtils;
/**
Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java Tue Dec 7 15:01:25 2010
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Ex
import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* This is a simple URL-based loader.
Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java Tue Dec 7 15:01:25 2010
@@ -358,7 +358,7 @@ public abstract class BaseTestCase exten
buf.append(baseFile.getPath());
}
- if (org.apache.velocity.thirdparty.commons.lang.StringUtils.isNotEmpty(ext))
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(ext))
{
buf.append('.').append(ext);
}
Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java?rev=1043077&r1=1043076&r2=1043077&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java Tue Dec 7 15:01:25 2010
@@ -19,7 +19,7 @@ package org.apache.velocity.test.sql;
* under the License.
*/
-import org.apache.velocity.thirdparty.commons.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.hsqldb.jdbcDriver;
import java.io.FileReader;