diff --git a/testsuite/integration-arquillian/README.md b/testsuite/integration-arquillian/README.md index 4a0cfa1e52..965dead85b 100644 --- a/testsuite/integration-arquillian/README.md +++ b/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 diff --git a/testsuite/integration-arquillian/servers/app-server/README.md b/testsuite/integration-arquillian/servers/app-server/README.md index 008e4f594f..e6a3354eb1 100644 --- a/testsuite/integration-arquillian/servers/app-server/README.md +++ b/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 diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index 702fb5113c..4199cea16e 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -186,6 +186,24 @@ org.codehaus.mojo exec-maven-plugin + + + install-adapters + process-test-resources + + exec + + + + + ${common.resources}/install-adapters.${script.suffix} + ${app.server.jboss.home}/bin + + ${app.server.java.home} + ${app.server.jboss.home} + ${app.server.saml.adapter.supported} + + @@ -267,45 +285,6 @@ - - adapter-libs-provided - - - !adapter.libs.bundled - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-adapters - process-test-resources - - exec - - - - - ${common.resources}/install-adapters.${script.suffix} - ${app.server.jboss.home}/bin - - ${app.server.java.home} - ${app.server.jboss.home} - ${app.server.saml.adapter.supported} - - - - - - - - - ssl diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/AdapterLibsMode.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/AdapterLibsMode.java deleted file mode 100644 index e14b501cdc..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/AdapterLibsMode.java +++ /dev/null @@ -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; - } -} diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java index 75d5510abc..11e5fc6b34 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java +++ b/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 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"); } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java index 8ea9a49d74..a63595e3bf 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java +++ b/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 getAdapterLibs(File adapterLibsLocation) { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AdapterLibsLocationProperty.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AdapterLibsLocationProperty.java deleted file mode 100644 index 18bcdcc8f2..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AdapterLibsLocationProperty.java +++ /dev/null @@ -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"; -} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AppServerContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AppServerContainer.java index d2e2fa758b..c284d9a0e4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/AppServerContainer.java +++ b/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 ""; } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/pom.xml index e3a882d968..9277b536bc 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/pom.xml @@ -33,7 +33,6 @@ as7 - ${app.server.home}/modules/org/keycloak remote ${app.server.management.port.jmx} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCAdapterTest.java index 93dec26649..bd9843ed18 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCSessionAdapterTest.java index 51da714e5d..1d1c632c61 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/AS7OIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7BasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7BasicAuthExampleAdapterTest.java index 7c62445161..280cd617ed 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7BasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7DemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7DemoExampleAdapterTest.java index 53ae0e18b2..0daaf9a9f3 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/as7/src/test/java/org/keycloak/testsuite/adapter/example/AS7DemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java index 4912f06fd9..8c663f2cb5 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java index e1db84faeb..c84f2cbbb9 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPOIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java index 8852087121..33aaab36e3 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/EAPSAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPBasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPBasicAuthExampleAdapterTest.java index 26b7c5f98e..574ee16c4c 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPBasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPDemoExampleAdapterTest.java index fa22b56d1d..f461222e5e 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPDemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPJSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPJSConsoleExampleAdapterTest.java index 0674eeacd9..e9cabc4891 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPJSConsoleExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPSAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPSAMLExampleAdapterTest.java index 4ae083889d..b5431ff7b8 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap/src/test/java/org/keycloak/testsuite/adapter/example/EAPSAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java index 356237093b..a834596452 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java index 82f5926b45..a3c6bc9def 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6OIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java index dff9bc1cb8..ee73379c31 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/EAP6SAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6BasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6BasicAuthExampleAdapterTest.java index c293d051d5..8299093dc2 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6BasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6CorsExampleAdapterTest.java index 8bc4646509..80c7dad811 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6CorsExampleAdapterTest.java +++ b/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 { diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6DemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6DemoExampleAdapterTest.java index 9541c143c8..d0c0c95e74 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6DemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6JSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6JSConsoleExampleAdapterTest.java index 4f167baf2f..c2911b53b5 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6JSConsoleExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6SAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6SAMLExampleAdapterTest.java index f0977dcf25..208d43098e 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/eap6/src/test/java/org/keycloak/testsuite/adapter/example/EAP6SAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml index 2fc2eb8e63..518b9484fb 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/jboss/pom.xml @@ -35,7 +35,6 @@ ${project.parent.basedir}/common - ${app.server.home}/modules/system/add-ons/keycloak managed @@ -46,7 +45,7 @@ xml-maven-plugin - Configure keycloak subsystem + configure-keycloak-subsystem process-test-resources transform @@ -91,7 +90,7 @@ xml-maven-plugin - Configure keycloak subsystem + configure-keycloak-subsystem process-test-resources transform diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java index 249ec6bdf4..8d0cedcefd 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java index 9ef19ce823..444c7587c9 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java index cd27bee6be..9807577299 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPBasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPBasicAuthExampleAdapterTest.java index 60b9595907..9d779502d2 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPBasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPCorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPCorsExampleAdapterTest.java index a718a3bf7b..b96ee75e0f 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPCorsExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPDemoExampleAdapterTest.java index d2775bfdc8..ef94eee5b3 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPDemoExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPJSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPJSConsoleExampleAdapterTest.java index d11f68bc18..465ae456d2 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPJSConsoleExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPSAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPSAMLExampleAdapterTest.java index 6361e83ca4..2afe2381e1 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/example/RelativeEAPSAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java index dd7b73321c..09ed2bc76c 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java index 021d25b874..060af6102a 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java index 0413cee7d4..ea3afa6e17 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java index dc2f293d10..17dc40c301 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java index 69a86949c0..af3bdb886d 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java index 108fc5b7cf..0abd086ac8 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyJSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyJSConsoleExampleAdapterTest.java index 38079978a7..7bf44bcca3 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyJSConsoleExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java index 303f0b479a..56fa580ed8 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCAdapterTest.java index cd4ca90960..51ba75e452 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCSessionAdapterTest.java index e6324fa0f7..0b3c03e3ae 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflyOIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflySAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflySAMLAdapterTest.java index 8e004454e3..4ffed541b5 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/WildflySAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyBasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyBasicAuthExampleAdapterTest.java index 6fda250726..878f337cbe 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyBasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyDemoExampleAdapterTest.java index 41d53cb709..588c28d82d 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyDemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyJSConsoleExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyJSConsoleExampleAdapterTest.java index 783446103b..bc9c7ae949 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflyJSConsoleExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflySAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflySAMLExampleAdapterTest.java index e8627aaf21..e118da1f1b 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/WildflySAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCAdapterTest.java index 10f3d8d0bd..f853f0db57 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCSessionAdapterTest.java index 06f2df7220..b78adbdea7 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/Wildfly8OIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8BasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8BasicAuthExampleAdapterTest.java index 03aa572500..dc4e7cc76c 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8BasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8DemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8DemoExampleAdapterTest.java index 9c6dd6cefe..8bb20d8b67 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly8/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly8DemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java index 621cd203d3..8c92df2f24 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java index 3f7ddcec92..61436ea54f 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9OIDCSessionAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java index 77f8eb1781..a042c787cf 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/Wildfly9SAMLAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9BasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9BasicAuthExampleAdapterTest.java index bb70e9eee3..9d68c8a383 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9BasicAuthExampleAdapterTest.java +++ b/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 { } diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9DemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9DemoExampleAdapterTest.java index d1af7fa996..26ce953a62 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9DemoExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9SAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9SAMLExampleAdapterTest.java index 7f551234e7..e5e5c27dab 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/wildfly9/src/test/java/org/keycloak/testsuite/adapter/example/Wildfly9SAMLExampleAdapterTest.java +++ b/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 { } \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/pom.xml index b53c73902a..7f668e40be 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/pom.xml @@ -66,8 +66,7 @@ ${containers.home}/app-server-${app.server} - bundled - bundled + true @@ -169,9 +168,7 @@ ${adapter.test.props} - ${adapter.libs.home} - ${adapter.libs.mode} - ${adapter.config.mode} + ${adapter.config.bundled} @@ -179,18 +176,6 @@ - - adapter-libs-provided - - - !adapter.libs.bundled - - - - provided - - - examples