svn commit: r1292696 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/config/AggregatedArchive.java pom.xml

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb 23 08:16:04 2012
New Revision: 1292696

URL: http://svn.apache.org/viewvc?rev=1292696&view=rev
Log:
adding ConfigurableClasspathArchive

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

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AggregatedArchive.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AggregatedArchive.java?rev=1292696&r1=1292695&r2=1292696&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AggregatedArchive.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AggregatedArchive.java Thu Feb 23 08:16:04 2012
@@ -16,15 +16,11 @@
  */
 package org.apache.openejb.config;
 
-import org.apache.openejb.xbean.xml.XMLAnnotationFinderHelper;
-import org.apache.xbean.finder.ResourceFinder;
 import org.apache.xbean.finder.archive.Archive;
-import org.apache.xbean.finder.archive.ClasspathArchive;
 import org.apache.xbean.finder.archive.CompositeArchive;
 import org.apache.xbean.finder.archive.FilteredArchive;
 import org.apache.xbean.finder.filter.Filter;
 
-import javax.xml.bind.JAXBException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -38,7 +34,7 @@ import java.util.Map;
 /**
 * @version $Rev$ $Date$
 */
-public class AggregatedArchive implements Archive, ScanConstants {
+public class AggregatedArchive implements Archive {
 
     private final Map<URL, List<String>> classesMap = new HashMap<URL, List<String>>();
     private final Archive archive;
@@ -48,21 +44,9 @@ public class AggregatedArchive implement
 
         for (URL url : urls) {
 
-            Archive rawArchive;
-
-            final ResourceFinder scanFinder = new ResourceFinder("", url);
-            try {
-                final URL scanXml = scanFinder.find(SCAN_XML);
-                rawArchive = XMLAnnotationFinderHelper.xmlArchive(scanXml.openStream(), loader, Arrays.asList(url));
-            } catch (IOException e) {
-                rawArchive = ClasspathArchive.archive(loader, url);
-            } catch (JAXBException e) {
-                rawArchive = ClasspathArchive.archive(loader, url);
-            }
-
             final List<String> classes = new ArrayList<String>();
 
-            final Archive archive = new FilteredArchive(rawArchive, new Filter() {
+            final Archive archive = new FilteredArchive(new ConfigurableClasspathArchive(loader, Arrays.asList(url)), new Filter() {
                 @Override
                 public boolean accept(String name) {
                     classes.add(name);

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1292696&r1=1292695&r2=1292696&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Thu Feb 23 08:16:04 2012
@@ -499,11 +499,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>xbean-xml</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>javaee-api</artifactId>
         <version>${javaee-api.version}</version>