[jboss-svn-commits] JBL Code SVN: r38188 - in labs/jbosstm/branches/JBOSSTS_4_16: XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Sep 20 14:29:17 EDT 2012


Author: paul.robinson
Date: 2012-09-20 14:29:17 -0400 (Thu, 20 Sep 2012)
New Revision: 38188

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/pom.xml
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/scripts/BASubordinateCrashDuringComplete.txt
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestInterpreter.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseAndExitTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseAndExitTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseAndExitTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseAndExitTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleCoordinatorCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleParticipantCompletionParticipantCloseTest.java
   labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
Log:
JBTM-1263 Port all xts crash recovery fixes from narayana 5.x branch

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/pom.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/pom.xml	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/pom.xml	2012-09-20 18:29:17 UTC (rev 38188)
@@ -4,105 +4,122 @@
 	General Public License, v. 2.1. This program is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
 	PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License, v.2.1 along with this distribution; if not, write to the Free 
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<groupId>org.jboss.narayana.xts</groupId>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>localjunit-crash-recovery-tests</artifactId>
-	<packaging>jar</packaging>
-	<name>xts crash recovery tests</name>
-	<description>xts crash recovery tests</description>
-	<version>4.16.5.Final-SNAPSHOT</version>
-	<!--
-	<repositories>
-		<repository>
-			<id>jboss-public-repository</id>
-			<name>JBoss Repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	-->
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossxts-api</artifactId>
-			<version>4.16.5.Final-SNAPSHOT</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../build/jbossxts-api.jar</systemPath>
-		</dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+        <groupId>org.jboss.narayana.xts</groupId>
+        <modelVersion>4.0.0</modelVersion>
+        <artifactId>localjunit-crash-recovery-tests</artifactId>
+        <packaging>jar</packaging>
+        <name>xts crash recovery tests</name>
+        <description>xts crash recovery tests</description>
+        <version>4.16.5.Final-SNAPSHOT</version>
+
+    <properties>
+        <general.server.jvm.args>-Xms64m -Xmx1024m -XX:MaxPermSize=512m</general.server.jvm.args>
+        <ipv4.server.jvm.args></ipv4.server.jvm.args>
+        <ipv6.server.jvm.args>-Djboss.bind.address=[::1] -Djboss.bind.address.management=[::1] -Djboss.bind.address.unsecure=[::1] -Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</ipv6.server.jvm.args>
+        <server.debug.args>Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006</server.debug.args>
+    </properties>
+
+        <dependencies>
                 <dependency>
                         <groupId>org.jboss.jbossts</groupId>
+                        <artifactId>jbossxts-api</artifactId>
+                        <version>4.16.5.Final-SNAPSHOT</version>
+                        <scope>system</scope>
+                        <systemPath>${project.basedir}/../build/jbossxts-api.jar</systemPath>
+                </dependency>
+                <dependency>
+                        <groupId>org.jboss.jbossts</groupId>
                         <artifactId>jbossjta</artifactId>
                         <version>4.16.5.Final-SNAPSHOT</version>
                         <scope>system</scope>
-			<systemPath>${project.basedir}/../../../ArjunaJTS/build/install/lib/jbossjts.jar</systemPath>
+                        <systemPath>${project.basedir}/../../../ArjunaJTS/build/install/lib/jbossjts.jar</systemPath>
                 </dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.arquillian.junit</groupId>
-			<artifactId>arquillian-junit-container</artifactId>
-			<version>1.0.0.Final</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<!-- The default profile skips all tests, though you can tune it 
-			to run just unit tests based on a custom pattern -->
-			<!-- Seperate profiles are provided for running all tests, including 
-			Arquillian tests that execute in the specified container -->
-		 <id>default</id>
-		 <activation>
-			 <activeByDefault>true</activeByDefault>
-		 </activation>
-		 <build>
-			 <plugins>
-				 <plugin>
-					 <artifactId>maven-surefire-plugin</artifactId>
-					 <version>2.7.2</version>
-					 <configuration>
-						 <redirectTestOutputToFile>true</redirectTestOutputToFile>
-						 <skip>false</skip>
-					 </configuration>
-				 </plugin>
-			 </plugins>		 
-		 </build>
-		 <dependencies>
-				 <dependency>
-					 <groupId>org.jboss.as</groupId>
-					 <artifactId>jboss-as-arquillian-container-managed</artifactId>
-					 <version>7.1.1.Final</version>
-					 <scope>test</scope>
-				 </dependency>
-				  <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-controller-client</artifactId>
-                    <version>7.1.1.Final</version>
-                    <scope>test</scope>
+                <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <version>4.8.1</version>
+                        <scope>compile</scope>
                 </dependency>
