tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r684173 - in /openejb/trunk/openejb3: ./ api/ api/ejb31-api-experimental/ assembly/ assembly/openejb-itests-standalone-client/ assembly/openejb-standalone/ assembly/openejb-tomcat/ assembly/openejb-tomcat/openejb-tomcat-catalina/ assembly/o...
Date Sat, 09 Aug 2008 03:13:29 GMT
Author: dblevins
Date: Fri Aug  8 20:13:24 2008
New Revision: 684173

URL: http://svn.apache.org/viewvc?rev=684173&view=rev
Log:
OPENEJB-892: Remove ASM dependency
ASM 3.0.1 was repackaged to org.apache.openejb.asm
XBean-Finder 3.4.2 was repackaged to org.apache.openejb.finder
Both were combined into one jar:
 groupId: org.apache.openejb
 artifactId: asm-finder
Dendencies on the former artifacts were removed
No other changes were made

Modified:
    openejb/trunk/openejb3/api/ejb31-api-experimental/pom.xml
    openejb/trunk/openejb3/api/pom.xml
    openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
    openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
    openejb/trunk/openejb3/assembly/pom.xml
    openejb/trunk/openejb3/container/openejb-core/pom.xml
    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/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/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/GeronimoTransactionManagerFactory.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/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/container/openejb-javaagent/pom.xml
    openejb/trunk/openejb3/container/openejb-jee/pom.xml
    openejb/trunk/openejb3/container/openejb-loader/pom.xml
    openejb/trunk/openejb3/container/pom.xml
    openejb/trunk/openejb3/deps/pom.xml
    openejb/trunk/openejb3/examples/component-interfaces/pom.xml
    openejb/trunk/openejb3/examples/custom-injection/pom.xml
    openejb/trunk/openejb3/examples/ear-testing/business-logic/pom.xml
    openejb/trunk/openejb3/examples/ear-testing/business-model/pom.xml
    openejb/trunk/openejb3/examples/ear-testing/pom.xml
    openejb/trunk/openejb3/examples/helloworld-weblogic/pom.xml
    openejb/trunk/openejb3/examples/injection-of-connectionfactory/pom.xml
    openejb/trunk/openejb3/examples/injection-of-datasource/pom.xml
    openejb/trunk/openejb3/examples/injection-of-ejbs/pom.xml
    openejb/trunk/openejb3/examples/injection-of-entitymanager/pom.xml
    openejb/trunk/openejb3/examples/injection-of-env-entry/pom.xml
    openejb/trunk/openejb3/examples/interceptors/pom.xml
    openejb/trunk/openejb3/examples/jpa-eclipselink/pom.xml
    openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
    openejb/trunk/openejb3/examples/pom.xml
    openejb/trunk/openejb3/examples/simple-cmp2/pom.xml
    openejb/trunk/openejb3/examples/simple-mdb-with-descriptor/pom.xml
    openejb/trunk/openejb3/examples/simple-mdb/pom.xml
    openejb/trunk/openejb3/examples/simple-singleton/pom.xml
    openejb/trunk/openejb3/examples/simple-stateful/pom.xml
    openejb/trunk/openejb3/examples/simple-stateless-with-descriptor/pom.xml
    openejb/trunk/openejb3/examples/simple-stateless/pom.xml
    openejb/trunk/openejb3/examples/simple-webservice/pom.xml
    openejb/trunk/openejb3/examples/telephone-stateful/pom.xml
    openejb/trunk/openejb3/examples/testing-security/pom.xml
    openejb/trunk/openejb3/examples/testing-transactions/pom.xml
    openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
    openejb/trunk/openejb3/examples/webapps/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
    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/itests/openejb-itests-interceptor-beans/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml
    openejb/trunk/openejb3/itests/pom.xml
    openejb/trunk/openejb3/pom.xml
    openejb/trunk/openejb3/server/openejb-activemq/pom.xml
    openejb/trunk/openejb3/server/openejb-admin/pom.xml
    openejb/trunk/openejb3/server/openejb-axis/pom.xml
    openejb/trunk/openejb3/server/openejb-axis2/pom.xml
    openejb/trunk/openejb3/server/openejb-client/pom.xml
    openejb/trunk/openejb3/server/openejb-corba/pom.xml
    openejb/trunk/openejb3/server/openejb-cxf/pom.xml
    openejb/trunk/openejb3/server/openejb-derbynet/pom.xml
    openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
    openejb/trunk/openejb3/server/openejb-hsql/pom.xml
    openejb/trunk/openejb3/server/openejb-http/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
    openejb/trunk/openejb3/server/openejb-telnet/pom.xml
    openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
    openejb/trunk/openejb3/server/openejb-webservices/pom.xml
    openejb/trunk/openejb3/server/pom.xml

