tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1239550 - in /openejb/trunk: openejb/ openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/ openejb/arquillian-tomee/arquillian-tomee-common/ openejb/arquillian-tomee/arquillian-tomee-remote/ openejb/arquillian-tomee/arquillian-tomee-...
Date Thu, 02 Feb 2012 11:30:05 GMT
Author: andygumbrecht
Date: Thu Feb  2 11:30:04 2012
New Revision: 1239550

URL: http://svn.apache.org/viewvc?rev=1239550&view=rev
Log:
Use commons-lang3 3.1 - This can still be used side by side with a 2.x version if required.
All tests passing locally, so giving it a spin on trunk.

Synchronize method in BasicURLClassPath.

Modified:
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/pom.xml
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/SimpleServlet.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/SimpleServlet.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/SimpleServlet.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java
    openejb/trunk/openejb/container/openejb-core/pom.xml
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
    openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
    openejb/trunk/openejb/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java
    openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/tomee/apache-tomee/pom.xml
    openejb/trunk/sandbox/inactive/itest-runner/pom.xml
    openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomcat-openejb-remote/pom.xml Thu Feb
 2 11:30:04 2012
@@ -155,8 +155,8 @@
           <groupId>org.apache.openejb</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <groupId>org.apache.commons</groupId>
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/pom.xml Thu Feb  2 11:30:04
2012
@@ -114,8 +114,8 @@
           <groupId>org.apache.openejb</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <groupId>org.apache.commons</groupId>
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/pom.xml Thu Feb  2 11:30:04
2012
@@ -155,8 +155,8 @@
           <groupId>org.apache.openejb</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <groupId>org.apache.commons</groupId>
         </exclusion>
         <exclusion>
           <artifactId>javaee-api-embedded</artifactId>

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml Thu Feb  2 11:30:04
2012
@@ -58,9 +58,9 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons-lang.version}</version>
+      <artifactId>commons-lang3</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <version>${commons-lang3.version}</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/SimpleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/SimpleServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/SimpleServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/SimpleServlet.java
Thu Feb  2 11:30:04 2012
@@ -17,7 +17,7 @@
 
 package org.apache.openejb.arquillian.tests.cdi.constructor;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/SimpleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/SimpleServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/SimpleServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/SimpleServlet.java