-			 </dependencies>
-	 </profile>
- </profiles>
+                <dependency>
+                        <groupId>org.jboss.arquillian.junit</groupId>
+                        <artifactId>arquillian-junit-container</artifactId>
+                        <version>1.0.0.Final</version>
+                        <scope>compile</scope>
+                </dependency>
+        </dependencies>
+  <build>
+    <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.9</version>
+            <configuration>
+              <forkMode>once</forkMode>
+              <workingDirectory>.</workingDirectory>
+              <runOrder>alphabetical</runOrder>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+              <inherited>true</inherited>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+            </configuration>
+        </plugin>
+    </plugins>
+  </build>
+
+    <profiles>
+        <profile>
+            <id>arq</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables combine.children="append">
+                                <server.jvm.args>${general.server.jvm.args} ${ipv4.server.jvm.args}</server.jvm.args>
+                                <node.address>127.0.0.1</node.address>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+                        <dependencies>
+                                <dependency>
+                                        <groupId>org.jboss.as</groupId>
+                                        <artifactId>jboss-as-arquillian-container-managed</artifactId>
+                                        <version>7.2.0.Alpha1-SNAPSHOT</version>
+                                        <scope>test</scope>
+                                </dependency>
+                        </dependencies>
+        </profile>
+        <profile>
+            <id>arqIPv6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>${ipv6.server.jvm.args}</argLine>
+                            <environmentVariables>
+                            <CLI_IPV6_OPTS>-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</CLI_IPV6_OPTS>
+                            </environmentVariables>
+                            <systemPropertyVariables combine.children="append">
+                                <server.jvm.args>${general.server.jvm.args} ${ipv6.server.jvm.args}</server.jvm.args>
+                                <node.address>[::1]</node.address>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -3,11 +3,17 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.UnknownHostException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Logger;
 
+import com.arjuna.qa.extension.JBossAS7ServerKillProcessor;
 import org.jboss.arquillian.container.test.api.Config;
 import org.jboss.arquillian.container.test.api.ContainerController;
 import org.jboss.arquillian.container.test.api.Deployer;