Modified: openejb/trunk/openejb3/api/ejb31-api-experimental/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/ejb31-api-experimental/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/api/ejb31-api-experimental/pom.xml (original)
+++ openejb/trunk/openejb3/api/ejb31-api-experimental/pom.xml Fri Aug  8 20:13:24 2008
@@ -36,3 +36,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/api/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/api/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/api/pom.xml (original)
+++ openejb/trunk/openejb3/api/pom.xml Fri Aug  8 20:13:24 2008
@@ -31,3 +31,4 @@
     <module>ejb31-api-experimental</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml Fri Aug  8 20:13:24 2008
@@ -94,3 +94,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Fri Aug  8 20:13:24 2008
@@ -284,3 +284,4 @@
     </profile>
   </profiles>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml Fri Aug  8 20:13:24 2008
@@ -85,3 +85,4 @@
     </dependency>
   </dependencies>
 </project>
+

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -74,8 +74,8 @@
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.URLs;
-import org.apache.xbean.finder.ResourceFinder;
-import org.apache.xbean.finder.UrlSet;
+import org.apache.openejb.finder.ResourceFinder;
+import org.apache.openejb.finder.UrlSet;
 import org.omg.CORBA.ORB;
 
 import javax.ejb.spi.HandleDelegate;

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml Fri Aug  8 20:13:24 2008
@@ -62,3 +62,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml Fri Aug  8 20:13:24 2008
@@ -41,3 +41,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Fri Aug  8 20:13:24 2008
@@ -220,3 +220,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Fri Aug  8 20:13:24 2008
@@ -36,3 +36,4 @@
     <module>openejb-tomcat-webapp</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/assembly/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/pom.xml Fri Aug  8 20:13:24 2008
@@ -35,3 +35,4 @@
     <module>openejb-tomcat</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Aug  8 20:13:24 2008
@@ -163,7 +163,7 @@
             </manifest>
             <manifestEntries>
               <Class-Path>openejb-loader-${version}.jar openejb-client-${version}.jar
-                xbean-finder-${xbeanVersion}.jar</Class-Path>
+                asm-finder-${xbeanVersion}.jar</Class-Path>
               <J2EE-DeploymentFactory-Implementation-Class>
                 org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
             </manifestEntries>
@@ -313,22 +313,14 @@
       <artifactId>xbean-reflect</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-finder</artifactId>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>asm-finder</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-naming</artifactId>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
@@ -395,3 +387,4 @@
     </profile>
   </profiles>
 </project>
+

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.openejb.cli;
 
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -85,7 +85,7 @@
 import static org.apache.openejb.util.Join.join;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.openejb.finder.ClassFinder;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -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.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -27,7 +27,7 @@
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -68,9 +68,9 @@
 import org.apache.openejb.util.URLs;
 import org.apache.openejb.util.UrlCache;
 import static org.apache.openejb.util.URLs.toFile;
-import org.apache.xbean.finder.ClassFinder;
-import org.apache.xbean.finder.ResourceFinder;
-import org.apache.xbean.finder.UrlSet;
+import org.apache.openejb.finder.ClassFinder;
+import org.apache.openejb.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -23,7 +23,7 @@
 import org.apache.openejb.loader.FileUtils;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.Logger;
-import org.apache.xbean.finder.UrlSet;
+import org.apache.openejb.finder.UrlSet;
 
 import java.io.File;
 import java.io.IOException;

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -18,11 +18,11 @@
 package org.apache.openejb.config;
 
 import org.apache.openejb.OpenEJBException;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.commons.EmptyVisitor;
