[jboss-svn-commits] JBoss Common SVN: r4011 - arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl.

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

Author: aslak
Date: 2010-02-09 06:52:35 -0500 (Tue, 09 Feb 2010)
New Revision: 4011

Modified:
   arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAppenderArchiveGenerator.java
Log:
ARQ-62 Added UserGenerated and WebArchives as ear modules, the rest as ear libraries


Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAppenderArchiveGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAppenderArchiveGenerator.java	2010-02-09 11:51:10 UTC (rev 4010)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/DeploymentAppenderArchiveGenerator.java	2010-02-09 11:52:35 UTC (rev 4011)
@@ -22,6 +22,7 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.Archives;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 /**
  * DeploymentAppenderArchiveGenerator
@@ -51,15 +52,19 @@
       Archive<?> userArchive = generator.generateArchive(testCase);
       
       EnterpriseArchive fullDeployment = Archives.create("test.ear", EnterpriseArchive.class)
-                  .addModule(userArchive);
+                  .addModule(userArchive);  
       
       for(Archive<?> moduleArchive : moduleArchives )
       {
-         fullDeployment.addModule(moduleArchive);
+         if(WebArchive.class.isInstance(moduleArchive))
+         {
+            fullDeployment.addModule(moduleArchive);
+         } 
+         else 
+         {
+            fullDeployment.addLibrary(moduleArchive);
+         }
       }
-    
-      //fullDeployment.as(ExplodedExporter.class).exportExploded(new File("target"));
-      
       return fullDeployment;
    }
 }