Revert "Remove some deps leftovers & testsuite cleanup"

This reverts commit 005567f.
schakko · Nov 22, 2013 · b05a7ff · b05a7ff
1 parent cf2d15a
commit b05a7ff
Show file tree

Hide file tree

Showing 98 changed files with 2,238 additions and 841 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -38,6 +38,24 @@
 
     <name>WildFly: Application Client Bootstrap</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>org/jboss/as/ejb3/**/*TestCase.java</include>
+                    </includes>
+                    <systemPropertyVariables>
+                      <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+                      <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+                      <org.jboss.model.test.maven.repository.urls>${org.jboss.model.test.maven.repository.urls}</org.jboss.model.test.maven.repository.urls>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/arquillian/container-embedded/pom.xml b/arquillian/container-embedded/pom.xml
@@ -98,6 +98,7 @@
 									<directory>${jboss.home}</directory>
 									<excludes>
 										<exclude>modules/</exclude>
+										<exclude>bundles/</exclude>
 									</excludes>
 								</resource>
 							</resources>
@@ -115,6 +116,7 @@
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <jboss.home>${jboss.home}</jboss.home>
                         <module.path>${jboss.home}/modules</module.path>
+                        <bundle.path>${jboss.home}/bundles</bundle.path>
                     </systemPropertyVariables>
                     <redirectTestOutputToFile>false</redirectTestOutputToFile>
                 </configuration>

diff --git a/arquillian/container-managed-domain/pom.xml b/arquillian/container-managed-domain/pom.xml
@@ -100,6 +100,7 @@
                                     <directory>${jboss.home}</directory>
                                     <excludes>
                                         <exclude>modules/</exclude>
+                                        <exclude>bundles/</exclude>
                                     </excludes>
                                 </resource>
                             </resources>
@@ -110,7 +111,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${version.surefire.plugin}</version>
                 <configuration>
                     <systemProperties>
                         <property>

diff --git a/arquillian/container-managed/pom.xml b/arquillian/container-managed/pom.xml
@@ -128,6 +128,7 @@
                                     <directory>${jboss.home}</directory>
                                     <excludes>
                                         <exclude>modules/</exclude>
+                                        <exclude>bundles/</exclude>
                                     </excludes>
                                 </resource>
                             </resources>
@@ -152,6 +153,10 @@
                           <name>module.path</name>
                           <value>${jboss.home}/modules</value>
                         </property>
+                        <property>
+                          <name>bundle.path</name>
+                          <value>${jboss.home}/bundles</value>
+                        </property>
                     </systemProperties>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>

diff --git a/arquillian/testng-integration/pom.xml b/arquillian/testng-integration/pom.xml
@@ -84,6 +84,7 @@
                                     <directory>${jboss.home}</directory>
                                     <excludes>
                                         <exclude>modules/</exclude>
+                                        <exclude>bundles/</exclude>
                                     </excludes>
                                 </resource>
                             </resources>

diff --git a/build/lib.xml b/build/lib.xml
@@ -28,6 +28,7 @@
     <property name="module.repo.output.dir" value="${output.dir}/modules/system/layers/base"/>
     <property name="module.xml" value="module.xml"/>
 
+    <property name="bundle.repo.output.dir" value="${output.dir}/bundles/system/layers/base"/>
 
 
     <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" />
@@ -67,6 +68,38 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="bundle-def">
+        <attribute name="name"/>
+        <attribute name="slot" default="main"/>
+        <element name="resources" implicit="yes" optional="yes"/>
+
+        <sequential>
+            <echo message="Initializing bundle -> @{name}"/>
+            <!-- Figure out the correct bundle path -->
+            <define-bundle-dir name="@{name}" slot="@{slot}" />
+
+            <!-- Make the bundle output director -->
+            <mkdir dir="${bundle.repo.output.dir}/${current.bundle.path}"/>
+
+            <!-- Process the resource -->
+            <resources/>
+
+        </sequential>
+    </macrodef>
+
+    <macrodef name="maven-bundle" >
+        <attribute name="group"/>
+        <attribute name="artifact"/>
+
+        <sequential>
+            <!-- Copy the jar to the bundle dir -->
+            <copy todir="${bundle.repo.output.dir}/${current.bundle.path}" failonerror="true">
+                <fileset file="${@{group}:@{artifact}:jar}"/>
+                <mapper type="flatten" />
+            </copy>
+        </sequential>
+    </macrodef>
+
     <scriptdef name="define-module-dir" language="javascript">
         <attribute name="name"/>
         <attribute name="slot"/>
@@ -77,6 +110,15 @@
         ]]>
     </scriptdef>
 
+    <scriptdef name="define-bundle-dir" language="javascript">
+        <attribute name="name"/>
+        <attribute name="slot"/>
+        <![CDATA[
+            name = attributes.get("name");
+            name = name.replace(".", "/");
+            project.setProperty("current.bundle.path", name + "/" + attributes.get("slot"));
+        ]]>
+    </scriptdef>
 
     <macrodef name="maven-resource" >
         <attribute name="group"/>