+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 javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceProperty;
@@ -58,7 +58,7 @@
         try {
             URL u = c.getResource("/" + c.getName().replace('.', '/') + ".class");
             ClassReader r = new ClassReader(u.openStream());
-            r.accept(new PersistenceContextReader(), true);
+            r.accept(new PersistenceContextReader(), ClassReader.SKIP_DEBUG);
         } catch (IOException e) {
             throw new OpenEJBException("Unable to read class " + c.getName());
         }

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -30,7 +30,7 @@
 import org.apache.openejb.jee.RemoveMethod;
 import org.apache.openejb.jee.InitMethod;
 import org.apache.openejb.OpenEJBException;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -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.xbean.finder.ClassFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -20,7 +20,7 @@
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.jee.JAXBContextFactory;
 import org.apache.openejb.config.ConfigUtils;
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -23,9 +23,9 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.apache.openejb.asm.ClassReader;
+import org.apache.openejb.asm.Opcodes;
+import org.apache.openejb.asm.commons.EmptyVisitor;
 
 /**
  * ClassLoader implementation that allows classes to be temporarily
@@ -126,7 +126,7 @@
     private static boolean isAnnotationClass(byte[] bytes) {
         IsAnnotationVisitor isAnnotationVisitor = new IsAnnotationVisitor();
         ClassReader classReader = new ClassReader(bytes);
-        classReader.accept(isAnnotationVisitor, true);
+        classReader.accept(isAnnotationVisitor, ClassReader.SKIP_DEBUG);
         return isAnnotationVisitor.isAnnotation;
     }
 

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -16,11 +16,11 @@
  */
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.FieldVisitor;
+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;
 
 /**
  * Class for generating a class file that implements 
@@ -44,7 +44,7 @@
         beanClassName = Type.getInternalName(beanClass);
         implClassName = cmpImplClass.replace('.', '/');
 
-        cw = new ClassWriter(true);
+        cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
 
         postCreateGenerator = new PostCreateGenerator(beanClass, cw);
     }

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -29,12 +29,12 @@
 
 import javax.ejb.EntityContext;
 
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
+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;
 
 /**
  * Code generate for CMP level 2 beans.  This will 
@@ -138,7 +138,7 @@
         // The class writer will be used for all generator activies, while the 
         // postCreateGenerator will be used to add the ejbPostCreatexxxx methods as a 
         // last step. 
-        cw = new ClassWriter(true);
+        cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
         postCreateGenerator = new PostCreateGenerator(beanClass, cw);
     }
 

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -19,7 +19,7 @@
 
 import java.lang.reflect.Method; 
 
-import org.objectweb.asm.Type;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.objectweb.asm.Type;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.lang.reflect.Method;
 
-import org.objectweb.asm.Type;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -16,10 +16,10 @@
  */
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+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 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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -50,7 +50,7 @@
 import org.apache.openejb.core.transaction.TransactionContext;
 import org.apache.openejb.core.transaction.TransactionPolicy;
 import org.apache.openejb.spi.SecurityService;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -48,7 +48,7 @@
 import org.apache.openejb.core.transaction.TransactionPolicy;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.Duration;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.openejb.finder.ClassFinder;
 
 /**
  * @org.apache.xbean.XBean element="statelessContainer"

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java Fri Aug  8 20:13:24 2008
@@ -60,7 +60,7 @@
             SystemInstance.get().setComponent(XAResourceWrapper.class, new GeronimoXAResourceWrapper());
             
             xidFactory = new XidFactoryImpl(tmId == null ? DEFAULT_TM_ID: tmId);
-            txLog = new HOWLLog(bufferClassName == null ? "org.objectweb.howl.log.BlockLogBuffer" : bufferClassName,
+            txLog = new HOWLLog(bufferClassName == null ? "org.apache.howl.log.BlockLogBuffer" : bufferClassName,
                     bufferSizeKb == 0 ? DEFAULT_BUFFER_SIZE : bufferSizeKb,
                     checksumEnabled,
                     adler32Checksum,

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.openejb.resource.jdbc;
 
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -19,7 +19,7 @@
 
 import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.openejb.loader.SystemInstance;
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.finder.ResourceFinder;
 
 import java.io.File;
 import java.io.FileOutputStream;

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -16,9 +16,9 @@
  */
 package org.apache.openejb.util;
 
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.apache.openejb.asm.ClassWriter;
+import org.apache.openejb.asm.MethodVisitor;
+import org.apache.openejb.asm.Opcodes;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -47,7 +47,7 @@
 
         String sourceFileName = factory.substring(factory.lastIndexOf('.')+1, factory.length()) + ".java";
 
