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

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

Author: ALRubinger
Date: 2010-05-14 00:04:56 -0400 (Fri, 14 May 2010)
New Revision: 4389

Modified:
   arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ClientDeploymentGenerator.java
Log:
[ARQ-139] Do not repackage @RunMode(LOCAL) @Deployments

Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ClientDeploymentGenerator.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ClientDeploymentGenerator.java	2010-05-12 23:41:19 UTC (rev 4388)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ClientDeploymentGenerator.java	2010-05-14 04:04:56 UTC (rev 4389)
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.jboss.arquillian.api.RunMode;
+import org.jboss.arquillian.api.RunModeType;
 import org.jboss.arquillian.spi.ApplicationArchiveGenerator;
 import org.jboss.arquillian.spi.ApplicationArchiveProcessor;
 import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
@@ -49,15 +51,25 @@
    {
       Validate.notNull(testCase, "TestCase must be specified");
 
-      DeploymentPackager packager = serviceLoader.onlyOne(DeploymentPackager.class);
-
+      
       Archive<?> applicationArchive = serviceLoader.onlyOne(ApplicationArchiveGenerator.class).generateApplicationArchive(testCase);
-      applyApplicationProcessors(applicationArchive, testCase);
       
-      List<Archive<?>> auxiliaryArchives = loadAuxiliaryArchives();
-      applyAuxiliaryProcessors(auxiliaryArchives);
-
-      return packager.generateDeployment(applicationArchive, auxiliaryArchives);
+      // Only further package tests in RunModeType.REMOTE
+      // ARQ-139
+      final RunMode runMode = testCase.getAnnotation(RunMode.class);
+      if (runMode != null && RunModeType.REMOTE.equals(runMode.value()))
+      {
+         DeploymentPackager packager = serviceLoader.onlyOne(DeploymentPackager.class);
+         applyApplicationProcessors(applicationArchive, testCase);
+         List<Archive<?>> auxiliaryArchives = loadAuxiliaryArchives();
+         applyAuxiliaryProcessors(auxiliaryArchives);
+         return packager.generateDeployment(applicationArchive, auxiliaryArchives);
+      }
+      else
+      {
+         // Don't wrap/repackage anything, return the user's deployment intact
+         return applicationArchive;
+      }
    }
    
    private List<Archive<?>> loadAuxiliaryArchives()