[jboss-svn-commits] JBoss Common SVN: r4077 - in arquillian/trunk/container-weld-embedded: src/main/java/org/jboss/arquillian/weld/shrinkwrap and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-03-01 03:36:29 -0500 (Mon, 01 Mar 2010)
New Revision: 4077

Modified:
   arquillian/trunk/container-weld-embedded/pom.xml
   arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
Log:
ARQ-25 Changed to use applicationarchive deployment packager


Modified: arquillian/trunk/container-weld-embedded/pom.xml
===================================================================
--- arquillian/trunk/container-weld-embedded/pom.xml	2010-03-01 08:28:31 UTC (rev 4076)
+++ arquillian/trunk/container-weld-embedded/pom.xml	2010-03-01 08:36:29 UTC (rev 4077)
@@ -53,8 +53,15 @@
          <artifactId>shrinkwrap-impl-base</artifactId>
       </dependency>
 
+
       <dependency>
          <groupId>org.jboss.arquillian</groupId>
+         <artifactId>arquillian-packager-applicationarchive</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.arquillian</groupId>
          <artifactId>arquillian-testenricher-cdi</artifactId>
          <version>${project.version}</version>
       </dependency>

Modified: arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-03-01 08:28:31 UTC (rev 4076)
+++ arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-03-01 08:36:29 UTC (rev 4077)
@@ -69,44 +69,33 @@
    public Collection<URL> getBeansXml()
    {
       List<URL> beanClasses = new ArrayList<URL>();
-      Map<ArchivePath, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
-      for(Map.Entry<ArchivePath, Asset> archiveEntry : archives.entrySet()) 
+      Map<ArchivePath, Asset> classes = archive.getContent(Filters.include(".*/beans.xml"));
+      for(final Map.Entry<ArchivePath, Asset> entry : classes.entrySet()) 
       {
-         if(archiveEntry.getValue() instanceof ArchiveAsset) 
+         try 
          {
-            Archive<?> beansArchive = (Archive<?>) extractFieldFromAsset(archiveEntry.getValue(), "archive");
-            if(beansArchive.getName().matches("arquillian.*")) {
-               continue;
-            }
-            Map<ArchivePath, Asset> classes = beansArchive.getContent(Filters.include(".*/beans.xml"));
-            for(final Map.Entry<ArchivePath, Asset> entry : classes.entrySet()) 
-            {
-               try 
-               {
-                  beanClasses.add(
-                        new URL(null, "archive://" + entry.getKey().get(), new URLStreamHandler() 
+            beanClasses.add(
+                  new URL(null, "archive://" + entry.getKey().get(), new URLStreamHandler() 
+                  {
+                     protected java.net.URLConnection openConnection(URL u) throws java.io.IOException 
+                     {
+                        return new URLConnection(u)
                         {
-                           protected java.net.URLConnection openConnection(URL u) throws java.io.IOException 
+                           @Override
+                           public void connect() throws IOException { }
+                           
+                           @Override
+                           public InputStream getInputStream()
+                                 throws IOException
                            {
-                              return new URLConnection(u)
-                              {
-                                 @Override
-                                 public void connect() throws IOException { }
-                                 
-                                 @Override
-                                 public InputStream getInputStream()
-                                       throws IOException
-                                 {
-                                    return entry.getValue().openStream();
-                                 }
-                              };
-                           };
-                        }));
-               } 
-               catch (Exception e) {
-                  e.printStackTrace();
-               }
-            }
+                              return entry.getValue().openStream();
+                           }
+                        };
+                     };
+                  }));
+         } 
+         catch (Exception e) {
+            e.printStackTrace();
          }
       }
       return beanClasses;
@@ -116,26 +105,15 @@
    public Collection<Class<?>> getBeanClasses()
    {
       List<Class<?>> beanClasses = new ArrayList<Class<?>>();
-      Map<ArchivePath, Asset> archives = archive.getContent(Filters.include(".*\\.jar"));
-      for(Map.Entry<ArchivePath, Asset> archiveEntry : archives.entrySet()) 
+      Map<ArchivePath, Asset> classes = archive.getContent(Filters.include(".*\\.class"));
+      for(Map.Entry<ArchivePath, Asset> classEntry : classes.entrySet()) 
       {
-         if(archiveEntry.getValue() instanceof ArchiveAsset) 
+         if (classEntry.getValue() instanceof ClassAsset)
          {
-            Archive<?> beansArchive = (Archive<?>) extractFieldFromAsset(archiveEntry.getValue(), "archive");
-            if(beansArchive.getName().matches("arquillian.*")) {
-               continue;
-            }
-            Map<ArchivePath, Asset> classes = beansArchive.getContent(Filters.include(".*\\.class"));
-            for(Map.Entry<ArchivePath, Asset> classEntry : classes.entrySet()) 
-            {
-               if (classEntry.getValue() instanceof ClassAsset)
-               {
-                  beanClasses.add(
-                        (Class<?>)extractFieldFromAsset(
-                              classEntry.getValue(),
-                              "clazz"));
-               }
-            }
+            beanClasses.add(
+                  (Class<?>)extractFieldFromAsset(
+                        classEntry.getValue(),
+                        "clazz"));
          }
       }
       return beanClasses;