-        ClassWriter cw = new ClassWriter(false);
+        ClassWriter cw = new ClassWriter(0);
         MethodVisitor mv;
 
         cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, classFilePath, null, "java/lang/Object", new String[]{"org/hibernate/transaction/TransactionManagerLookup"});
@@ -94,7 +94,7 @@
         String sourceFileName = factory.substring(factory.lastIndexOf('.')+1, factory.length()) + ".java";
 
 
-        ClassWriter cw = new ClassWriter(false);
+        ClassWriter cw = new ClassWriter(0);
         MethodVisitor mv;
 
         cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, classFilePath, null, "oracle/toplink/essentials/transaction/JTATransactionController", null);
@@ -133,7 +133,7 @@
         String sourceFileName = factory.substring(factory.lastIndexOf('.')+1, factory.length()) + ".java";
 
 
-        ClassWriter cw = new ClassWriter(false);
+        ClassWriter cw = new ClassWriter(0);
         MethodVisitor mv;
 
         cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, classFilePath, null, "org/eclipse/persistence/transaction/JTATransactionController", null);

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.openejb.util;
 
-import org.apache.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -20,7 +20,7 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
-import org.objectweb.asm.ClassReader;
+import org.apache.openejb.asm.ClassReader;
 
 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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -45,15 +45,15 @@
  */
 package org.apache.openejb;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Attribute;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureReader;
