KEYCLOAK-7587 Some system properties are not included
This commit is contained in:
parent
9cf965a157
commit
f19a324030
5 changed files with 32 additions and 26 deletions
|
@ -86,7 +86,8 @@ public class EAPAppServerProvider implements AppServerContainerProvider {
|
|||
createChild("javaHome", appServerJavaHome);
|
||||
createChild("jbossArguments",
|
||||
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
System.getProperty("app.server.jboss.jvm.debug.args", "") + " " +
|
||||
|
@ -132,7 +133,8 @@ public class EAPAppServerProvider implements AppServerContainerProvider {
|
|||
"-Djboss.socket.binding.port-offset=" + portOffset + " " +
|
||||
"-Djboss.node.name=ha-node-" + number + " " +
|
||||
getCrossDCProperties(number, portOffset) +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
|
||||
|
|
|
@ -86,7 +86,8 @@ public class EAP6AppServerProvider implements AppServerContainerProvider {
|
|||
createChild("javaHome", appServerJavaHome);
|
||||
createChild("jbossArguments",
|
||||
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
System.getProperty("app.server.jboss.jvm.debug.args", "") + " " +
|
||||
|
@ -131,7 +132,8 @@ public class EAP6AppServerProvider implements AppServerContainerProvider {
|
|||
"-Djboss.server.base.dir=" + appServerHome + "/standalone-ha-node-" + number + " " +
|
||||
"-Djboss.socket.binding.port-offset=" + portOffset + " " +
|
||||
"-Djboss.node.name=ha-node-" + number + " " +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
|
||||
|
|
|
@ -86,7 +86,8 @@ public class WildflyAppServerProvider implements AppServerContainerProvider {
|
|||
createChild("javaHome", appServerJavaHome);
|
||||
createChild("jbossArguments",
|
||||
"-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
System.getProperty("app.server.jboss.jvm.debug.args", "") + " " +
|
||||
|
@ -132,7 +133,8 @@ public class WildflyAppServerProvider implements AppServerContainerProvider {
|
|||
"-Djboss.socket.binding.port-offset=" + portOffset + " " +
|
||||
"-Djboss.node.name=ha-node-" + number + " " +
|
||||
getCrossDCProperties(number, portOffset) +
|
||||
System.getProperty("adapter.test.props", "")
|
||||
System.getProperty("adapter.test.props", " ") +
|
||||
System.getProperty("kie.maven.settings", " ")
|
||||
);
|
||||
createChild("javaVmArguments",
|
||||
"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
|
||||
|
|
|
@ -442,24 +442,6 @@
|
|||
<skip.copy.auth.crossdc.nodes>false</skip.copy.auth.crossdc.nodes>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<!--see KEYCLOAK-4793-->
|
||||
<id>kie.maven.settings</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
|
||||
<settings.path>${user.home}/.m2/settings.xml</settings.path>
|
||||
<repo.url/>
|
||||
<kie.maven.settings>
|
||||
-Dkie.maven.settings.custom=${settings.path}
|
||||
-Dkie.maven.repo.local=${maven.repo.local}
|
||||
-Drepo.url=${repo.url}
|
||||
</kie.maven.settings>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>include-CORS-tests</id>
|
||||
<!--
|
||||
|
|
|
@ -113,12 +113,29 @@
|
|||
<keycloak.connectionsJpa.url.crossdc>jdbc:h2:mem:test-dc-shared</keycloak.connectionsJpa.url.crossdc>
|
||||
<keycloak.testsuite.logging.pattern>%d{HH:mm:ss,SSS} %-5p [%c] %m%n</keycloak.testsuite.logging.pattern>
|
||||
|
||||
<!--KEYCLOAK-4793-->
|
||||
<maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
|
||||
<settings.path>${user.home}/.m2/settings.xml</settings.path>
|
||||
<repo.url/>
|
||||
<kie.maven.settings>
|
||||
-Dkie.maven.settings.custom=${settings.path}
|
||||
-Dkie.maven.repo.local=${maven.repo.local}
|
||||
-Drepo.url=${repo.url}
|
||||
</kie.maven.settings>
|
||||
|
||||
<adapter.test.props>
|
||||
-Dkeycloak.x509cert.lookup.provider=${keycloak.x509cert.lookup.provider}
|
||||
-Dapp.server.base.url=http://localhost:${app.server.http.port}
|
||||
-Dauth.server.base.url=http://localhost:${auth.server.http.port}
|
||||
-Dapp.server.ssl.base.url=https://localhost:${app.server.https.port}
|
||||
-Dapp.server.ssl.required=${app.server.ssl.required}
|
||||
-Dauth.server.ssl.base.url=https://localhost:${auth.server.https.port}
|
||||
-Dauth.server.ssl.required=${auth.server.ssl.required}
|
||||
-Dmy.host.name=localhost
|
||||
-Djava.security.krb5.conf=${project.build.directory}/dependency/kerberos/test-krb5.conf
|
||||
</adapter.test.props>
|
||||
<migration.import.properties/>
|
||||
<kie.maven.settings/>
|
||||
|
||||
<migration.import.properties/>
|
||||
<examples.home>${project.build.directory}/examples</examples.home>
|
||||
<examples.basedir>${keycloak-parent.basedir}/examples</examples.basedir> <!--keycloak/examples directory-->
|
||||
<examples.version.suffix>${project.version}</examples.version.suffix>
|
||||
|
@ -408,6 +425,7 @@
|
|||
<app.server>${app.server}</app.server>
|
||||
<app.server.home>${app.server.home}</app.server.home>
|
||||
<app.server.java.home>${app.server.java.home}</app.server.java.home>
|
||||
<app.server.memory.settings>${app.server.memory.settings}</app.server.memory.settings>
|
||||
<app.server.port.offset>${app.server.port.offset}</app.server.port.offset>
|
||||
<app.server.http.port>${app.server.http.port}</app.server.http.port>
|
||||
<app.server.https.port>${app.server.https.port}</app.server.https.port>
|
||||
|
|
Loading…
Reference in a new issue