@@ -24,8 +30,12 @@
 
 public class BaseCrashTest
 {
+
+    private static final Logger logger = Logger.getLogger(BaseCrashTest.class.getName());
+
     protected String XTSServiceTest = " -Dorg.jboss.jbossts.xts.servicetests.XTSServiceTestName=@TestName@";
     protected String BytemanArgs = "-Xms64m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.byteman.verbose -Djboss.modules.system.pkgs=org.jboss.byteman -Dorg.jboss.byteman.transform.all -javaagent:target/test-classes/lib/byteman.jar=script:target/test-classes/scripts/@BMScript at .txt,boot:target/test-classes/lib/byteman.jar,listener:true";
+    protected String iPv6Args = "-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true -Djboss.bind.address=[::1] -Djboss.bind.address.management=[::1] -Djboss.bind.address.unsecure=[::1] ";
     protected String javaVmArguments;
     protected String testName;
     protected String scriptName;
@@ -40,9 +50,9 @@
     public static Archive<?> createTestArchive()
     {
         WebArchive archive = ShrinkWrap.
-        createFromZipFile(WebArchive.class, new File(xtstestWar));
+                createFromZipFile(WebArchive.class, new File(xtstestWar));
         final String ManifestMF = "Manifest-Version: 1.0\n"
-            + "Dependencies: org.jboss.modules,deployment.arquillian-service,org.jboss.msc,org.jboss.jts,org.jboss.xts\n";
+                + "Dependencies: org.jboss.modules,deployment.arquillian-service,org.jboss.msc,org.jboss.jts,org.jboss.xts\n";
         archive.setManifest(new StringAsset(ManifestMF));
 
         return archive;
@@ -51,8 +61,14 @@
     @Before
     public void setUp()
     {
-        javaVmArguments = BytemanArgs.replace("@BMScript@", scriptName);
+        if (isIPv6())
+            javaVmArguments = iPv6Args + BytemanArgs.replace("@BMScript@", scriptName);
+        else
+            javaVmArguments = BytemanArgs.replace("@BMScript@", scriptName);
 
+        System.out.println("Starting arquillian with java VM args: " +
+                javaVmArguments + " isIPv6: " + isIPv6());
+
         File file = new File("testlog");
         if (file.isFile() && file.exists())
         {
@@ -83,13 +99,62 @@
                     System.out.println("remove tx-object-store: " + objectStore.getPath());
                 }
             }
+            //Remove the xts deployments under the content
+            File contentDir = new File(jbossHome + File.separator + "standalone" + File.separator + "data" + File.separator + "content");
+            if(contentDir.exists())
+            {
+                File[] files = contentDir.listFiles();
+                if(files != null) 
+                {
+                    int i = 0;
+                    for(i=0;i<files.length;i++) 
+                    {
+                        if(files[i].isDirectory()) 
+                        {
+                            deleteDirectory(files[i]);
+                            System.out.println("remove " + files[i].getPath());
+                        }
+                    }
+                }
+            }
+            
+            File exampleXTSconfig = new File(jbossHome + File.separator + "docs" + File.separator + "examples" + File.separator + "configs" + File.separator + "standalone-xts.xml");
+            File XTSconfig = new File(jbossHome + File.separator + "standalone" + File.separator + "configuration" + File.separator + "standalone-xts.xml");
+            if(exampleXTSconfig.exists()) 
+            {
+                //copy example config to configuration directory
+                try {
+                    FileInputStream in = new FileInputStream(exampleXTSconfig);
+                    FileOutputStream out = new FileOutputStream(XTSconfig);
+                    byte[] buffer = new byte[1024];
 
+                    int length;
+                    //copy the file content in bytes 
+                    while ((length = in.read(buffer)) > 0)
+                    {
+                        out.write(buffer, 0, length);
+
+                    }
+
+                    in.close();
+                    out.close();
+                    System.out.println("copy " + exampleXTSconfig.getPath() + " to " + XTSconfig.getPath());
+                }
+                catch(IOException e)
+                {
+                    Assert.fail("copy " + exampleXTSconfig.getPath() + " fail with " + e);
+                }
+            } 
+            else
+            {
+                Assert.fail(exampleXTSconfig.getPath() + " not exists");
+            }
         }
     }
 
     @After
     public void tearDown()
