Author: jlaskowski
Date: Fri May 22 15:00:34 2009
New Revision: 777557
URL: http://svn.apache.org/viewvc?rev=777557&view=rev
Log:
Remove asm-finder dependency and introduce xbean-asm-shaded - now use
org.apache.xbean.asm for ASM 3.1-related hacks + XBean 3.6-SNAPSHOT in use
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DTDResolver.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/InstantdbDataSourcePlugin.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-server/pom.xml
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
Fri May 22 15:00:34 2009
@@ -75,8 +75,8 @@
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.URLs;
-import org.apache.openejb.finder.ResourceFinder;
-import org.apache.openejb.finder.UrlSet;
+import org.apache.xbean.finder.ResourceFinder;
+import org.apache.xbean.finder.UrlSet;
import org.omg.CORBA.ORB;
import javax.ejb.spi.HandleDelegate;
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Fri May 22 15:00:34
2009
@@ -165,7 +165,7 @@
</manifest>
<manifestEntries>
<Class-Path>openejb-loader-${version}.jar
openejb-client-${version}.jar
- asm-finder-${xbeanVersion}.jar</Class-Path>
+ xbean-finder-${xbeanVersion}.jar
xbean-asm-shaded-${xbeanVersion}.jar</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
</manifestEntries>
@@ -317,11 +317,15 @@
<!-- End: JavaMail -->
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
+ <artifactId>xbean-asm-shaded</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>asm-finder</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Fri May 22 15:00:34 2009
@@ -67,7 +67,7 @@
import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.UndeployException;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import org.apache.openejb.core.ConnectorReference;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.CoreDeploymentInfo;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
Fri May 22 15:00:34 2009
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.cli;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.OpenEjbVersion;
import org.apache.commons.cli.PosixParser;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Fri May 22 15:00:34 2009
@@ -22,7 +22,7 @@
import org.apache.openejb.api.RemoteClient;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.core.webservices.JaxWsUtils;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
import org.apache.openejb.jee.ActivationConfig;
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.AroundInvoke;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
Fri May 22 15:00:34 2009
@@ -17,7 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.jee.ApplicationClient;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
import java.util.Map;
import java.util.HashMap;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
Fri May 22 15:00:34 2009
@@ -24,7 +24,7 @@
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Messages;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import java.io.File;
import java.io.FileNotFoundException;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DTDResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DTDResolver.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DTDResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DTDResolver.java
Fri May 22 15:00:34 2009
@@ -27,7 +27,7 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
public class DTDResolver implements EntityResolver {
public static HashMap dtds = new HashMap();
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Fri May 22 15:00:34 2009
@@ -69,8 +69,8 @@
import org.apache.openejb.util.UrlCache;
import static org.apache.openejb.util.URLs.toFile;
import org.apache.openejb.util.AnnotationFinder;
-import org.apache.openejb.finder.ResourceFinder;
-import org.apache.openejb.finder.UrlSet;
+import org.apache.xbean.finder.ResourceFinder;
+import org.apache.xbean.finder.UrlSet;
import org.xml.sax.SAXException;
/**
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Fri May 22 15:00:34 2009
@@ -24,7 +24,7 @@
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.loader.Options;
import org.apache.openejb.util.Logger;
-import org.apache.openejb.finder.UrlSet;
+import org.apache.xbean.finder.UrlSet;
import java.io.File;
import java.io.IOException;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
Fri May 22 15:00:34 2009
@@ -20,7 +20,7 @@
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Webservices;
import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
import java.io.File;
import java.util.Map;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
Fri May 22 15:00:34 2009
@@ -18,11 +18,11 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.asm.AnnotationVisitor;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.FieldVisitor;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm.AnnotationVisitor;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.commons.EmptyVisitor;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceProperty;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
Fri May 22 15:00:34 2009
@@ -30,7 +30,7 @@
import org.apache.openejb.jee.RemoveMethod;
import org.apache.openejb.jee.InitMethod;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
import javax.interceptor.InvocationContext;
import javax.ejb.PrePassivate;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
Fri May 22 15:00:34 2009
@@ -25,7 +25,7 @@
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.util.SafeToolkit;
import org.apache.openejb.util.Strings;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/sys/JaxbOpenejb.java
Fri May 22 15:00:34 2009
@@ -20,7 +20,7 @@
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.JAXBContextFactory;
import org.apache.openejb.config.ConfigUtils;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
Fri May 22 15:00:34 2009
@@ -23,9 +23,9 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.Opcodes;
-import org.apache.openejb.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.Opcodes;
+import org.apache.xbean.asm.commons.EmptyVisitor;
/**
* ClassLoader implementation that allows classes to be temporarily
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
Fri May 22 15:00:34 2009
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.openejb.asm.ClassWriter;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Opcodes;
-import org.apache.openejb.asm.Type;
-import org.apache.openejb.asm.FieldVisitor;
+import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Opcodes;
+import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm.FieldVisitor;
/**
* Class for generating a class file that implements
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
Fri May 22 15:00:34 2009
@@ -29,12 +29,12 @@
import javax.ejb.EntityContext;
-import org.apache.openejb.asm.ClassWriter;
-import org.apache.openejb.asm.FieldVisitor;
-import org.apache.openejb.asm.Label;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Opcodes;
-import org.apache.openejb.asm.Type;
+import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm.Label;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Opcodes;
+import org.apache.xbean.asm.Type;
/**
* Code generate for CMP level 2 beans. This will
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
Fri May 22 15:00:34 2009
@@ -19,7 +19,7 @@
import java.lang.reflect.Method;
-import org.apache.openejb.asm.Type;
+import org.apache.xbean.asm.Type;
public class CmpField {
private final String name;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
Fri May 22 15:00:34 2009
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.openejb.asm.Type;
+import org.apache.xbean.asm.Type;
public class CmrField {
private final String name;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
Fri May 22 15:00:34 2009
@@ -22,7 +22,7 @@
import java.util.Collection;
import java.lang.reflect.Method;
-import org.apache.openejb.asm.Type;
+import org.apache.xbean.asm.Type;
public enum CmrStyle {
SINGLE(SingleValuedCmr.class, null, null),
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
Fri May 22 15:00:34 2009
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.openejb.asm.ClassWriter;
-import org.apache.openejb.asm.Type;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Opcodes;
+import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Opcodes;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonContainer.java
Fri May 22 15:00:34 2009
@@ -55,7 +55,7 @@
import static
org.apache.openejb.core.transaction.EjbTransactionUtil.afterInvoke;
import static
org.apache.openejb.core.transaction.EjbTransactionUtil.createTransactionPolicy;
import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
/**
* @org.apache.xbean.XBean element="statelessContainer"
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
Fri May 22 15:00:34 2009
@@ -48,7 +48,7 @@
import static
org.apache.openejb.core.transaction.EjbTransactionUtil.createTransactionPolicy;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.Duration;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
/**
* @org.apache.xbean.XBean element="statelessContainer"
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
Fri May 22 15:00:34 2009
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.resource.jdbc;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import java.sql.SQLException;
import java.util.Map;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/InstantdbDataSourcePlugin.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/InstantdbDataSourcePlugin.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/InstantdbDataSourcePlugin.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/InstantdbDataSourcePlugin.java
Fri May 22 15:00:34 2009
@@ -19,7 +19,7 @@
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import java.io.File;
import java.io.FileOutputStream;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
Fri May 22 15:00:34 2009
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.ClassVisitor;
-import org.apache.openejb.asm.Attribute;
-import org.apache.openejb.asm.FieldVisitor;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.AnnotationVisitor;
-import org.apache.openejb.finder.UrlSet;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.ClassVisitor;
+import org.apache.xbean.asm.Attribute;
+import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.AnnotationVisitor;
+import org.apache.xbean.finder.UrlSet;
import java.util.List;
import java.util.ArrayList;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java
Fri May 22 15:00:34 2009
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.Label;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Type;
-import org.apache.openejb.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.Label;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm.commons.EmptyVisitor;
import org.apache.xbean.recipe.ParameterNameLoader;
import java.io.IOException;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java
Fri May 22 15:00:34 2009
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.asm.ClassWriter;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Opcodes;
+import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Opcodes;
import java.io.File;
import java.io.FileOutputStream;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
Fri May 22 15:00:34 2009
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import java.util.Properties;
import java.io.PrintStream;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
Fri May 22 15:00:34 2009
@@ -20,8 +20,8 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import junit.framework.TestResult;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.ClassWriter;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.ClassWriter;
import java.io.File;
import java.io.FileInputStream;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
Fri May 22 15:00:34 2009
@@ -45,15 +45,15 @@
*/
package org.apache.openejb;
-import org.apache.openejb.asm.AnnotationVisitor;
-import org.apache.openejb.asm.ClassVisitor;
-import org.apache.openejb.asm.FieldVisitor;
-import org.apache.openejb.asm.MethodVisitor;
-import org.apache.openejb.asm.Attribute;
-import org.apache.openejb.asm.Type;
-import org.apache.openejb.asm.Label;
-import org.apache.openejb.asm.signature.SignatureVisitor;
-import org.apache.openejb.asm.signature.SignatureReader;
+import org.apache.xbean.asm.AnnotationVisitor;
+import org.apache.xbean.asm.ClassVisitor;
+import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Attribute;
+import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm.Label;
+import org.apache.xbean.asm.signature.SignatureVisitor;
+import org.apache.xbean.asm.signature.SignatureReader;
import java.util.Set;
import java.util.HashSet;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
Fri May 22 15:00:34 2009
@@ -51,12 +51,12 @@
import org.apache.openejb.resource.jdbc.BasicDataSource;
import org.apache.openejb.resource.jdbc.BasicManagedDataSource;
import org.apache.xbean.naming.context.ImmutableContext;
-import org.apache.openejb.asm.ClassAdapter;
-import org.apache.openejb.asm.ClassReader;
-import org.apache.openejb.asm.ClassVisitor;
-import org.apache.openejb.asm.ClassWriter;
-import static org.apache.openejb.asm.Opcodes.ACC_PRIVATE;
-import static org.apache.openejb.asm.Opcodes.ACC_TRANSIENT;
+import org.apache.xbean.asm.ClassAdapter;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.ClassVisitor;
+import org.apache.xbean.asm.ClassWriter;
+import static org.apache.xbean.asm.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm.Opcodes.ACC_TRANSIENT;
public class JpaTest extends TestCase {
// private static final String PERSISTENCE_PROVIDER =
"org.apache.cayenne.jpa.Provider";
Modified: openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Fri May 22
15:00:34 2009
@@ -113,8 +113,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>asm-finder</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
</dependency>
</dependencies>
</project>
Modified:
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
(original)
+++
openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
Fri May 22 15:00:34 2009
@@ -29,7 +29,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.openejb.finder.ClassFinder;
+import org.apache.xbean.finder.ClassFinder;
/**
* @author <a href="mailto:[email protected]";>David Blevins</a>
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Fri May 22 15:00:34 2009
@@ -93,7 +93,7 @@
<properties>
<!-- This is used by a manifest classpath entry -->
- <xbeanVersion>3.5</xbeanVersion>
+ <xbeanVersion>3.6-SNAPSHOT</xbeanVersion>
<!-- OSGi bundles properties -->
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
@@ -849,23 +849,14 @@
<version>2.0.5</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>asm-finder</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <version>${xbeanVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <version>${xbeanVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: openejb/trunk/openejb3/server/openejb-server/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/pom.xml?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-server/pom.xml Fri May 22 15:00:34
2009
@@ -70,8 +70,8 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>asm-finder</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
Fri May 22 15:00:34 2009
@@ -35,7 +35,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
/**
* Assemble OpenEJB instance and boot it up
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=777557&r1=777556&r2=777557&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Fri May 22 15:00:34 2009
@@ -24,7 +24,7 @@
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.assembler.classic.ServiceInfo;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
-import org.apache.openejb.finder.ResourceFinder;
+import org.apache.xbean.finder.ResourceFinder;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
