This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 355cd1962fd69365abbc3bd1dba187e3953c4346 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Wed Mar 30 13:22:55 2022 +0200 Fix add-opens in a more global manner --- .../apache/openejb/server/control/StandaloneServer.java | 9 +++++++++ .../org/apache/openejb/itest/failover/FailoverTest.java | 8 -------- .../itest/failover/RandomConnectionStrategyTest.java | 16 ---------------- .../failover/ReconnectDelayCaseInsensitiveTest.java | 8 -------- .../itest/failover/ReconnectDelayListSelfTest.java | 8 -------- .../openejb/itest/failover/ReconnectDelayTest.java | 8 -------- .../itest/failover/RoundRobinConnectionStrategyTest.java | 16 ---------------- .../itest/failover/StickyConnectionStrategyTest.java | 16 ---------------- 8 files changed, 9 insertions(+), 80 deletions(-) diff --git a/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java b/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java index b33006e..d7958db 100644 --- a/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java +++ b/itests/failover/src/main/java/org/apache/openejb/server/control/StandaloneServer.java @@ -81,6 +81,15 @@ public class StandaloneServer { jvmOpts.add("-XX:+HeapDumpOnOutOfMemoryError"); jvmOpts.add("-javaagent:" + javaagentJar.getAbsolutePath()); + + // Add the JAVA 9 specific start-up parameters required by OpenEJB + jvmOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.base/java.io=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.base/java.util=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); + jvmOpts.add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); + } /** diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java index ca22fbf..c5a4222 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/FailoverTest.java @@ -74,14 +74,6 @@ public class FailoverTest { server.setProperty("openejb.extract.configuration", "false"); server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - final StandaloneServer.ServerService multipoint = server.getServerService("multipoint"); multipoint.setBind("localhost"); multipoint.setPort(getNextAvailablePort()); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java index a5f5b3a..6a43a1e 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java @@ -92,14 +92,6 @@ public class RandomConnectionStrategyTest { root.setProperty("name", name); root.setProperty("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - root.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - final StandaloneServer.ServerService multipoint = root.getServerService("multipoint"); multipoint.setBind("localhost"); multipoint.setPort(getNextAvailablePort()); @@ -129,14 +121,6 @@ public class RandomConnectionStrategyTest { server.setProperty("openejb.extract.configuration", "false"); server.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml")); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java index 64cc8a1..6be98c6 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayCaseInsensitiveTest.java @@ -96,14 +96,6 @@ public class ReconnectDelayCaseInsensitiveTest { server.getProperties().put("name", name); server.getProperties().put("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml")); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java index c632956..d16a6a8 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java @@ -96,14 +96,6 @@ public class ReconnectDelayListSelfTest { server.getProperties().put("name", name); server.getProperties().put("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml")); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java index c80c229..46c8ffa 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java @@ -78,14 +78,6 @@ public class ReconnectDelayTest { server.getProperties().put("name", name); server.getProperties().put("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml")); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java index bc1a753..53c3894 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java @@ -95,14 +95,6 @@ public class RoundRobinConnectionStrategyTest { root.setProperty("name", name); root.setProperty("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - root.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - root.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - final StandaloneServer.ServerService multipoint = root.getServerService("multipoint"); multipoint.setBind("localhost"); multipoint.setPort(getNextAvailablePort()); @@ -131,14 +123,6 @@ public class RoundRobinConnectionStrategyTest { server.setProperty("name", name); server.setProperty("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml")); diff --git a/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java b/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java index 6b5eaf5..7193db2 100644 --- a/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java +++ b/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java @@ -96,14 +96,6 @@ public class StickyConnectionStrategyTest { root1.setProperty("name", name); root1.setProperty("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - root1.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - root1.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - root1.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - root1.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - root1.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - root1.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - final StandaloneServer.ServerService multipoint = root1.getServerService("multipoint"); multipoint.setBind("localhost"); multipoint.setPort(getAvailablePort()); @@ -129,14 +121,6 @@ public class StickyConnectionStrategyTest { server.setProperty("name", name); server.setProperty("openejb.extract.configuration", "false"); - // Add the JAVA 9 specific start-up parameters required by OpenEJB - server.getJvmOpts().add("--add-opens=java.base/java.lang=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.io=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"); - server.getJvmOpts().add("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"); - IO.copy(app, Files.path(home, "apps", "itest.jar")); IO.copy(IO.read("<openejb><Deployments dir=\"apps/\"/></openejb>"), Files.path(home, "conf", "openejb.xml"));
