libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

[KEYCLOAK-14378] Allow customization of debug settings for clustered JBoss app servers in tests.

Browse source
This commit is contained in:
Douglas Palmer 2020-06-03 15:21:51 -07:00 committed by Stian Thorgersen
parent 2da0fb74ef
commit ff07c4891e
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
View file

@ -142,8 +142,8 @@ public class EAPAppServerProvider implements AppServerContainerProvider {
System.getProperty("adapter.test.props", " ") + System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ") System.getProperty("kie.maven.settings", " ")
); );
createChild("javaVmArguments", createChild("javaVmArguments",
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
System.getProperty("app.server.memory.settings", "") + " " + System.getProperty("app.server.memory.settings", "") + " " +
"-Djava.net.preferIPv4Stack=true" + " " + "-Djava.net.preferIPv4Stack=true" + " " +
System.getProperty("app.server.jvm.args.extra") System.getProperty("app.server.jvm.args.extra")

4
testsuite/integration-arquillian/servers/app-server/jboss/eap6/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAP6AppServerProvider.java
View file

@ -139,8 +139,8 @@ public class EAP6AppServerProvider implements AppServerContainerProvider {
System.getProperty("adapter.test.props", " ") + " " + System.getProperty("adapter.test.props", " ") + " " +
System.getProperty("kie.maven.settings", " ") System.getProperty("kie.maven.settings", " ")
); );
createChild("javaVmArguments", createChild("javaVmArguments",
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
System.getProperty("app.server.memory.settings", "") + " " + System.getProperty("app.server.memory.settings", "") + " " +
"-Djava.net.preferIPv4Stack=true" "-Djava.net.preferIPv4Stack=true"
); );

4
testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java
View file

@ -139,8 +139,8 @@ public class WildflyDeprecatedAppServerProvider implements AppServerContainerPro
System.getProperty("adapter.test.props", " ") + System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ") System.getProperty("kie.maven.settings", " ")
); );
createChild("javaVmArguments", createChild("javaVmArguments",
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
System.getProperty("app.server.memory.settings", "") + " " + System.getProperty("app.server.memory.settings", "") + " " +
"-Djava.net.preferIPv4Stack=true" "-Djava.net.preferIPv4Stack=true"
); );

4
testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
View file

@ -140,8 +140,8 @@ public class WildflyAppServerProvider implements AppServerContainerProvider {
System.getProperty("adapter.test.props", " ") + System.getProperty("adapter.test.props", " ") +
System.getProperty("kie.maven.settings", " ") System.getProperty("kie.maven.settings", " ")
); );
createChild("javaVmArguments", createChild("javaVmArguments",
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " + System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " +
System.getProperty("app.server.memory.settings", "") + " " + System.getProperty("app.server.memory.settings", "") + " " +
"-Djava.net.preferIPv4Stack=true" + " " + "-Djava.net.preferIPv4Stack=true" + " " +
System.getProperty("app.server.jvm.args.extra") System.getProperty("app.server.jvm.args.extra")

8
testsuite/integration-arquillian/tests/pom.xml
View file

@ -114,6 +114,12 @@
<app.server.debug.port>5006</app.server.debug.port> <app.server.debug.port>5006</app.server.debug.port>
<app.server.debug.suspend>n</app.server.debug.suspend> <app.server.debug.suspend>n</app.server.debug.suspend>
<app.server.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.jboss.jvm.debug.args> <app.server.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.jboss.jvm.debug.args>
<app.server.1.debug.port>7301</app.server.1.debug.port>
<app.server.1.debug.suspend>n</app.server.1.debug.suspend>
<app.server.1.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.1.debug.suspend},address=localhost:${app.server.1.debug.port}</app.server.1.jboss.jvm.debug.args>
<app.server.2.debug.port>7302</app.server.2.debug.port>
<app.server.2.debug.suspend>n</app.server.2.debug.suspend>
<app.server.2.jboss.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.2.debug.suspend},address=localhost:${app.server.2.debug.port}</app.server.2.jboss.jvm.debug.args>
<app.server.memory.Xms>64m</app.server.memory.Xms> <app.server.memory.Xms>64m</app.server.memory.Xms>
<app.server.memory.Xmx>512m</app.server.memory.Xmx> <app.server.memory.Xmx>512m</app.server.memory.Xmx>
<app.server.memory.settings>-Xms${app.server.memory.Xms} -Xmx${app.server.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}</app.server.memory.settings> <app.server.memory.settings>-Xms${app.server.memory.Xms} -Xmx${app.server.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}</app.server.memory.settings>
@ -561,6 +567,8 @@
<app.server.truststore.password>${app.server.truststore.password}</app.server.truststore.password> <app.server.truststore.password>${app.server.truststore.password}</app.server.truststore.password>
<app.server.keystore>${app.server.keystore}</app.server.keystore> <app.server.keystore>${app.server.keystore}</app.server.keystore>
<app.server.keystore.password>${app.server.keystore.password}</app.server.keystore.password> <app.server.keystore.password>${app.server.keystore.password}</app.server.keystore.password>
<app.server.1.jboss.jvm.debug.args>${app.server.1.jboss.jvm.debug.args}</app.server.1.jboss.jvm.debug.args>
<app.server.2.jboss.jvm.debug.args>${app.server.2.jboss.jvm.debug.args}</app.server.2.jboss.jvm.debug.args>
<app.server.jvm.args.extra>${app.server.jvm.args.extra}</app.server.jvm.args.extra> <app.server.jvm.args.extra>${app.server.jvm.args.extra}</app.server.jvm.args.extra>
<tomcat.javax.net.ssl.properties>${tomcat.javax.net.ssl.properties}</tomcat.javax.net.ssl.properties> <tomcat.javax.net.ssl.properties>${tomcat.javax.net.ssl.properties}</tomcat.javax.net.ssl.properties>