Merge pull request #2976 from vramik/KEYCLOAK-3151

KEYCLOAK-3151 removed adapter libs mode from testsuite

testsuite/integration-arquillian/README.md

@@ -120,13 +120,6 @@ It automatically modifies imported test realms and deployments' adapter configs
 | **Relative** | auth server == app server | client `baseUrl`, `adminUrl` and `redirect-uris` can be relative | `auth-server-url` can be relative |
 | **Non-relative** | auth server != app server  | client `baseUrl`, `adminUrl` and `redirect-uris` need to include FQDN of the app server | `auth-server-url` needs to include FQDN of the auth server|
 
-
-
-#### Adapter Libs Mode
-
-1. **Provided** - By container, e.g. as a subsystem. **Default.**
-2. **Bundled** - In the deployed war in `/WEB-INF/libs`. Enable with `-Dadapter.libs.bundled`. *Wildfly only*.
-
 #### Adapter Config Mode
 
 1. ~~**Provided** - In `standalone.xml` using `secure-deployment`. *Wildfly only.*~~ WIP

testsuite/integration-arquillian/servers/app-server/README.md

@@ -23,14 +23,9 @@ Submodules are enabled with profiles: `-Papp-server-MODULE`
  * __`wildfly` Relative Wildfly 10__ Based on [`auth-server/jboss/wildfly`](../auth-server/README.md). Activate with `-Pauth-server-wildfly`.
  * __`eap` Relative EAP 7__ Based on [`auth-server/jboss/eap`](../auth-server/README.md). Activate with `-Pauth-server-eap`.
 
-### Adapter Libs Location
-
-* __Provided__ (in container) - Default.
-* __Bundled__ (in war) `-Dadapter.libs.bundled=true`
-
 ### Adapter Configs Location
 
-* __Provided__ (in standalone.xml as secure-deployment) _Not implemented_
+* __Provided__ (in standalone.xml as secure-deployment) WIP
 * __Bundled__ (in war) - Default.
 
 ### SSL

testsuite/integration-arquillian/servers/app-server/jboss/pom.xml

@@ -186,6 +186,24 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>install-adapters</id>
+                                <phase>process-test-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <executable>${common.resources}/install-adapters.${script.suffix}</executable>
+                            <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
+                            <environmentVariables>
+                                <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                <JBOSS_HOME>${app.server.jboss.home}</JBOSS_HOME>
+                                <SAML_SUPPORTED>${app.server.saml.adapter.supported}</SAML_SUPPORTED>
+                            </environmentVariables>
+                        </configuration>
                     </plugin>
 
                     <plugin>
@@ -267,45 +285,6 @@
             </build>
         </profile>
         
-        <profile>
-            <id>adapter-libs-provided</id>
-            <activation>    
-                <property>
-                    <name>!adapter.libs.bundled</name>
-                </property>
-            </activation>
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>exec-maven-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>install-adapters</id>
-                                    <phase>process-test-resources</phase>
-                                    <goals>
-                                        <goal>exec</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                            <configuration>
-                                <executable>${common.resources}/install-adapters.${script.suffix}</executable>
-                                <workingDirectory>${app.server.jboss.home}/bin</workingDirectory>
-                                <environmentVariables>
-                                    <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
-                                    <JBOSS_HOME>${app.server.jboss.home}</JBOSS_HOME>
-                                    <SAML_SUPPORTED>${app.server.saml.adapter.supported}</SAML_SUPPORTED>
-                                </environmentVariables>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        
-                        
         <profile>
             <id>ssl</id>
             <activation>

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/AdapterLibsMode.java

