keycloak-uncached

Merge pull request #3634 from tkyjovsk/KEYCLOAK-4061 KEYCLOAK-4061

12/13/2016 11:05:05 AM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
index 77640aa..e8852bc 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java
@@ -74,7 +74,7 @@ public class URLProvider extends URLResourceProvider {
         }
 
         try {
-            if (System.getProperty("app.server","").startsWith("eap6")) {
+            if (System.getProperty("app.server.management.protocol","").equals("remote")) {
                 if (url == null) {
                     url = new URL("http://localhost:8080/");
                 }
diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
index 2726651..6b26801 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
@@ -127,6 +127,14 @@
             <!--dummy profile for enforcer-->
         </profile>
         <profile>
+            <id>app-server-remote-as7-eap6</id>
+            <!--this profile is required if remote app server is AS7 or EAP6-->
+            <properties>
+                <app.server.management.protocol>remote</app.server.management.protocol>
+                <app.server.management.port>${app.server.management.port.jmx}</app.server.management.port>
+            </properties>
+        </profile>
+        <profile>
             <id>no-offset</id>
             <properties>
                 <app.server.port.offset>0</app.server.port.offset>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
index 9da9341..c18ecc1 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
+++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/remote/src/test/resources/xslt/arquillian.xsl
@@ -32,6 +32,7 @@
                 <configuration>
                     <property name="adapterImplClass">org.jboss.as.arquillian.container.remote.RemoteDeployableContainer</property>
 
+                    <property name="managementProtocol">${app.server.management.protocol}</property>
                     <property name="managementAddress">${app.server.host}</property>
                     <property name="managementPort">${app.server.management.port}</property>
                     <property name="username">admin</property>