Merge pull request #2072 from patriot1burke/master

final re-org work

adapters/oidc/adapter-core/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

adapters/oidc/as7-eap6/as7-adapter/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

adapters/oidc/as7-eap6/as7-subsystem/pom.xml

@@ -21,7 +21,7 @@
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-parent</artifactId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-as7-subsystem</artifactId>

adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakAdapterConfigService.java

@@ -85,7 +85,7 @@ public final class KeycloakAdapterConfigService {
         }
 
         String credentialName = credentialNameFromOp(operation);
-        if (!credentialName.contains(".")) {
+        if (!credentialName.contains("")) {
             credentials.get(credentialName).set(model.get("value").asString());
         } else {
             String[] parts = credentialName.split("\\.");

adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/KeycloakSubsystemParser.java

@@ -157,7 +157,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
             credentialsToAdd.add(addCredential);
         } else {
             for (Map.Entry<String, String> entry : values.entrySet()) {
-                ModelNode addCredential = getCredentialToAdd(parent, name + "." + entry.getKey(), entry.getValue());
+                ModelNode addCredential = getCredentialToAdd(parent, name + "" + entry.getKey(), entry.getValue());
                 credentialsToAdd.add(addCredential);
             }
         }
@@ -243,7 +243,7 @@ class KeycloakSubsystemParser implements XMLStreamConstants, XMLElementReader<Li
             String credName = credential.getName();
             String credValue = credential.getValue().get(CredentialDefinition.VALUE.getName()).asString();
 
-            if (credName.contains(".")) {
+            if (credName.contains("")) {
                 String[] parts = credName.split("\\.");
                 String provider = parts[0];
                 String propKey = parts[1];

adapters/oidc/as7-eap6/pom.xml

@@ -4,7 +4,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak AS7 / JBoss EAP 6 Integration</name>
     <description/>

adapters/oidc/installed/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jaxrs-oauth-client/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/jetty-adapter-spi/pom.xml

@@ -5,7 +5,7 @@
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/jetty-core/pom.xml

@@ -5,7 +5,7 @@
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/jetty8.1/pom.xml

@@ -5,7 +5,7 @@
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/jetty9.1/pom.xml

@@ -5,7 +5,7 @@
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/jetty9.2/pom.xml

@@ -5,7 +5,7 @@
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

adapters/oidc/jetty/pom.xml

@@ -4,7 +4,7 @@
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Jetty Integration</name>
     <description/>