From 191d03f5f39e6f7a69233f27d0c7a714f7c4930b Mon Sep 17 00:00:00 2001 From: Tomas Kyjovsky Date: Fri, 5 Feb 2016 01:29:53 +0100 Subject: [PATCH] minor edits --- .../arquillian/AppServerTestEnricher.java | 2 +- .../DeploymentArchiveProcessor.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 47cad7d25f..9289593232 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 @@ -106,7 +106,7 @@ public class AppServerTestEnricher { } public void installAdapterLibs(@Observes BeforeDeploy event) { - log.info("BEFORE DEPLOY"); + log.debug("BEFORE DEPLOY - INSTALL ADAPTER LIBS"); if (testContext.isAdapterTest()) { // install adapter libs on JBoss-based container via CLI if (testContext.getAppServerInfo().isJBossBased()) { 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 da482a8627..e4a8ab20ec 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 @@ -70,7 +70,7 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { log.info("Processing archive " + archive.getName()); // if (isAdapterTest(testClass)) { modifyAdapterConfigs(archive, testClass); - attachKeycloakLibs(archive, testClass); + attachAdapterLibs(archive, testClass); modifyWebXml(archive, testClass); // } else { // log.info(testClass.getJavaClass().getSimpleName() + " is not an AdapterTest"); @@ -93,21 +93,21 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { protected void modifyAdapterConfig(Archive archive, String adapterConfigPath, boolean relative) { if (archive.contains(adapterConfigPath)) { log.info("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); - if (adapterConfigPath.equals(SAML_ADAPTER_CONFIG_PATH)) { + if (adapterConfigPath.equals(SAML_ADAPTER_CONFIG_PATH)) { // SAML adapter config log.info("Modyfying saml adapter config in " + archive.getName()); Document doc = loadXML(archive.get("WEB-INF/keycloak-saml.xml").getAsset().openStream()); if (authServerSslRequired) { - modifyDocElementAttribute(doc, "SingleSignOnService", "bindingUrl", "8080", System.getProperty("auth.server.https.port", null)); + modifyDocElementAttribute(doc, "SingleSignOnService", "bindingUrl", "8080", System.getProperty("auth.server.https.port")); modifyDocElementAttribute(doc, "SingleSignOnService", "bindingUrl", "http", "https"); - modifyDocElementAttribute(doc, "SingleLogoutService", "postBindingUrl", "8080", System.getProperty("auth.server.https.port", null)); + modifyDocElementAttribute(doc, "SingleLogoutService", "postBindingUrl", "8080", System.getProperty("auth.server.https.port")); modifyDocElementAttribute(doc, "SingleLogoutService", "postBindingUrl", "http", "https"); - modifyDocElementAttribute(doc, "SingleLogoutService", "redirectBindingUrl", "8080", System.getProperty("auth.server.https.port", null)); + modifyDocElementAttribute(doc, "SingleLogoutService", "redirectBindingUrl", "8080", System.getProperty("auth.server.https.port")); modifyDocElementAttribute(doc, "SingleLogoutService", "redirectBindingUrl", "http", "https"); } else { - modifyDocElementAttribute(doc, "SingleSignOnService", "bindingUrl", "8080", System.getProperty("auth.server.http.port", null)); - modifyDocElementAttribute(doc, "SingleLogoutService", "postBindingUrl", "8080", System.getProperty("auth.server.http.port", null)); - modifyDocElementAttribute(doc, "SingleLogoutService", "redirectBindingUrl", "8080", System.getProperty("auth.server.http.port", null)); + modifyDocElementAttribute(doc, "SingleSignOnService", "bindingUrl", "8080", System.getProperty("auth.server.http.port")); + modifyDocElementAttribute(doc, "SingleLogoutService", "postBindingUrl", "8080", System.getProperty("auth.server.http.port")); + modifyDocElementAttribute(doc, "SingleLogoutService", "redirectBindingUrl", "8080", System.getProperty("auth.server.http.port")); } try { @@ -116,7 +116,7 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { log.error("Can't transform document to String"); throw new RuntimeException(e); } - } else { + } else { // OIDC adapter config try { BaseAdapterConfig adapterConfig = loadJson(archive.get(adapterConfigPath) .getAsset().openStream(), BaseAdapterConfig.class); @@ -144,7 +144,7 @@ public class DeploymentArchiveProcessor implements ApplicationArchiveProcessor { } } - protected void attachKeycloakLibs(Archive archive, TestClass testClass) { + protected void attachAdapterLibs(Archive archive, TestClass testClass) { AdapterLibsMode adapterType = AdapterLibsMode.getByType(System.getProperty("adapter.libs.mode", AdapterLibsMode.PROVIDED.getType())); log.info("Adapter type: " + adapterType);