Set up all the transformers tests to use the cached classloader from …

…the checkouts target/model-test-classpath-cache folder
QStephen · Mar 6, 2013 · ab48d70 · ab48d70
1 parent 747b568
commit ab48d70
Show file tree

Hide file tree

Showing 36 changed files with 256 additions and 9 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -47,6 +47,10 @@
                     <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/clustering/infinispan/pom.xml b/clustering/infinispan/pom.xml
@@ -135,8 +135,10 @@
                     <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>
-                    </systemPropertyVariables>
+                        <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>
+		                </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/clustering/jgroups/pom.xml b/clustering/jgroups/pom.xml
@@ -107,6 +107,8 @@
                     <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>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

diff --git a/cmp/pom.xml b/cmp/pom.xml
@@ -94,6 +94,10 @@
                     <includes>
                         <include>org/jboss/as/cmp/**/*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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/configadmin/pom.xml b/configadmin/pom.xml
@@ -38,6 +38,23 @@
 
     <name>JBoss Application Server: 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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.as</groupId>

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -43,6 +43,10 @@
                         <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/core-model-test/tests/pom.xml b/core-model-test/tests/pom.xml
@@ -53,7 +53,7 @@
                   <redirectTestOutputToFile>true</redirectTestOutputToFile>
                   <enableAssertions>true</enableAssertions>
                   <systemPropertyVariables>
-                      <org.jboss.model.test.root>${org.jboss.model.test.root}</org.jboss.model.test.root>
+                      <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>
                   </systemPropertyVariables>
               </configuration>

diff --git a/ee/pom.xml b/ee/pom.xml
@@ -38,6 +38,23 @@
 
     <name>JBoss Application Server: EE</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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>javax.validation</groupId>

diff --git a/ejb3/pom.xml b/ejb3/pom.xml
@@ -47,6 +47,10 @@ vi:ts=4:sw=4:expandtab
                     <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jacorb/pom.xml b/jacorb/pom.xml
@@ -76,10 +76,21 @@
                 </execution>
              </executions>
           </plugin>
+          <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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
        </plugins>
     </build>
 
-
     <dependencies>
         <dependency>
             <groupId>org.jacorb</groupId>

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
@@ -45,6 +45,10 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <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>
+                     </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jdr/jboss-as-jdr/pom.xml b/jdr/jboss-as-jdr/pom.xml
@@ -35,6 +35,23 @@
     <artifactId>jboss-as-jdr</artifactId>
     <name>JBoss Application Server: JDR</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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>commons-cli</groupId>

diff --git a/jmx/pom.xml b/jmx/pom.xml
@@ -49,6 +49,10 @@
                         <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jpa/core/pom.xml b/jpa/core/pom.xml
@@ -39,6 +39,23 @@
 
     <name>JBoss Application Server: JPA Subsystem</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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <!-- Internal -->
 

diff --git a/jpa/core/src/test/java/org/jboss/as/jpa/subsystem/JPA11SubsystemTestCase.java b/jpa/core/src/test/java/org/jboss/as/jpa/subsystem/JPA11SubsystemTestCase.java
@@ -101,6 +101,7 @@ private void testTransformers_1_1_0_RejectExpressions(ModelTestControllerVersion
 
         builder.createLegacyKernelServicesBuilder(null, controllerVersion, oldVersion)
                 .setExtensionClassName(JPAExtension.class.getName())
+                .addMavenResourceURL("org.jboss.as:jboss-as-jpa-spi:" + controllerVersion.getMavenGavVersion())
                 .addMavenResourceURL("org.jboss.as:jboss-as-jpa:" + controllerVersion.getMavenGavVersion());
 
         KernelServices mainServices = builder.build();

diff --git a/jsf/subsystem/pom.xml b/jsf/subsystem/pom.xml
@@ -100,7 +100,10 @@
                 <configuration>
                     <systemPropertyVariables>
                         <module.path>${basedir}${file.separator}src${file.separator}test${file.separator}resources${file.separator}modules${path.separator}${basedir}${file.separator}src${file.separator}test${file.separator}resources${file.separator}modules2</module.path>
+                        <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>
                     </systemPropertyVariables>
+
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jsr77/pom.xml b/jsr77/pom.xml
@@ -48,6 +48,10 @@
                         <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -65,7 +65,9 @@
                         <jboss.server.config.dir>${project.build.directory}${file.separator}config</jboss.server.config.dir>
                         <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>
-                    </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>
+                  </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/mail/pom.xml b/mail/pom.xml
@@ -37,6 +37,23 @@
 
     <packaging>jar</packaging>
 
+    <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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.as</groupId>

diff --git a/messaging/pom.xml b/messaging/pom.xml
@@ -45,6 +45,10 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            <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>
+		        </systemPropertyVariables>
           </configuration>
         </plugin>
       </plugins>

diff --git a/modcluster/pom.xml b/modcluster/pom.xml
@@ -46,6 +46,10 @@
                         <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>
+		                </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/model-test/src/main/java/org/jboss/as/model/test/ChildFirstClassLoaderBuilder.java b/model-test/src/main/java/org/jboss/as/model/test/ChildFirstClassLoaderBuilder.java
@@ -47,7 +47,7 @@ public class ChildFirstClassLoaderBuilder {
 
     //Use this property on the lightning runs to make sure that people have set the root and cache properties
     private static final String STRICT_PROPERTY = "org.jboss.model.test.cache.strict";
-    private static final String ROOT_PROPERTY = "org.jboss.model.test.root";
+    private static final String ROOT_PROPERTY = "org.jboss.model.test.cache.root";
     private static final String CACHE_FOLDER_PROPERTY = "org.jboss.model.test.classpath.cache";
 
 

diff --git a/naming/pom.xml b/naming/pom.xml
@@ -38,6 +38,23 @@
 
     <name>JBoss Application Server: Naming Subsystem</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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss.as</groupId>

diff --git a/osgi/service/pom.xml b/osgi/service/pom.xml
@@ -140,6 +140,10 @@
                             <value>org.jboss.logmanager.LogManager</value>
                         </property>
                     </systemProperties>
+                    <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>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/pojo/pom.xml b/pojo/pom.xml
@@ -38,6 +38,23 @@
 
     <name>JBoss Application Server: POJO Subsystem</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>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+       </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.jboss</groupId>

diff --git a/pom.xml b/pom.xml
@@ -283,10 +283,15 @@
         <!-- tools.jar location, this needs to be overriden on OSX -->
         <com.sun.tools.path>${java.home}/../lib/tools.jar</com.sun.tools.path>
 
+        <!--  
+            See ChildFirstClassLoaderBuilder in model-test for the explanation of the org.jboss.model.test.cache.root and org.jboss.model.test.classpath.cache properties.
+            If used in conjunction with org.jboss.model.test.classpath.cache -Dorg.jboss.model.test.cache.strict on the command line, transformers tests must 
+            propagate these to the test when run
+         -->
         <!-- The name of the root checkout folder to create org.jboss.model.test.classpath.cache under for subsystem-test and core-model-test -->
-        <org.jboss.model.test.root>jboss-as</org.jboss.model.test.root>
+        <org.jboss.model.test.cache.root>jboss-as</org.jboss.model.test.cache.root>
         <!-- Location relative to root that will be used for the cached legacy classpaths used by subsystem-test and core-model-test-->
-        <org.jboss.model.test.classpath.cache>target/classpath</org.jboss.model.test.classpath.cache>
+        <org.jboss.model.test.classpath.cache>target/model-test-classpath-cache</org.jboss.model.test.classpath.cache>
     </properties>
 
     <modules>