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

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

Author: ALRubinger
Date: 2010-04-16 02:01:28 -0400 (Fri, 16 Apr 2010)
New Revision: 4259

Modified:
   arquillian/trunk/build/pom.xml
   arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
Log:
[ARQ-102] Update the ShrinkWrap dependency to 1.0.0-alpha-7 and refactor as necessary

Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml	2010-04-15 09:59:25 UTC (rev 4258)
+++ arquillian/trunk/build/pom.xml	2010-04-16 06:01:28 UTC (rev 4259)
@@ -29,7 +29,7 @@
       <!-- Versioning -->
       <version.junit_junit>4.6</version.junit_junit>
       <version.testng_testng>5.10</version.testng_testng>
-      <version.shrinkwrap_shrinkwrap>1.0.0-alpha-5</version.shrinkwrap_shrinkwrap>
+      <version.shrinkwrap_shrinkwrap>1.0.0-alpha-7</version.shrinkwrap_shrinkwrap>
       <version.jboss_embedded>1.0.0-alpha-1</version.jboss_embedded>
       <version.javaee_api>6.0</version.javaee_api>
       <version.jetty_jetty>6.1.9</version.jetty_jetty>
@@ -219,6 +219,11 @@
             <version>${version.shrinkwrap_shrinkwrap}</version>
          </dependency>
          <dependency>
+           <groupId>org.jboss.shrinkwrap</groupId>
+           <artifactId>shrinkwrap-extension-vfs3</artifactId>
+           <version>${version.shrinkwrap_shrinkwrap}</version>
+         </dependency>
+         <dependency>
             <groupId>org.jboss.embedded</groupId>
             <artifactId>jboss-embedded-assembly</artifactId>
             <classifier>launcher</classifier>

Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-04-15 09:59:25 UTC (rev 4258)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java	2010-04-16 06:01:28 UTC (rev 4259)
@@ -30,11 +30,10 @@
 
 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.AssignableBase;
 import org.jboss.shrinkwrap.impl.base.Validate;
-import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
 import org.jboss.shrinkwrap.impl.base.asset.ClassAsset;
 import org.jboss.weld.bootstrap.api.ServiceRegistry;
 import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
@@ -69,8 +68,8 @@
    public Collection<URL> getBeansXml()
    {
       List<URL> beanClasses = new ArrayList<URL>();
-      Map<ArchivePath, Asset> classes = archive.getContent(Filters.include(".*/beans.xml"));
-      for(final Map.Entry<ArchivePath, Asset> entry : classes.entrySet()) 
+      Map<ArchivePath, Node> classes = archive.getContent(Filters.include(".*/beans.xml"));
+      for(final Map.Entry<ArchivePath, Node> entry : classes.entrySet()) 
       {
          try 
          {
@@ -88,7 +87,7 @@
                            public InputStream getInputStream()
                                  throws IOException
                            {
-                              return entry.getValue().openStream();
+                              return entry.getValue().getAsset().openStream();
                            }
                         };
                      };
@@ -105,8 +104,8 @@
    public Collection<Class<?>> getBeanClasses()
    {
       List<Class<?>> beanClasses = new ArrayList<Class<?>>();
-      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)
          {
@@ -143,14 +142,14 @@
       return serviceRegistry;
    }
    
-   private Object extractFieldFromAsset(Asset asset, String fieldName) 
+   private Object extractFieldFromAsset(Node node, String fieldName) 
    {
       try 
       {
-         Field field = asset.getClass().getDeclaredField(fieldName);
+         Field field = node.getClass().getDeclaredField(fieldName);
          field.setAccessible(true);
          
-         return field.get(asset);
+         return field.get(node);
       } 
       catch (Exception e) 
       {