[jboss-svn-commits] JBL Code SVN: r37718 - in labs/jbosstm/trunk: ArjunaJTS/jtax and 2 other directories.

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

Author: mmusgrov
Date: 2011-11-10 08:28:27 -0500 (Thu, 10 Nov 2011)
New Revision: 37718

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
   labs/jbosstm/trunk/pom.xml
Log:
[JBTM-934] Set surefire configuration properties in the idlj pom profile to switch ORBs

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-11-10 13:28:19 UTC (rev 37717)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-11-10 13:28:27 UTC (rev 37718)
@@ -51,6 +51,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <systemProperties combine.children="append"/>
           <excludes>
             <exclude>**/common/**</exclude>
             <exclude>**/ExampleXAResource.java</exclude>

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-11-10 13:28:19 UTC (rev 37717)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-11-10 13:28:27 UTC (rev 37718)
@@ -54,6 +54,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <systemProperties combine.children="append"/>
           <excludes>
             <!-- exclude tests which we don't want to run -->
             <exclude>**/common/**</exclude>

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml	2011-11-10 13:28:19 UTC (rev 37717)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml	2011-11-10 13:28:27 UTC (rev 37718)
@@ -57,6 +57,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <systemProperties combine.children="append"/>
           <excludes>
             <!-- exclude tests which we don't want to run -->
             <exclude>**/common/**</exclude>

Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml	2011-11-10 13:28:19 UTC (rev 37717)
+++ labs/jbosstm/trunk/pom.xml	2011-11-10 13:28:27 UTC (rev 37718)
@@ -375,20 +375,6 @@
 				<message>"You must tell me where emma is located - set the -DTS_EMMA_JAR 
 				property"</message> </requireProperty> </rules> <fail>true</fail> </configuration> 
 				</execution> </executions> </plugin> -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>pertest</forkMode>
-          <workingDirectory>target/test-classes</workingDirectory>
-          <runOrder>alphabetical</runOrder>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <inherited>true</inherited>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencyManagement>
@@ -837,6 +823,62 @@
     <emma.jar.location>${project.basedir}/ext/emma.jar</emma.jar.location>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <profiles>
+    <profile>
+      <id>jacorb</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>pertest</forkMode>
+              <workingDirectory>target/test-classes</workingDirectory>
+              <runOrder>alphabetical</runOrder>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+              <inherited>true</inherited>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>idlj</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>pertest</forkMode>
+              <workingDirectory>target/test-classes</workingDirectory>
+              <runOrder>alphabetical</runOrder>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+              <inherited>true</inherited>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+              <systemPropertyVariables>
+                <OrbPortabilityEnvironmentBean.orbImpleClassName>com.arjuna.orbportability.internal.orbspecific.javaidl.orb.implementations.javaidl_1_4</OrbPortabilityEnvironmentBean.orbImpleClassName>
+                <OrbPortabilityEnvironmentBean.poaImpleClassName>com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4</OrbPortabilityEnvironmentBean.poaImpleClassName>
+                <OrbPortabilityEnvironmentBean.orbDataClassName>com.arjuna.orbportability.internal.orbspecific.versions.javaidl_1_4</OrbPortabilityEnvironmentBean.orbDataClassName>
+              </systemPropertyVariables>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <modules>
     <module>docs</module>
     <module>common</module>