Author: rmannibucau
Date: Mon Aug 13 19:33:21 2012
New Revision: 1372563
URL: http://svn.apache.org/viewvc?rev=1372563&view=rev
Log:
fixing failover
Modified:
openejb/trunk/openejb/itests/failover/pom.xml
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
Modified: openejb/trunk/openejb/itests/failover/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/pom.xml?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/failover/pom.xml (original)
+++ openejb/trunk/openejb/itests/failover/pom.xml Mon Aug 13 19:33:21 2012
@@ -33,7 +33,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-
<args>-Dopenejb.classloader.forced-skip=org.apache.openejb.jee.,org.apache.openejb.api.
-Dopenejb.classloader.forced-load=org.apache.openejb</args>
<systemPropertyVariables>
<version>${project.version}</version>
</systemPropertyVariables>
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/DiscoveryHostTest.java
Mon Aug 13 19:33:21 2012
@@ -64,6 +64,7 @@ public class DiscoveryHostTest {
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.getProperties().put("name", name);
server.getProperties().put("openejb.extract.configuration",
"false");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java
Mon Aug 13 19:33:21 2012
@@ -72,6 +72,7 @@ public class FailoverTest {
server.setProperty("name", name);
server.setProperty("TestName", this.getClass().getName());
server.setProperty("openejb.extract.configuration", "false");
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
final StandaloneServer.ServerService multipoint =
server.getServerService("multipoint");
multipoint.setBind("localhost");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
Mon Aug 13 19:33:21 2012
@@ -84,6 +84,7 @@ public class RandomConnectionStrategyTes
root = new StandaloneServer(home, home);
root.killOnExit();
+
root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
root.ignoreOut();
root.setProperty("name", name);
root.setProperty("openejb.extract.configuration", "false");
@@ -113,6 +114,7 @@ public class RandomConnectionStrategyTes
server.ignoreOut();
server.setProperty("name", name);
server.setProperty("openejb.extract.configuration", "false");
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
IO.copy(app, Files.path(home, "apps", "itest.jar"));
IO.copy(IO.read("<openejb><Deployments
dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml"));
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java
Mon Aug 13 19:33:21 2012
@@ -91,6 +91,7 @@ public class ReconnectDelayCaseInsensiti
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.getProperties().put("name", name);
server.getProperties().put("openejb.extract.configuration",
"false");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
Mon Aug 13 19:33:21 2012
@@ -91,6 +91,7 @@ public class ReconnectDelayListSelfTest
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.getProperties().put("name", name);
server.getProperties().put("openejb.extract.configuration",
"false");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
Mon Aug 13 19:33:21 2012
@@ -73,6 +73,7 @@ public class ReconnectDelayTest {
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.getProperties().put("name", name);
server.getProperties().put("openejb.extract.configuration",
"false");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
Mon Aug 13 19:33:21 2012
@@ -90,6 +90,7 @@ public class RoundRobinConnectionStrateg
root = new StandaloneServer(home, home);
root.killOnExit();
+
root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
root.ignoreOut();
root.setProperty("name", name);
root.setProperty("openejb.extract.configuration", "false");
@@ -117,6 +118,7 @@ public class RoundRobinConnectionStrateg
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.setProperty("name", name);
server.setProperty("openejb.extract.configuration", "false");
Modified:
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java?rev=1372563&r1=1372562&r2=1372563&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
(original)
+++
openejb/trunk/openejb/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
Mon Aug 13 19:33:21 2012
@@ -88,6 +88,7 @@ public class StickyConnectionStrategyTes
root1 = new StandaloneServer(home, home);
root1.killOnExit();
root1.ignoreOut();
+
root1.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
root1.setProperty("name", name);
root1.setProperty("openejb.extract.configuration", "false");
@@ -112,6 +113,7 @@ public class StickyConnectionStrategyTes
final StandaloneServer server = new StandaloneServer(home, home);
server.killOnExit();
server.ignoreOut();
+
server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
server.setProperty("name", name);
server.setProperty("openejb.extract.configuration", "false");
