You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/15 08:56:01 UTC

svn commit: r1326263 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java pom.xml

Author: dblevins
Date: Sun Apr 15 06:56:00 2012
New Revision: 1326263

URL: http://svn.apache.org/viewvc?rev=1326263&view=rev
Log:
Upgrade to XBean 3.11-SNAPSHOT to get XBEAN-205: JarArchive and Archive API reworked for greater performance

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
    openejb/trunk/openejb/pom.xml

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1326263&r1=1326262&r2=1326263&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Sun Apr 15 06:56:00 2012
@@ -52,7 +52,9 @@ public class FinderFactory {
         IAnnotationFinder finder;
         if (module instanceof WebModule) {
             WebModule webModule = (WebModule) module;
-            finder = new AnnotationFinder(new WebappAggregatedArchive(webModule, webModule.getScannableUrls())).link();
+            AnnotationFinder annotationFinder = new AnnotationFinder(new WebappAggregatedArchive(webModule, webModule.getScannableUrls()));
+            if (annotationFinder.hasMetaAnnotations()) annotationFinder = annotationFinder.link();
+            finder = annotationFinder;
         } else if (module instanceof ConnectorModule) {
         	ConnectorModule connectorModule = (ConnectorModule) module;
         	finder = new AnnotationFinder(new ConfigurableClasspathArchive(connectorModule, connectorModule.getLibraries())).link();

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java?rev=1326263&r1=1326262&r2=1326263&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/WebappAggregatedArchive.java Sun Apr 15 06:56:00 2012
@@ -79,7 +79,7 @@ public class WebappAggregatedArchive imp
     }
 
     @Override
-    public Iterator<String> iterator() {
+    public Iterator<Entry> iterator() {
         return archive.iterator();
     }
 

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1326263&r1=1326262&r2=1326263&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Sun Apr 15 06:56:00 2012
@@ -94,7 +94,7 @@
     <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
 
     <!-- This is used by a manifest classpath entry -->
-    <xbeanVersion>3.10-SNAPSHOT</xbeanVersion>
+    <xbeanVersion>3.11-SNAPSHOT</xbeanVersion>
 
     <!-- OSGi bundles properties -->
     <openejb.bundle.activator/>