Fix container submit when agent is already running.

arquillian · Sep 22, 2014 · 1e5c3d1 · 1e5c3d1
1 parent d021480
commit 1e5c3d1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,6 +41,8 @@
         <version.slf4j>1.7.2</version.slf4j>
         <version.byteman>2.2.0.1</version.byteman>
 
+        <version.jarjar>1.9</version.jarjar>
+
         <path.tools_jar>${java.home}/../lib/tools.jar</path.tools_jar>
         <!--
         <path.tools_jar>/usr/lib/jvm/java-6-openjdk/lib/tools.jar</path.tools_jar>
@@ -169,6 +171,31 @@
                     <localCheckout>true</localCheckout>
                 </configuration>
             </plugin>
+            <!-- We need to jarjar this, since WildFly grabs all org.jboss.byteman as system packages -->
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>jarjar-maven-plugin</artifactId>
+                <version>${version.jarjar}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jarjar</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>org.jboss.byteman:byteman-submit</include>
+                            </includes>
+                            <rules>
+                                <rule>
+                                    <pattern>org.jboss.byteman.**</pattern>
+                                    <result>org.jboss.arquillian.extension.byteman.@1</result>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/java/org/jboss/arquillian/extension/byteman/impl/client/DeploymentAppender.java b/src/main/java/org/jboss/arquillian/extension/byteman/impl/client/DeploymentAppender.java
@@ -75,7 +75,11 @@ public Archive<?> createAuxiliaryArchive() {
 
             // add byteman archive as a resource in the jar, needed to install
             jar.add(new ArchiveAsset(agentJar, ZipExporter.class), BytemanConfiguration.BYTEMAN_JAR);
+        } else {
+            // add byteman-submit; as this is separate jar from agent jar
+            jar.addPackage(Submit.class.getPackage());
         }
+
         return jar;
     }
 }