openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1486556 - in /openwebbeans/trunk: ./ webbeans-impl/src/main/java/org/apache/webbeans/proxy/ webbeans-osgi/ webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/
Date Mon, 27 May 2013 10:08:42 GMT
Author: rmannibucau
Date: Mon May 27 10:08:41 2013
New Revision: 1486556

URL: http://svn.apache.org/r1486556
Log:
OWB-866 use xbean asm4 shade

Modified:
    openwebbeans/trunk/pom.xml
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
    openwebbeans/trunk/webbeans-osgi/pom.xml
    openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java

Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Mon May 27 10:08:41 2013
@@ -555,7 +555,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-finder-shaded</artifactId>
-                <version>3.13</version>
+                <version>3.14-SNAPSHOT</version>
             </dependency>
 
             <dependency>

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
Mon May 27 10:08:41 2013
@@ -27,10 +27,10 @@ import java.security.PrivilegedAction;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.exception.WebBeansException;
-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.asm4.ClassWriter;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
 
 /**
  * Base class for all OWB Proxy factories

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
Mon May 27 10:08:41 2013
@@ -24,11 +24,11 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.ExceptionUtil;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.Label;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
 
 import javax.enterprise.inject.spi.Bean;
 import java.io.ObjectStreamException;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
Mon May 27 10:08:41 2013
@@ -38,10 +38,10 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.ExceptionUtil;
-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.asm4.ClassWriter;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
 
 /**
  * This factory creates proxies which delegate the

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
Mon May 27 10:08:41 2013
@@ -26,10 +26,10 @@ import java.util.List;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.util.ClassUtil;
-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.asm4.ClassWriter;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
 
 /**
  * This factory creates subclasses for abstract classes.

Modified: openwebbeans/trunk/webbeans-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/pom.xml?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-osgi/pom.xml (original)
+++ openwebbeans/trunk/webbeans-osgi/pom.xml Mon May 27 10:08:41 2013
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
-            <version>3.7</version>
+            <version>3.14-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java?rev=1486556&r1=1486555&r2=1486556&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
(original)
+++ openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
Mon May 27 10:08:41 2013
@@ -221,14 +221,15 @@ public class OsgiMetaDataScannerService 
         {
 
             @Override
-            public void foundInDirectory(Bundle bundle, String basePath, URL url) throws
Exception
+            public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws
Exception
             {
                 logger.info("adding the following beans.xml URL: " + url);
                 beanXMLs.add(url);
+                return true;
             }
 
             @Override
-            public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream
in) throws Exception
+            public boolean foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream
in) throws Exception
             {
                 URL jarURL = bundle.getEntry(jarName);
 
@@ -236,6 +237,7 @@ public class OsgiMetaDataScannerService 
 
                 beanXMLs.add(jarURL);
                 beanArchiveJarNames.add(jarName);
+                return true;
             }
 
         };



Mime
View raw message