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

Merge pull request #2303 from tkyjovsk/auth-server-jdk

Browse source 
Added property "auth.server.java.home" to the Arquillian testsuite.
This commit is contained in:
Stian Thorgersen 2016-03-01 19:33:35 +01:00
commit 5eb319f3c5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
View file

@ -63,6 +63,7 @@
<property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Djboss.bind.address=0.0.0.0 -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property> <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Djboss.bind.address=0.0.0.0 -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
<property name="managementPort">${auth.server.management.port}</property> <property name="managementPort">${auth.server.management.port}</property>
<property name="startupTimeoutInSeconds">${startup.timeout.sec}</property> <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
<property name="javaHome">${auth.server.java.home}</property>
</configuration> </configuration>
</container> </container>
@ -134,6 +135,7 @@
<property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Djboss.bind.address=0.0.0.0 -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property> <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Djboss.bind.address=0.0.0.0 -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
<property name="startupTimeoutInSeconds">${startup.timeout.sec}</property> <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
<property name="managementPort">${auth.server.management.port}</property> <property name="managementPort">${auth.server.management.port}</property>
<property name="javaHome">${auth.server.java.home}</property>
</configuration> </configuration>
</container> </container>

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

@ -67,6 +67,8 @@
<frontend.console.output>true</frontend.console.output> <frontend.console.output>true</frontend.console.output>
<backends.console.output>true</backends.console.output> <backends.console.output>true</backends.console.output>
<auth.server.java.home>${java.home}</auth.server.java.home>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -120,6 +122,7 @@
<auth.server.management.port>${auth.server.management.port}</auth.server.management.port> <auth.server.management.port>${auth.server.management.port}</auth.server.management.port>
<auth.server.management.port.jmx>${auth.server.management.port.jmx}</auth.server.management.port.jmx> <auth.server.management.port.jmx>${auth.server.management.port.jmx}</auth.server.management.port.jmx>
<auth.server.ssl.required>${auth.server.ssl.required}</auth.server.ssl.required> <auth.server.ssl.required>${auth.server.ssl.required}</auth.server.ssl.required>
<auth.server.java.home>${auth.server.java.home}</auth.server.java.home>
<startup.timeout.sec>${startup.timeout.sec}</startup.timeout.sec> <startup.timeout.sec>${startup.timeout.sec}</startup.timeout.sec>
<jboss.server.config.dir>${jboss.server.config.dir}</jboss.server.config.dir> <jboss.server.config.dir>${jboss.server.config.dir}</jboss.server.config.dir>
<frontend.console.output>${frontend.console.output}</frontend.console.output> <frontend.console.output>${frontend.console.output}</frontend.console.output>