diff --git a/clustering/infinispan/pom.xml b/clustering/infinispan/pom.xml
@@ -118,4 +118,34 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals><goal>properties</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <parallel>false</parallel>
+                    <argLine>-javaagent:"${org.jboss.byteman:byteman:jar}"=port:9091,boot:"${org.jboss.byteman:byteman:jar}"</argLine>
+                    <systemPropertyVariables>
+                        <org.jboss.byteman.contrib.bmunit.agent.inhibit>true</org.jboss.byteman.contrib.bmunit.agent.inhibit>
+                        <org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
+                        <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+                        <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+                        <org.jboss.model.test.maven.repository.urls>${org.jboss.model.test.maven.repository.urls}</org.jboss.model.test.maven.repository.urls>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/...rc/test/java/org/jboss/as/clustering/infinispan/subsystem/OperationSequencesTestCase.java b/...rc/test/java/org/jboss/as/clustering/infinispan/subsystem/OperationSequencesTestCase.java
@@ -88,6 +88,7 @@ public void testCacheContainerRemoveRemoveSequence() throws Exception {
             targetLocation="AT ENTRY",
             action="$1.setRollbackOnly()")
     public void testCacheContainerRemoveRollback() throws Exception {
+
         // Parse and install the XML into the controller
         String subsystemXml = getSubsystemXml() ;
         KernelServices servicesA = createKernelServicesBuilder(null).setSubsystemXml(subsystemXml).build();

diff --git a/clustering/jgroups/pom.xml b/clustering/jgroups/pom.xml
@@ -94,4 +94,34 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals><goal>properties</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <parallel>false</parallel>
+                    <argLine>-javaagent:"${org.jboss.byteman:byteman:jar}"=port:9091,boot:"${org.jboss.byteman:byteman:jar}"</argLine>
+                    <systemPropertyVariables>
+                        <org.jboss.byteman.contrib.bmunit.agent.inhibit>true</org.jboss.byteman.contrib.bmunit.agent.inhibit>
+                        <org.jboss.byteman.contrib.bmunit.agent.port>9091</org.jboss.byteman.contrib.bmunit.agent.port>
+                        <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+                        <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+                        <org.jboss.model.test.maven.repository.urls>${org.jboss.model.test.maven.repository.urls}</org.jboss.model.test.maven.repository.urls>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/clustering/pom.xml b/clustering/pom.xml
@@ -79,6 +79,13 @@
             <artifactId>byteman-bmunit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <scope>system</scope>
+            <version>${maven.compiler.source}</version>
+            <systemPath>${com.sun.tools.path}</systemPath>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/clustering/web/infinispan/pom.xml b/clustering/web/infinispan/pom.xml
@@ -72,4 +72,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>
+                        -AgeneratedTranslationFilesPath=${project.basedir}/target/generated-translation-files
+                    </compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/clustering/web/spi/pom.xml b/clustering/web/spi/pom.xml
@@ -72,4 +72,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>
+                        -AgeneratedTranslationFilesPath=${project.basedir}/target/generated-translation-files
+                    </compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/clustering/web/undertow/pom.xml b/clustering/web/undertow/pom.xml
@@ -63,4 +63,19 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>
+                        -AgeneratedTranslationFilesPath=${project.basedir}/target/generated-translation-files
+                    </compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
@@ -37,6 +37,24 @@
 
     <name>WildFly: Config Admin</name>
 
+    <build>
+       <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                  <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                  <enableAssertions>true</enableAssertions>
+                  <systemPropertyVariables>
+                      <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+                      <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+                      <org.jboss.model.test.maven.repository.urls>${org.jboss.model.test.maven.repository.urls}</org.jboss.model.test.maven.repository.urls>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
@@ -78,7 +96,7 @@
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-subsystem-test</artifactId>
-            <type>pom</type>
+						<type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -33,6 +33,25 @@
     <groupId>org.wildfly</groupId>
     <artifactId>wildfly-connector</artifactId>
     <name>WildFly: Connector Subsystem</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <enableAssertions>false</enableAssertions>
+                    <systemPropertyVariables>
+                      <org.jboss.model.test.cache.root>${org.jboss.model.test.cache.root}</org.jboss.model.test.cache.root>
+                      <org.jboss.model.test.classpath.cache>${org.jboss.model.test.classpath.cache}</org.jboss.model.test.classpath.cache>
+                      <org.jboss.model.test.maven.repository.urls>${org.jboss.model.test.maven.repository.urls}</org.jboss.model.test.maven.repository.urls>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>

diff --git a/controller-client/pom.xml b/controller-client/pom.xml
@@ -44,6 +44,21 @@
         <maven.compiler.source>1.6</maven.compiler.source>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <enableAssertions>false</enableAssertions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>