[jboss-svn-commits] JBoss Common SVN: r4273 - in arquillian/trunk/containers/openwebbeans-embedded: src/main/java/org/jboss/arquillian/openwebbeans and 1 other directory.

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

Author: aslak
Date: 2010-04-20 11:23:27 -0400 (Tue, 20 Apr 2010)
New Revision: 4273

Modified:
   arquillian/trunk/containers/openwebbeans-embedded/
   arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java
   arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java
Log:
ARQ-102 Updated to ShrinkWrap alpha7



Property changes on: arquillian/trunk/containers/openwebbeans-embedded
___________________________________________________________________
Name: svn:ignore
   - target

   + .classpath
.project
.settings
target


Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java	2010-04-20 15:13:07 UTC (rev 4272)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java	2010-04-20 15:23:27 UTC (rev 4273)
@@ -26,8 +26,9 @@
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Iterator;
+
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.Node;
 
 /**
  * A ClassLoader implementation that can locate resources in a ShrinkWrap archive
@@ -52,7 +53,7 @@
    @Override
    protected URL findResource(final String name)
    {
-      final Asset a = archive.get(name);
+      final Node a = archive.get(name);
       if (a == null)
       {
          return null;
@@ -75,7 +76,7 @@
                   public InputStream getInputStream()
                         throws IOException
                   {
-                     return a.openStream();
+                     return a.getAsset().openStream();
                   }
                };
             }

Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java	2010-04-20 15:13:07 UTC (rev 4272)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapMetaDataDiscovery.java	2010-04-20 15:23:27 UTC (rev 4273)
@@ -22,11 +22,13 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.util.Map;
+
 import org.apache.webbeans.spi.deployer.AbstractMetaDataDiscovery;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePath;
 import org.jboss.shrinkwrap.api.Asset;
 import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.impl.base.asset.ClassAsset;
 
 /**
@@ -55,9 +57,9 @@
    @Override
    protected void configure() throws Exception
    {
-      Map<ArchivePath, Asset> beansXmls = archive.getContent(Filters.include("/META-INF/beans.xml"));
+      Map<ArchivePath, Node> beansXmls = archive.getContent(Filters.include("/META-INF/beans.xml"));
 	  boolean beansXmlPresent = false;
-      for (final Map.Entry<ArchivePath, Asset> entry : beansXmls.entrySet())
+      for (final Map.Entry<ArchivePath, Node> entry : beansXmls.entrySet())
       {
          try
          {
@@ -75,7 +77,7 @@
                            @Override
                            public InputStream getInputStream() throws IOException
                            {
-                              return entry.getValue().openStream();
+                              return entry.getValue().getAsset().openStream();
                            }
                         };
                      };
@@ -90,14 +92,14 @@
 
 	  if (beansXmlPresent)
 	  {
-         Map<ArchivePath, Asset> classes = archive.getContent(Filters.include(".*\\.class"));
-         for (Map.Entry<ArchivePath, Asset> classEntry : classes.entrySet())
+         Map<ArchivePath, Node> classes = archive.getContent(Filters.include(".*\\.class"));
+         for (Map.Entry<ArchivePath, Node> classEntry : classes.entrySet())
          {
             if (classEntry.getValue() instanceof ClassAsset)
             {
                try
                {
-                  getAnnotationDB().scanClass(((ClassAsset) classEntry.getValue()).openStream());
+                  getAnnotationDB().scanClass(classEntry.getValue().getAsset().openStream());
                }
                catch (Exception e)
                {