Author: painter
Date: Thu Oct 25 02:40:00 2018
New Revision: 1844800
URL: http://svn.apache.org/viewvc?rev=1844800&view=rev
Log:
More commons-lang3 updates
Modified:
turbine/fulcrum/trunk/groovy/pom.xml
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java
Modified: turbine/fulcrum/trunk/groovy/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/pom.xml?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/groovy/pom.xml (original)
+++ turbine/fulcrum/trunk/groovy/pom.xml Thu Oct 25 02:40:00 2018
@@ -80,9 +80,9 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.8.1</version>
</dependency>
<dependency>
@@ -96,20 +96,20 @@
<artifactId>groovy-all</artifactId>
<version>2.1.3</version>
</dependency>
-
<!-- Needed only for testing -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.6</version>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.6</version>
- </dependency>
+ <version>1.0.8-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java
(original)
+++
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java
Thu Oct 25 02:40:00 2018
@@ -19,7 +19,7 @@ package org.apache.fulcrum.groovy.impl;
* under the License.
*/
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.fulcrum.groovy.GroovyRunnable;
import org.apache.fulcrum.groovy.GroovyService;
Modified:
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java
Thu Oct 25 02:40:00 2018
@@ -35,8 +35,8 @@ import org.apache.avalon.framework.conte
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.exception.NestableRuntimeException;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.exception.ContextedRuntimeException;
import org.apache.fulcrum.groovy.GroovyRunnable;
import org.apache.fulcrum.groovy.GroovyService;
import org.apache.fulcrum.resourcemanager.ResourceManagerService;
@@ -284,7 +284,7 @@ public class GroovyServiceImpl
}
catch (ServiceException e)
{
- throw new NestableRuntimeException( e );
+ throw new ContextedRuntimeException( e );
}
}
@@ -389,7 +389,7 @@ public class GroovyServiceImpl
{
String msg= "Execution of the script failed : " + scriptName;
this.getLogger().error( msg, e );
- throw new NestableRuntimeException( msg ,e );
+ throw new ContextedRuntimeException( msg ,e );
}
finally
{
@@ -426,7 +426,7 @@ public class GroovyServiceImpl
{
String msg= "Execution of the script failed : " + scriptName;
this.getLogger().error( msg, e );
- throw new NestableRuntimeException( msg ,e );
+ throw new ContextedRuntimeException( msg ,e );
}
}
@@ -474,7 +474,7 @@ public class GroovyServiceImpl
{
String msg = "Parsing the script failed : " + scriptName;
this.getLogger().error( msg, e );
- throw new NestableRuntimeException( msg ,e );
+ throw new ContextedRuntimeException( msg ,e );
}
}
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
Thu Oct 25 02:40:00 2018
@@ -18,7 +18,7 @@ package org.apache.fulcrum.security.ldap
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.ldap.LDAPUserManagerImpl;
import org.apache.fulcrum.security.model.turbine.TurbineUserManager;
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
Thu Oct 25 02:40:00 2018
@@ -29,7 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.hsqldb.jdbcDriver;
/**
Modified:
turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java?rev=1844800&r1=1844799&r2=1844800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java
(original)
+++
turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java
Thu Oct 25 02:40:00 2018
@@ -22,7 +22,7 @@ package org.apache.fulcrum.util;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* <code>WordWrapUtils</code> is a utility class to assist with word wrapping.
*