-    {
+    {     
         String log = "target/log";
 
         String jbossHome = System.getenv().get("JBOSS_HOME");
@@ -98,12 +163,12 @@
         }
         String dir = jbossHome + "/standalone/data/tx-object-store/ShadowNoFileLockStore/defaultStore/XTS/";
         File objectStore = new File(dir);
-		boolean ischeck = checkTxObjectStore(objectStore);
-		if (!ischeck) {
-			StringBuffer buffer = exploreDirectory(objectStore, 0);
-			System.out.println(buffer);
-		}
-		Assert.assertTrue(ischeck); 
+        boolean ischeck = checkTxObjectStore(objectStore);
+        if(!ischeck) {
+            StringBuffer buffer = exploreDirectory(objectStore, 0);
+            System.out.println(buffer);
+        }
+        Assert.assertTrue(ischeck);
 
         if (testName != null && scriptName != null)
         {
@@ -125,12 +190,22 @@
 
     protected void runTest(String testClass) throws Exception
     {
+        logger.info("Test starting, server should be down: " + scriptName + ":" + testName);
+
         Config config = new Config();
+        config.add("testClass", testClass);
+        config.add("scriptName", scriptName);
         config.add("javaVmArguments", javaVmArguments + XTSServiceTest.replace("@TestName@", testClass));
 
         controller.start("jboss-as", config.map());
-        deployer.deploy("xtstest");
 
+        try {
+            deployer.deploy("xtstest");
+        } catch (java.lang.RuntimeException e) {
+            //JBTM-1236 it could be ignore this exception because the container might be killed already and JVM.kill() has happened.
+            System.out.println("jboss-as has been killed");
+        }
+
         //Waiting for crashing
         controller.kill("jboss-as");
 
@@ -140,6 +215,8 @@
 
         //Waiting for recovery happening
         controller.kill("jboss-as");
+
+        logger.info("Test completed, server should be down: " + scriptName + ":" + testName);
     }
 
     private boolean deleteDirectory(File path) 
@@ -182,7 +259,17 @@
         return true;
     }
 
-	private StringBuffer exploreDirectory(File directory, int level) {
+    private static boolean isIPv6() {
+        try {
+            if (InetAddress.getLocalHost() instanceof Inet6Address || System.getenv("IPV6_OPTS") != null)
+                return true;
+        } catch (final UnknownHostException uhe) {
+        }
+
+        return false;
+    }
+
+    private StringBuffer exploreDirectory(File directory, int level) {
         List<File> files = Arrays.asList(directory.listFiles());
         StringBuffer result = new StringBuffer();
         String NEWLINE = "\n";

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml	2012-09-20 18:29:17 UTC (rev 38188)
@@ -12,7 +12,10 @@
 			<property name="executionType">REMOTE</property>
 		</protocol>
 		<configuration>
+                        <property name="javaVmArguments">${server.jvm.args}</property>
 			<property name="serverConfig">standalone-xts.xml</property>
+                        <property name="managementAddress">${node.address}</property>
+
 			<!--
 			<property name="javaVmArguments">-Djboss.modules.system.pkgs=org.jboss.byteman -Dorg.jboss.byteman.transform.all -javaagent:target/test-classes/lib/byteman.jar=script:target/test-classes/scripts/Running.txt,boot:target/test-classes/lib/byteman.jar,listener:true</property>
 			

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/scripts/BASubordinateCrashDuringComplete.txt
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/scripts/BASubordinateCrashDuringComplete.txt	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/scripts/BASubordinateCrashDuringComplete.txt	2012-09-20 18:29:17 UTC (rev 38188)
@@ -292,7 +292,7 @@
 AT ENTRY
 IF TRUE
 DO debug("creating counter and rendezvous"),
-   createCounter("closes", 1),
+   createCounter("closes", 3),
    createRendezvous("closes-complete", 2)
 ENDRULE
 

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestInterpreter.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestInterpreter.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestInterpreter.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -5,6 +5,9 @@
 import org.jboss.jbossts.xts.servicetests.generated.CommandsType;
 import org.jboss.jbossts.xts.servicetests.generated.ResultsType;
 
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ArrayList;
@@ -173,9 +176,29 @@
      */
     public void addDefaultBinding(String var, String val)
     {
+        val = replaceLocalhostIfIPv6AndUrl(val);
         defaultBindings.put(var, val);
     }
 
+    public String replaceLocalhostIfIPv6AndUrl(String url)
+    {
+        if (isIPv6())
+        {
+            url = url.replace("http://localhost", "http://[::1]");
+        }
+        return url;
+    }
+
+    private boolean isIPv6() {
+        try {
+            if (InetAddress.getLocalHost() instanceof Inet6Address || System.getenv("IPV6_OPTS") != null)
+                return true;
+        } catch (final UnknownHostException uhe) {
+        }
+
+        return false;
+    }
+
     /// overrideable methods
 
     /**

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseAndExitTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseAndExitTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseAndExitTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -141,7 +141,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -149,4 +148,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantCoordinatorCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -134,7 +134,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -142,4 +141,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseAndExitTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseAndExitTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseAndExitTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -158,7 +158,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -166,4 +165,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiParticipantParticipantCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -158,7 +158,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -166,4 +165,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseAndExitTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseAndExitTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseAndExitTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -156,7 +156,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -164,4 +163,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceCoordinatorCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -148,7 +148,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -156,4 +155,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseAndExitTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseAndExitTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseAndExitTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -172,7 +172,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -180,4 +179,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/MultiServiceParticipantCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -172,7 +172,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -180,4 +179,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleCoordinatorCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleCoordinatorCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleCoordinatorCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -120,7 +120,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("commit failure " + exception);
         }
 
@@ -128,4 +127,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleParticipantCompletionParticipantCloseTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleParticipantCompletionParticipantCloseTest.java	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/ba/SingleParticipantCompletionParticipantCloseTest.java	2012-09-20 18:29:17 UTC (rev 38188)
@@ -146,7 +146,6 @@
         }
 
         if (exception != null) {
-			exception.printStackTrace();
             error("close failure " + exception);
         }
 
@@ -154,4 +153,4 @@
 
         isSuccessful = (exception == null);
     }
-}
+}
\ No newline at end of file

Modified: labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-09-20 10:34:23 UTC (rev 38187)
+++ labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-09-20 18:29:17 UTC (rev 38188)
@@ -146,7 +146,7 @@
 	exit -1
 fi
 
-mvn clean test
+mvn clean test -Parq
 if [ "$?" != "0" ]; then
 	exit -1
 fi



More information about the jboss-svn-commits mailing list