@@ -1,47 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.testsuite.adapter;
-
-/**
- *
- * @author tkyjovsk
- */
-public enum AdapterLibsMode {
-    
-    PROVIDED("provided"),
-    BUNDLED("bundled");
-
-    private final String type;
-
-    private AdapterLibsMode(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public static AdapterLibsMode getByType(String type) {
-        for (AdapterLibsMode s : AdapterLibsMode.values()) {
-            if (s.getType().equals(type)) {
-                return s;
-            }
-        }
-        return null;
-    }
-}

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java

@@ -8,17 +8,11 @@ import org.jboss.arquillian.core.api.annotation.Observes;
 import org.jboss.arquillian.test.spi.annotation.ClassScoped;
 import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
 import org.jboss.logging.Logger;
-import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.keycloak.testsuite.util.LogChecker;
-
-import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import static org.keycloak.testsuite.util.IOUtil.execCommand;
-import static org.keycloak.testsuite.util.WaitUtils.pause;
 import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getAuthServerContextRoot;
 
 /**
@@ -109,66 +103,6 @@ public class AppServerTestEnricher {
         }
     }
 
-//    public void installAdapterLibs(@Observes BeforeDeploy event) {
-//        log.debug("BEFORE DEPLOY - INSTALL ADAPTER LIBS");
-//        if (testContext.isAdapterTest()) {
-//            // install adapter libs on JBoss-based container via CLI
-//            if (testContext.getAppServerInfo().isJBossBased()) {
-//                try {
-//                    installAdapterLibsUsingJBossCLIClient(testContext.getAppServerInfo());
-//                } catch (InterruptedException | IOException ex) {
-//                    throw new RuntimeException("Failed to install adapter libs.", ex);
-//                }
-//            }
-//        }
-//    }
-    private void installAdapterLibsUsingJBossCLIClient(ContainerInfo appServerInfo) throws InterruptedException, IOException {
-        if (!appServerInfo.isAdapterLibsInstalled()) {
-
-            if (!appServerInfo.isJBossBased()) {
-                throw new IllegalArgumentException("App server must be JBoss-based to run jboss-cli-client.");
-            }
-
-            String jbossHomePath = appServerInfo.getProperties().get("jbossHome");
-
-            File bin = new File(jbossHomePath + "/bin");
-
-            File clientJar = new File(jbossHomePath + "/bin/client/jboss-cli-client.jar");
-            if (!clientJar.exists()) {
-                clientJar = new File(jbossHomePath + "/bin/client/jboss-client.jar"); // AS7
-            }
-            if (!clientJar.exists()) {
-                throw new IOException("JBoss CLI client JAR not found.");
-            }
-
-            String command = "java -jar " + clientJar.getAbsolutePath();
-            String adapterScript = "adapter-install.cli";
-            String samlAdapterScript = "adapter-install-saml.cli";
-            String managementPort = appServerInfo.getProperties().get("managementPort");
-
-            String controllerArg = " --controller=localhost:" + managementPort;
-            if (new File(bin, adapterScript).exists()) {
-                log.info("Installing adapter to app server via cli script");
-                execCommand(command + " --connect --file=" + adapterScript + controllerArg, bin);
-            }
-            if (new File(bin, samlAdapterScript).exists()) {
-                log.info("Installing saml adapter to app server via cli script");
-                execCommand(command + " --connect --file=" + samlAdapterScript + controllerArg, bin);
-            }
-            if (new File(bin, adapterScript).exists() || new File(bin, samlAdapterScript).exists()) {
-                log.info("Restarting container");
-                execCommand(command + " --connect --command=reload" + controllerArg, bin);
-                log.info("Container restarted");
-                pause(5000);
-                if (System.getProperty("app.server.log.check", "true").equals("true")) {
-                    LogChecker.checkJBossServerLog(jbossHomePath);
-                }
-            }
-
-            appServerInfo.setAdapterLibsInstalled(true);
-        }
-    }
-
     /**
      *
      * @param testClass
@@ -190,12 +124,6 @@ public class AppServerTestEnricher {
         return getAppServerQualifier(testClass).equals(AuthServerTestEnricher.AUTH_SERVER_CONTAINER);
     }
 
-    public static String getAdapterLibsLocationProperty(Class testClass) {
-        Class<? extends AuthServerTestEnricher> annotatedClass = getNearestSuperclassWithAnnotation(testClass, AdapterLibsLocationProperty.class);
-        return (annotatedClass == null ? "adapter.libs.home"
-                : annotatedClass.getAnnotation(AdapterLibsLocationProperty.class).value());
-    }
-
     public static boolean isWildflyAppServer(Class testClass) {
         return getAppServerQualifier(testClass).contains("wildfly");
     }

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java

@@ -25,10 +25,7 @@ import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.keycloak.representations.adapters.config.AdapterConfig;
-import org.keycloak.representations.adapters.config.BaseAdapterConfig;
-import org.keycloak.testsuite.adapter.AdapterLibsMode;
 import org.keycloak.testsuite.util.IOUtil;
 import org.keycloak.util.JsonSerialization;
 import org.w3c.dom.Document;
@@ -38,7 +35,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.getAdapterLibsLocationProperty;
 import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.hasAppServerContainerAnnotation;
 import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isRelative;
 import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isTomcatAppServer;
@@ -71,7 +67,6 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor {
         log.info("Processing archive " + archive.getName());
 //        if (isAdapterTest(testClass)) {
         modifyAdapterConfigs(archive, testClass);
-        attachAdapterLibs(archive, testClass);
         modifyWebXml(archive, testClass);
 //        } else {
 //            log.info(testClass.getJavaClass().getSimpleName() + " is not an AdapterTest");
@@ -145,30 +140,6 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor {
         }
     }
 
-    protected void attachAdapterLibs(Archive<?> archive, TestClass testClass) {
-        AdapterLibsMode adapterType = AdapterLibsMode.getByType(System.getProperty("adapter.libs.mode",
-                AdapterLibsMode.PROVIDED.getType()));
-        log.info("Adapter type: " + adapterType);
-        if (adapterType.equals(AdapterLibsMode.BUNDLED)) {
-            log.info("Attaching keycloak adapter libs to " + archive.getName());
-
-            String libsLocationProperty = getAdapterLibsLocationProperty(testClass.getJavaClass());
-            assert libsLocationProperty != null;
-            File libsLocation = new File(System.getProperty(libsLocationProperty));
-            assert libsLocation.exists();
-            log.info("Libs location: " + libsLocation.getPath());
-
-            WebArchive war = (WebArchive) archive;
-
-            for (File lib : getAdapterLibs(libsLocation)) {
-                log.info(" attaching: " + lib.getName());
-                war.addAsLibrary(lib);
-            }
-        } else {
-            log.info("Expecting keycloak adapter libs to be provided by the server.");
-        }
-    }
-
     DirectoryScanner scanner = new DirectoryScanner();
 
     protected List<File> getAdapterLibs(File adapterLibsLocation) {

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AdapterLibsLocationProperty.java

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.testsuite.arquillian.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author tkyjovsk
- */
-@Documented
-@Retention(RUNTIME)
-@Target({ElementType.TYPE})
-public @interface AdapterLibsLocationProperty 
-{
-   String value() default "adapter.libs.home";
-}

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AppServerContainer.java

@@ -33,5 +33,4 @@ import java.lang.annotation.Target;
 public @interface AppServerContainer 
 {
    String value() default "";
-   String adapterLibsLocationProperty() default "";
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/as7/pom.xml

@@ -33,7 +33,6 @@
     
     <properties>
         <app.server>as7</app.server>
-        <adapter.libs.home>${app.server.home}/modules/org/keycloak</adapter.libs.home>
         
         <app.server.management.protocol>remote</app.server.management.protocol>
         <app.server.management.port>${app.server.management.port.jmx}</app.server.management.port>

testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-as7")
-//@AdapterLibsLocationProperty("adapter.libs.as7")
 public class AS7OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-as7")
-//@AdapterLibsLocationProperty("adapter.libs.as7")
 public class AS7OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7BasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-as7")
-//@AdapterLibsLocationProperty("adapter.libs.as7")
 public class AS7BasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7DemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-as7")
-//@AdapterLibsLocationProperty("adapter.libs.as7")
 public class AS7DemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java

@@ -1,7 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.junit.Ignore;
 import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
 
 /**
@@ -9,8 +8,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
-//@Ignore //failing tests
 public class EAPOIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
 public class EAPOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
 public class EAPSAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPBasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
 public class EAPBasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPDemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
 public class EAPDemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPJSConsoleExampleAdapterTest.java

@@ -1,13 +1,11 @@
 package org.keycloak.testsuite.adapter.example;
 
-import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.junit.Ignore;
+
 /**
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class EAPJSConsoleExampleAdapterTest extends AbstractJSConsoleExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPSAMLExampleAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-eap")
-//@AdapterLibsLocationProperty("adapter.libs.eap7")
 public class EAPSAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java

@@ -1,7 +1,6 @@
 package org.keycloak.testsuite.adapter;
 
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.junit.Ignore;
 import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
 
 /**
@@ -9,8 +8,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
-//@Ignore //failing tests
 public class EAP6OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6SAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6BasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6BasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6CorsExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.junit.Ignore;
  * @author fkiss
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 @Ignore //cannot find web.xml in target/examples
 public class EAP6CorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
 

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6DemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6DemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6JSConsoleExampleAdapterTest.java

@@ -1,13 +1,11 @@
 package org.keycloak.testsuite.adapter.example;
 
-import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
-import org.junit.Ignore;
+
 /**
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6JSConsoleExampleAdapterTest extends AbstractJSConsoleExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6SAMLExampleAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-eap6")
-//@AdapterLibsLocationProperty("adapter.libs.eap6")
 public class EAP6SAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml

@@ -35,7 +35,6 @@
     
     <properties>
         <common.resources>${project.parent.basedir}/common</common.resources>
-        <adapter.libs.home>${app.server.home}/modules/system/add-ons/keycloak</adapter.libs.home>
         <app.server.type>managed</app.server.type>
     </properties>
 
@@ -46,7 +45,7 @@
                 <artifactId>xml-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>Configure keycloak subsystem</id>
+                        <id>configure-keycloak-subsystem</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>transform</goal>
@@ -91,7 +90,7 @@
                         <artifactId>xml-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>Configure keycloak subsystem</id>
+                                <id>configure-keycloak-subsystem</id>
                                 <phase>process-test-resources</phase>
                                 <goals>
                                     <goal>transform</goal>

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPOIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java

@@ -5,7 +5,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
 /**
  * @author mhajas
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPSAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPBasicAuthExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPBasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPCorsExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author fkiss
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPCorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPDemoExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPDemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPJSConsoleExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPJSConsoleExampleAdapterTest extends AbstractJSConsoleExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPSAMLExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author mhajas
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeEAPSAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractDemoServletsAdapterTest;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyOIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java

@@ -5,7 +5,6 @@ import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest;
 /**
  * @author mhajas
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflySAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyBasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author fkiss
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyCorsExampleAdapterTest extends AbstractCorsExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyDemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyJSConsoleExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author tkyjovsk
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflyJSConsoleExampleAdapterTest extends AbstractJSConsoleExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java

@@ -4,7 +4,6 @@ package org.keycloak.testsuite.adapter.example;
  *
  * @author mhajas
  */
-//@AdapterLibsLocationProperty("adapter.libs.eap")
 public class RelativeWildflySAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflyOIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflyOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflySAMLAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflySAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyBasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflyBasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyDemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflyDemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyJSConsoleExampleAdapterTest.java

@@ -1,16 +1,13 @@
 
 package org.keycloak.testsuite.adapter.example;
 
-import org.keycloak.testsuite.arquillian.annotation.AdapterLibsLocationProperty;
 import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 
-
 /**
  *
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflyJSConsoleExampleAdapterTest extends AbstractJSConsoleExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflySAMLExampleAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly")
 public class WildflySAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly8")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly8")
 public class Wildfly8OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly8")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly8")
 public class Wildfly8OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8BasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly8")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly8")
 public class Wildfly8BasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8DemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly8")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly8")
 public class Wildfly8DemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9OIDCAdapterTest extends AbstractDemoServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java

@@ -8,7 +8,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9OIDCSessionAdapterTest extends AbstractSessionServletAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9SAMLAdapterTest extends AbstractSAMLServletsAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9BasicAuthExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9BasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9DemoExampleAdapterTest.java

@@ -7,7 +7,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author tkyjovsk
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9DemoExampleAdapterTest extends AbstractDemoExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9SAMLExampleAdapterTest.java

@@ -6,7 +6,6 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
  * @author mhajas
  */
 @AppServerContainer("app-server-wildfly9")
-//@AdapterLibsLocationProperty("adapter.libs.wildfly9")
 public class Wildfly9SAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest {
 
 }

testsuite/integration-arquillian/tests/other/adapters/pom.xml

@@ -66,8 +66,7 @@
         </adapter.test.props>
         
         <app.server.home>${containers.home}/app-server-${app.server}</app.server.home>
-        <adapter.libs.mode>bundled</adapter.libs.mode>
+        <adapter.config.bundled>true</adapter.config.bundled>
-        <adapter.config.mode>bundled</adapter.config.mode>
         
     </properties>
         
@@ -169,9 +168,7 @@
 
                                 <adapter.test.props>${adapter.test.props}</adapter.test.props>
 
-                                <adapter.libs.home>${adapter.libs.home}</adapter.libs.home>
+                                <adapter.config.bundled>${adapter.config.bundled}</adapter.config.bundled>
-                                <adapter.libs.mode>${adapter.libs.mode}</adapter.libs.mode>
-                                <adapter.config.mode>${adapter.config.mode}</adapter.config.mode>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -179,18 +176,6 @@
             </build>
         </profile>
         
-        <profile>
-            <id>adapter-libs-provided</id>
-            <activation>    
-                <property>
-                    <name>!adapter.libs.bundled</name>
-                </property>
-            </activation>
-            <properties>
-                <adapter.libs.mode>provided</adapter.libs.mode>
-            </properties>
-        </profile>
-        
         <profile>
             <id>examples</id>
             <activation>