Permalink
Browse files

Revert "[JBTM-1156] IPv6 config"

This reverts commit 4930971.
  • Loading branch information...
1 parent bd5ca35 commit 860fb436eb844351e42fd4210db8eea06ef704f0 @mmusgrov mmusgrov committed Jun 18, 2012
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/schema/arquillian
- http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <!-- Example configuration for a remote JBoss AS 7 instance -->
- <container qualifier="jboss-as" default="true">
- <protocol type="jmx-as7">
- <property name="executionType">REMOTE</property>
- </protocol>
- <configuration>
- <property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
- </configuration>
- </container>
-</arquillian>
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
@@ -128,7 +128,7 @@ public void testAT5_4() throws Exception {
test.testAT5_4();
}
- // TODO @Test
+ @Test
public void testAT5_5() throws Exception {
test.testAT5_5();
}
@@ -2,10 +2,9 @@
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
+ <defaultProtocol type="Servlet 3.0" />
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
</configuration>
</container>
View
@@ -16,11 +16,6 @@
<packaging>pom</packaging>
<name>localjunit tests for xts</name>
<description>localjunit tests for xts</description>
- <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>
- </properties>
<dependencies>
<dependency>
@@ -80,7 +75,7 @@
<!--
Used in arquillian.xml
-->
- <server.jvm.args>${general.server.jvm.args} ${ipv4.server.jvm.args}</server.jvm.args>
+ <server.jvm.args>${jvm.args.ip}</server.jvm.args>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -110,7 +105,7 @@
<!--
Used in arquillian.xml
-->
- <server.jvm.args>${general.server.jvm.args} ${ipv6.server.jvm.args}</server.jvm.args>
+ <server.jvm.args>-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true</server.jvm.args>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -3,9 +3,10 @@
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">standalone-xts.xml</property>
</configuration>
</container>
View
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-function fatal {
- echo "$1"
- exit -1
-}
-
-#export NARAYANA_TESTS=1
-[ $NARAYANA_TESTS ] || NARAYANA_TESTS=1
-echo "NARAYANA_TESTS=$NARAYANA_TESTS"
-echo "NARAYANA_ARGS=$NARAYANA_ARGS"
-[ $NARAYANA_TESTS = 1 ] && NARAYANA_ARGS="xx" || NARAYANA_ARGS="-DskipTests"
-echo "NARAYANA_ARGS=$NARAYANA_ARGS"
-
-exit 0
-
-echo "? = $?"
-[ $? = 0 ] || fatal "wrong code"
-
-isIdlj=0
-for arg in "$@"; do
- [ `echo "$arg" |grep "idlj"` ] && isIdlj=1
-done
-
-echo "isIdlj=$isIdlj"
-
-SKIP_NARAYANA_TESTS=1
-[ "x$SKIP_NARAYANA_TESTS" = "x" ] && echo yes || echo no
-
-SKIP_INTEROP=1
-[ $SKIP_INTEROP ] || SKIP_INTEROP=0
-if [ $SKIP_INTEROP = 1 ]; then
- echo skipping
-else
- echo not skipping
-fi
-
-#BUILD NARAYANA WITH FINDBUGS
-function build_narayana {
- [ $NARAYANA_TESTS = 1 ] || NARAYANA_ARGS="-DskipTests" && NARAYANA_ARGS=
- echo "NARAYANA_ARGS=$NARAYANA_ARGS"
- [ $? = 0 ] || fatal "narayana build failed"
-}
-
-NARAYANA_TESTS=0
-[ $NARAYANA_TESTS ] || NARAYANA_TESTS=1
-
-NARAYANA_BUILD=0
-[ $NARAYANA_BUILD ] || NARAYANA_BUILD=1
-[ $NARAYANA_BUILD = 1 ] && build_narayana
-
-
@@ -1,10 +1,6 @@
package com.arjuna.qa.junit;
import java.io.File;
-import java.net.UnknownHostException;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-
import org.jboss.arquillian.container.test.api.Config;
import org.jboss.arquillian.container.test.api.ContainerController;
import org.jboss.arquillian.container.test.api.Deployer;
@@ -22,9 +18,7 @@
public class BaseCrashTest
{
protected String XTSServiceTest = " -Dorg.jboss.jbossts.xts.servicetests.XTSServiceTestName=@TestName@";
- protected String BytemanArgs = "-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -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@.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 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@.txt,boot:target/test-classes/lib/byteman.jar,listener:true";
protected String javaVmArguments;
protected String testName;
protected String scriptName;
@@ -48,13 +42,9 @@
}
@Before
- public void setUp() throws Exception
+ public void setUp()
{
- if (isIPv6())
- javaVmArguments = iPv6Args + BytemanArgs.replace("@BMScript@", scriptName);
- else
- javaVmArguments = BytemanArgs.replace("@BMScript@", scriptName);
-
+ javaVmArguments = BytemanArgs.replace("@BMScript@", scriptName);
File file = new File("testlog");
if (file.isFile() && file.exists())
@@ -188,15 +178,4 @@ private boolean checkTxObjectStore(File objectStore)
}
return true;
}
-
- private static boolean isIPv6() throws UnknownHostException {
- try {
- if (InetAddress.getLocalHost() instanceof Inet6Address)
- return true;
- } catch (final UnknownHostException uhe) {
- }
-
- return false;
- }
-
}
@@ -2,13 +2,22 @@
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!--
- <engine> <property name="maxTestClassesBeforeRestart">2</property> </engine> -->
+ <engine>
+ <property name="maxTestClassesBeforeRestart">2</property>
+ </engine>
+ -->
<!-- Example configuration for a remote JBoss AS 7 instance -->
<container qualifier="jboss-as" default="true" mode="manual">
- <defaultProtocol type="Servlet 3.0" />
+ <protocol type="jmx-as7">
+ <property name="executionType">REMOTE</property>
+ </protocol>
<configuration>
- <property name="javaVmArguments">${server.jvm.args}</property>
<property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</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>
+
+ <property name="javaVmArguments">-Dorg.jboss.jbossts.xts.servicetests.XTSServiceTestName=org.jboss.jbossts.xts.servicetests.test.at.SingleParticipantPrepareAndCommitTest</property>
+ -->
</configuration>
</container>
</arquillian>
View
@@ -23,12 +23,6 @@
<packaging>jar</packaging>
<name>xts sar</name>
<description>xts sar</description>
- <properties>
- <buildType>11</buildType>
- <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>
- </properties>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
@@ -97,4 +91,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <properties>
+ <buildType>11</buildType>
+ </properties>
</project>
View
@@ -146,7 +146,7 @@ main() {
fi
# Need to specify planet57/buildmagic protocol handler package.
- MVN_OPTS="$MVN_OPTS -Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+ MVN_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
# Setup some build properties
MVN_OPTS="$MVN_OPTS -Dbuild.script=$0"
View
@@ -965,7 +965,7 @@
<emma.jar.location>${project.basedir}/ext/emma.jar</emma.jar.location>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<findbugs.skip>true</findbugs.skip>
- <jboss-as.version>7.2.0.Alpha1-SNAPSHOT</jboss-as.version>
+ <jboss-as.version>7.1.2.Final-SNAPSHOT</jboss-as.version>
<version.org.jboss.arquillian.core>1.0.0.Final</version.org.jboss.arquillian.core>
<version.org.jboss.arquillian.osgi>1.0.2.Final</version.org.jboss.arquillian.osgi>
</properties>
@@ -33,8 +33,6 @@
import java.io.FileInputStream;
import java.util.Properties;
import java.net.UnknownHostException;
-import java.net.Inet6Address;
-import java.net.InetAddress;
public class JDBCProfileStore
{
@@ -184,11 +182,7 @@ private static void loadProfile()
if(!file.exists()) {
// no host specific profile, fallback to a default one
- if (isIPv6()) // placeholder for using a different config for IPv6 testing
- file = new File(baseDir + File.separator + "default" + File.separator + "JDBCProfiles");
- else
- file = new File(baseDir + File.separator + "default" + File.separator + "JDBCProfiles");
-
+ file = new File(baseDir + File.separator + "default" + File.separator + "JDBCProfiles");
}
FileInputStream profileFileInputStream = new FileInputStream(file);
@@ -211,15 +205,5 @@ private static String stripHostName(String hostName)
return hostName;
}
- private static boolean isIPv6() throws UnknownHostException {
- try {
- if (InetAddress.getLocalHost() instanceof Inet6Address)
- return true;
- } catch (final UnknownHostException uhe) {
- }
-
- return false;
- }
-
private static Properties _profile = null;
}
Oops, something went wrong.

0 comments on commit 860fb43

Please sign in to comment.