+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 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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -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.objectweb.asm.ClassAdapter;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static org.objectweb.asm.Opcodes.ACC_TRANSIENT;
+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;
 
 public class JpaTest extends TestCase {
 //    private static final String PERSISTENCE_PROVIDER = "org.apache.cayenne.jpa.Provider";

Modified: openejb/trunk/openejb3/container/openejb-javaagent/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-javaagent/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-javaagent/pom.xml Fri Aug  8 20:13:24 2008
@@ -64,3 +64,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/pom.xml Fri Aug  8 20:13:24 2008
@@ -129,3 +129,4 @@
     </profile>
   </profiles>
 </project>
+

Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Fri Aug  8 20:13:24 2008
@@ -48,3 +48,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/container/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/pom.xml (original)
+++ openejb/trunk/openejb3/container/pom.xml Fri Aug  8 20:13:24 2008
@@ -33,3 +33,4 @@
     <module>openejb-jee</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/deps/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/deps/pom.xml (original)
+++ openejb/trunk/openejb3/deps/pom.xml Fri Aug  8 20:13:24 2008
@@ -28,5 +28,7 @@
   <name>OpenEJB :: Dependencies</name>
 
   <modules>
+    <module>asm-finder</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/examples/component-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/component-interfaces/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/component-interfaces/pom.xml (original)
+++ openejb/trunk/openejb3/examples/component-interfaces/pom.xml Fri Aug  8 20:13:24 2008
@@ -78,3 +78,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/custom-injection/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/custom-injection/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/custom-injection/pom.xml (original)
+++ openejb/trunk/openejb3/examples/custom-injection/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/ear-testing/business-logic/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/ear-testing/business-logic/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/ear-testing/business-logic/pom.xml (original)
+++ openejb/trunk/openejb3/examples/ear-testing/business-logic/pom.xml Fri Aug  8 20:13:24 2008
@@ -63,4 +63,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/ear-testing/business-model/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/ear-testing/business-model/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/ear-testing/business-model/pom.xml (original)
+++ openejb/trunk/openejb3/examples/ear-testing/business-model/pom.xml Fri Aug  8 20:13:24 2008
@@ -45,4 +45,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/ear-testing/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/ear-testing/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/ear-testing/pom.xml (original)
+++ openejb/trunk/openejb3/examples/ear-testing/pom.xml Fri Aug  8 20:13:24 2008
@@ -53,3 +53,4 @@
     </repository>
   </repositories>
 </project>
+

Modified: openejb/trunk/openejb3/examples/helloworld-weblogic/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/helloworld-weblogic/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/helloworld-weblogic/pom.xml (original)
+++ openejb/trunk/openejb3/examples/helloworld-weblogic/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/injection-of-connectionfactory/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/injection-of-connectionfactory/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/injection-of-connectionfactory/pom.xml (original)
+++ openejb/trunk/openejb3/examples/injection-of-connectionfactory/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/injection-of-datasource/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/injection-of-datasource/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/injection-of-datasource/pom.xml (original)
+++ openejb/trunk/openejb3/examples/injection-of-datasource/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/injection-of-ejbs/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/injection-of-ejbs/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/injection-of-ejbs/pom.xml (original)
+++ openejb/trunk/openejb3/examples/injection-of-ejbs/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/injection-of-entitymanager/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/injection-of-entitymanager/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/injection-of-entitymanager/pom.xml (original)
+++ openejb/trunk/openejb3/examples/injection-of-entitymanager/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/injection-of-env-entry/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/injection-of-env-entry/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/injection-of-env-entry/pom.xml (original)
+++ openejb/trunk/openejb3/examples/injection-of-env-entry/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/interceptors/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/interceptors/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/interceptors/pom.xml (original)
+++ openejb/trunk/openejb3/examples/interceptors/pom.xml Fri Aug  8 20:13:24 2008
@@ -111,3 +111,4 @@
     </profile>
   </profiles>
 </project>
+

Modified: openejb/trunk/openejb3/examples/jpa-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-eclipselink/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/jpa-eclipselink/pom.xml (original)
+++ openejb/trunk/openejb3/examples/jpa-eclipselink/pom.xml Fri Aug  8 20:13:24 2008
@@ -85,4 +85,4 @@
 
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml (original)
+++ openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml Fri Aug  8 20:13:24 2008
@@ -113,4 +113,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/pom.xml (original)
+++ openejb/trunk/openejb3/examples/pom.xml Fri Aug  8 20:13:24 2008
@@ -56,3 +56,4 @@
     <module>webapps</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-cmp2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-cmp2/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-cmp2/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-cmp2/pom.xml Fri Aug  8 20:13:24 2008
@@ -72,4 +72,4 @@
 
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/simple-mdb-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-mdb-with-descriptor/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-mdb-with-descriptor/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-mdb-with-descriptor/pom.xml Fri Aug  8 20:13:24 2008
@@ -72,3 +72,4 @@
 
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-mdb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-mdb/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-mdb/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-mdb/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/simple-singleton/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-singleton/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-singleton/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-singleton/pom.xml Fri Aug  8 20:13:24 2008
@@ -77,3 +77,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-stateful/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-stateful/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-stateful/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-stateless-with-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-stateless-with-descriptor/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-stateless-with-descriptor/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-stateless-with-descriptor/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-stateless/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-stateless/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-stateless/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-stateless/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/simple-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-webservice/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-webservice/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-webservice/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,3 +71,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/telephone-stateful/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/telephone-stateful/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/telephone-stateful/pom.xml (original)
+++ openejb/trunk/openejb3/examples/telephone-stateful/pom.xml Fri Aug  8 20:13:24 2008
@@ -84,3 +84,4 @@
     <!-- END SNIPPET: openejbdep -->
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/examples/testing-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-security/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/testing-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/testing-security/pom.xml Fri Aug  8 20:13:24 2008
@@ -78,4 +78,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/testing-transactions/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-transactions/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/testing-transactions/pom.xml (original)
+++ openejb/trunk/openejb3/examples/testing-transactions/pom.xml Fri Aug  8 20:13:24 2008
@@ -71,4 +71,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml Fri Aug  8 20:13:24 2008
@@ -86,3 +86,4 @@
   </build>
 
 </project>
+

Modified: openejb/trunk/openejb3/examples/webapps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/pom.xml Fri Aug  8 20:13:24 2008
@@ -33,3 +33,4 @@
     <module>ejb-examples</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml Fri Aug  8 20:13:24 2008
@@ -104,3 +104,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml Fri Aug  8 20:13:24 2008
@@ -76,3 +76,4 @@
 -->
 
 </project>
+

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=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Fri Aug  8 20:13:24 2008
@@ -113,8 +113,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-finder</artifactId>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>asm-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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -29,7 +29,7 @@
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.openejb.finder.ClassFinder;
 
 /**
  * @author <a href="mailto:david.blevins@visi.com">David Blevins</a>

Modified: openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-interceptor-beans/pom.xml Fri Aug  8 20:13:24 2008
@@ -44,3 +44,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-servlets/pom.xml Fri Aug  8 20:13:24 2008
@@ -47,3 +47,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml Fri Aug  8 20:13:24 2008
@@ -48,3 +48,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/itests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/pom.xml (original)
+++ openejb/trunk/openejb3/itests/pom.xml Fri Aug  8 20:13:24 2008
@@ -38,3 +38,4 @@
     <module>openejb-itests-web</module>
   </modules>
 </project>
+

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Fri Aug  8 20:13:24 2008
@@ -134,13 +134,13 @@
           <target>1.5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>always</forkMode>
-        </configuration>
-      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.swizzle</groupId>
         <artifactId>dependency-report-plugin</artifactId>
@@ -489,16 +489,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>2.2.3</version>
-      </dependency>
-      <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>2.2.3</version>
-      </dependency>
-      <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <version>1.1</version>
@@ -832,9 +822,9 @@
         <version>2.0.5</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <version>${xbeanVersion}</version>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>asm-finder</artifactId>
+        <version>3.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>
@@ -917,3 +907,4 @@
     </plugins>
   </reporting>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-activemq/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-activemq/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-activemq/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-activemq/pom.xml Fri Aug  8 20:13:24 2008
@@ -43,3 +43,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-admin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-admin/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-admin/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-admin/pom.xml Fri Aug  8 20:13:24 2008
@@ -42,3 +42,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-axis/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-axis/pom.xml Fri Aug  8 20:13:24 2008
@@ -74,3 +74,4 @@
     </dependency>    
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-axis2/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/pom.xml Fri Aug  8 20:13:24 2008
@@ -141,4 +141,3 @@
   </dependencies>
 
 </project>
-

Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Fri Aug  8 20:13:24 2008
@@ -117,3 +117,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-corba/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-corba/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-corba/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-corba/pom.xml Fri Aug  8 20:13:24 2008
@@ -53,3 +53,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Fri Aug  8 20:13:24 2008
@@ -237,3 +237,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-derbynet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-derbynet/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-derbynet/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-derbynet/pom.xml Fri Aug  8 20:13:24 2008
@@ -67,3 +67,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Fri Aug  8 20:13:24 2008
@@ -130,3 +130,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-hsql/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-hsql/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-hsql/pom.xml Fri Aug  8 20:13:24 2008
@@ -57,3 +57,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-http/pom.xml Fri Aug  8 20:13:24 2008
@@ -134,3 +134,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-server/pom.xml Fri Aug  8 20:13:24 2008
@@ -70,8 +70,8 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-finder</artifactId>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>asm-finder</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -88,3 +88,4 @@
     </dependency>
   </dependencies>
 </project>
+

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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -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.xbean.finder.ResourceFinder;
+import org.apache.openejb.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=684173&r1=684172&r2=684173&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 Aug  8 20:13:24 2008
@@ -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.xbean.finder.ResourceFinder;
+import org.apache.openejb.finder.ResourceFinder;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.Option;
 import org.apache.xbean.recipe.MissingFactoryMethodException;

Modified: openejb/trunk/openejb3/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-telnet/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-telnet/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-telnet/pom.xml Fri Aug  8 20:13:24 2008
@@ -57,3 +57,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/pom.xml Fri Aug  8 20:13:24 2008
@@ -125,3 +125,4 @@
     </dependency>
   </dependencies>
 </project>
+

Modified: openejb/trunk/openejb3/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/pom.xml Fri Aug  8 20:13:24 2008
@@ -87,4 +87,3 @@
     </dependency>
   </dependencies>
 </project>
-

Modified: openejb/trunk/openejb3/server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/pom.xml?rev=684173&r1=684172&r2=684173&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/pom.xml (original)
+++ openejb/trunk/openejb3/server/pom.xml Fri Aug  8 20:13:24 2008
@@ -44,3 +44,4 @@
     <module>openejb-cxf</module>
   </modules>
 </project>
+



Mime
View raw message