Thu Feb  2 11:30:04 2012
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class SimpleServlet extends HttpServlet {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/SimpleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/SimpleServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/SimpleServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/SimpleServlet.java
Thu Feb  2 11:30:04 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.openejb.arquillian.tests.cdi.producer;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/PojoServlet.java
Thu Feb  2 11:30:04 2012
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServlet extends HttpServlet {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/PojoServletFilter.java
Thu Feb  2 11:30:04 2012
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServletFilter implements Filter {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
Thu Feb  2 11:30:04 2012
@@ -24,7 +24,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServletContextListener implements ServletContextListener {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
Thu Feb  2 11:30:04 2012
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServletSessionListener implements HttpSessionListener {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
Thu Feb  2 11:30:04 2012
@@ -24,7 +24,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServletContextListener implements ServletContextListener {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
Thu Feb  2 11:30:04 2012
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServletSessionListener implements HttpSessionListener {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/PojoServlet.java
Thu Feb  2 11:30:04 2012
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class PojoServlet extends HttpServlet {
 

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java
(original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/RemoteServlet.java
Thu Feb  2 11:30:04 2012
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class RemoteServlet extends HttpServlet {
 

Modified: openejb/trunk/openejb/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/pom.xml Thu Feb  2 11:30:04 2012
@@ -125,7 +125,7 @@
       org.apache.commons.cli;version="[1.2,2)",
       org.apache.commons.dbcp;resolution:=optional;version="[1.4,2)",
       org.apache.commons.dbcp.managed;resolution:=optional;version="[1.4,2)",
-      org.apache.commons.lang;version="[2.6,3)",
+      org.apache.commons.lang;version="[3.1,4)",
       org.apache.commons.lang.math;version="[2.6,3)",
       org.apache.geronimo.connector;version="[3.0,4)",
       org.apache.geronimo.connector.outbound;version="[3.0,4)",
@@ -397,8 +397,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <artifactId>commons-lang3</artifactId>
+      <groupId>org.apache.commons</groupId>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
Thu Feb  2 11:30:04 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.openejb.config;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.EnterpriseBean;

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
Thu Feb  2 11:30:04 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.openejb.config;
 
-import org.apache.commons.lang.math.RandomUtils;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.jee.Connector;
 import org.apache.openejb.jee.EjbJar;
@@ -40,6 +39,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Random;
 
 public class OutputGeneratedDescriptors implements DynamicDeployer {
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG,
"org.apache.openejb.util.resources");
@@ -112,7 +112,7 @@ public class OutputGeneratedDescriptors 
                     throw new IOException("can't create " + tmp.getAbsolutePath());
                 }
             }
-            return new File(tmp, start + Long.toString(RandomUtils.nextInt()) + end);
+            return new File(tmp, start + Long.toString(new Random().nextInt()) + end);
         } else {
             return File.createTempFile(start, end);
         }

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
Thu Feb  2 11:30:04 2012
@@ -18,7 +18,7 @@
 package org.apache.openejb.util.proxy;
 
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 

Modified: openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
(original)
+++ openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java
Thu Feb  2 11:30:04 2012
@@ -62,7 +62,7 @@ public abstract class BasicURLClassPath 
         });
     }
 
-    protected void addJarsToPath(final File dir, final URLClassLoader loader) throws Exception
{
+    protected synchronized void addJarsToPath(final File dir, final URLClassLoader loader)
throws Exception {
         if (dir == null || !dir.exists()) return;
 
         final String[] jarNames = dir.list(new java.io.FilenameFilter() {

Modified: openejb/trunk/openejb/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java
(original)
+++ openejb/trunk/openejb/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java
Thu Feb  2 11:30:04 2012
@@ -16,7 +16,7 @@
  */
 package org.superbiz;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openejb.resource.jdbc.PasswordCipher;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml Thu Feb  2 11:30:04
2012
@@ -31,7 +31,7 @@
     <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
     <bundle>mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
     <bundle>mvn:commons-discovery/commons-discovery/${commons-discovery.version}</bundle>
-    <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+    <bundle>mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
     <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
   </feature>
 
@@ -100,7 +100,7 @@
     <!--<feature version="${org.apache.activemq.version}">activemq</feature>-->
     <feature version="${org.apache.activemq.version}">org.apache.activemq</feature>
 
-    <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
+    <bundle>mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
     <bundle>mvn:org.apache.bval/org.apache.bval.bundle/${bval.version}</bundle>
     <bundle>mvn:org.hsqldb/hsqldb/${hsqldb.version}</bundle>
 

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Thu Feb  2 11:30:04 2012
@@ -91,7 +91,7 @@
   <properties>
 
     <!-- Maven module versions -->
-    <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
+    <maven-bundle-plugin.version>2.4.0-SNAPSHOT</maven-bundle-plugin.version>
     <!-- don't use 2.3.5 since there is an issue with private packages imports -->
 
     <!-- This is used by a manifest classpath entry -->
@@ -135,7 +135,7 @@
     <bval.version>0.4-incubating-SNAPSHOT</bval.version>
     <org.apache.activemq.version>5.5.1</org.apache.activemq.version>
     <quartz.version>1.8.5</quartz.version>
-    <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+    <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
     <junit.version>4.9</junit.version>
     <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
     <scannotation.version>1.0.2</scannotation.version>
@@ -161,7 +161,7 @@
     <commons-codec.version>1.4</commons-codec.version>
     <commons-fileupload.version>1.2.2</commons-fileupload.version>
     <commons-discovery.version>0.5</commons-discovery.version>
-    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang3.version>3.1</commons-lang3.version>
     <commons-io.version>1.4</commons-io.version>
   </properties>
 
@@ -1438,9 +1438,9 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <artifactId>commons-lang</artifactId>
-        <groupId>commons-lang</groupId>
-        <version>${commons-lang.version}</version>
+		<artifactId>commons-lang3</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <version>${commons-lang3.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>

Modified: openejb/trunk/openejb/tomee/apache-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/pom.xml Thu Feb  2 11:30:04 2012
@@ -42,8 +42,8 @@
       <version>0.9.94</version>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <artifactId>commons-lang3</artifactId>
+      <groupId>org.apache.commons</groupId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

Modified: openejb/trunk/sandbox/inactive/itest-runner/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/inactive/itest-runner/pom.xml?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/sandbox/inactive/itest-runner/pom.xml (original)
+++ openejb/trunk/sandbox/inactive/itest-runner/pom.xml Thu Feb  2 11:30:04 2012
@@ -111,8 +111,8 @@
       <version>0.9.94</version>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <artifactId>commons-lang3</artifactId>
+      <groupId>org.apache.commons</groupId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java?rev=1239550&r1=1239549&r2=1239550&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
(original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
Thu Feb  2 11:30:04 2012
@@ -18,7 +18,7 @@ package org.apache.openejb.tools.example
 
 import com.petebevin.markdown.MarkdownProcessor;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.log4j.Logger;
 
 import java.io.File;



Mime
View raw message