Prosoft Git

keycloak-developers

KEYCLOAK-1183 Split subsystem into separate server and adapter …

5/5/2015 12:04:54 PM
Marko Strukelj

Marko Strukelj

Commit: 7d2942e

Tree: 0a53354

Parents: 9434046

Changes

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml 2(+1 -1)

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml 2(+1 -1)

distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml 2(+1 -1)

distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml 2(+1 -1)

distribution/modules/build.xml 4(+2 -2)

distribution/modules/pom.xml 4(+2 -2)

integration/keycloak-adapter-subsystem/pom.xml 105(+0 -105)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/CredentialAddHandler.java 43(+0 -43)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/CredentialDefinition.java 61(+0 -61)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/CredentialReadWriteAttributeHandler.java 50(+0 -50)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/CredentialRemoveHandler.java 42(+0 -42)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakAdapterConfigDeploymentProcessor.java 131(+0 -131)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakAdapterConfigService.java 179(+0 -179)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessor.java 67(+0 -67)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessorWildFly.java 41(+0 -41)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakExtension.java 83(+0 -83)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakSubsystemAdd.java 59(+0 -59)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakSubsystemDefinition.java 45(+0 -45)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakSubsystemParser.java 224(+0 -224)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/RealmAddHandler.java 62(+0 -62)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/RealmDefinition.java 87(+0 -87)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/RealmRemoveHandler.java 41(+0 -41)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/RealmWriteAttributeHandler.java 54(+0 -54)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SecureDeploymentAddHandler.java 57(+0 -57)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SecureDeploymentDefinition.java 130(+0 -130)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SecureDeploymentRemoveHandler.java 41(+0 -41)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SecureDeploymentWriteAttributeHandler.java 59(+0 -59)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/SharedAttributeDefinitons.java 228(+0 -228)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/logging/KeycloakLogger.java 45(+0 -45)

integration/keycloak-adapter-subsystem/src/main/java/org/keycloak/subsystem/adapter/logging/KeycloakMessages.java 34(+0 -34)

integration/keycloak-adapter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension 1(+0 -1)

integration/keycloak-adapter-subsystem/src/main/resources/org/keycloak/subsystem/adapter/extension/LocalDescriptions.properties 72(+0 -72)

integration/keycloak-adapter-subsystem/src/main/resources/schema/wildfly-keycloak_1_1.xsd 105(+0 -105)

integration/keycloak-adapter-subsystem/src/main/resources/subsystem-templates/keycloak-adapter.xml 7(+0 -7)

integration/keycloak-adapter-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/RealmDefinitionTestCase.java 86(+0 -86)

integration/keycloak-adapter-subsystem/src/test/java/org/keycloak/subsystem/adapter/extension/SubsystemParsingTestCase.java 75(+0 -75)

integration/keycloak-adapter-subsystem/src/test/resources/org/keycloak/subsystem/adapter/extension/keycloak-1.1.xml 24(+0 -24)

integration/keycloak-subsystem/src/test/resources/org/keycloak/subsystem/extension/keycloak-1.0.xml 24(+0 -24)

integration/pom.xml 4(+2 -2)

integration/wildfly-server-subsystem/pom.xml 2(+1 -1)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AbstractAddOverlayHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AddProviderHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AuthServerAddHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AuthServerDefinition.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AuthServerRemoveHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AuthServerUtil.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/AuthServerWriteAttributeHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/KeycloakServerDeploymentProcessor.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/ListOverlaysHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/OverlayKeycloakServerJsonHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/authserver/RemoveOverlayHandler.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakAdapterConfigService.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakDependencyProcessor.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakDependencyProcessorWildFly.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakExtension.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemAdd.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemDefinition.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakSubsystemParser.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakLogger.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/java/org/keycloak/subsystem/server/logging/KeycloakMessages.java 0(+0 -0)

integration/wildfly-server-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension 0(+0 -0)

integration/wildfly-server-subsystem/src/main/resources/org/keycloak/subsystem/server/extension/LocalDescriptions.properties 0(+0 -0)

integration/wildfly-server-subsystem/src/main/resources/schema/wildfly-keycloak-server_1_1.xsd 0(+0 -0)

integration/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml 0(+0 -0)

integration/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-server.xml 0(+0 -0)

integration/wildfly-server-subsystem/src/test/java/org/keycloak/subsystem/server/extension/SubsystemParsingTestCase.java 0(+0 -0)

integration/wildfly-server-subsystem/src/test/resources/org/keycloak/subsystem/server/extension/keycloak-server-1.1.xml 0(+0 -0)

pom.xml 2(+1 -1)

Details

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml 2(+1 -1) 

diff --git a/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml b/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml
index e63c89a..796ec17 100644
--- a/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml
+++ b/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml
@@ -106,7 +106,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-adapter-subsystem</artifactId>
+            <artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml 2(+1 -1) 

diff --git a/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml b/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml
index 9d90a27..ba05308 100644
--- a/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml
+++ b/distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-subsystem/main/module.xml
@@ -25,7 +25,7 @@
 <module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-adapter-subsystem">
 
     <resources>
-        <artifact name="${org.keycloak:keycloak-adapter-subsystem}"/>
+        <artifact name="${org.keycloak:keycloak-wildfly-adapter-subsystem}"/>
     </resources>
 
     <dependencies>

distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml 2(+1 -1) 

diff --git a/distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml b/distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml
index 1fdf020..e92bb86 100644
--- a/distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml
+++ b/distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml
@@ -45,7 +45,7 @@
         </dependency>   
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-subsystem</artifactId>
+            <artifactId>keycloak-wildfly-server-subsystem</artifactId>
             <version>${project.version}</version>
         </dependency>      
         <dependency>

distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml 2(+1 -1) 

diff --git a/distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml b/distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml
index 789c779..ca31daf 100644
--- a/distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml
+++ b/distribution/feature-pack-builds/server-only/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/module.xml
@@ -30,7 +30,7 @@
 
     <resources>
         <resource-root path="."/>
-        <artifact name="${org.keycloak:keycloak-server-subsystem}"/>
+        <artifact name="${org.keycloak:keycloak-wildfly-server-subsystem}"/>
     </resources>
 
     <dependencies>

distribution/modules/build.xml 4(+2 -2) 

diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index a48655e..e7ede69 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -337,10 +337,10 @@
         </module-def>
 
         <module-def name="org.keycloak.keycloak-server-subsystem">
-            <maven-resource group="org.keycloak" artifact="keycloak-server-subsystem"/>
+            <maven-resource group="org.keycloak" artifact="keycloak-wildfly-server-subsystem"/>
         </module-def>
         <module-def name="org.keycloak.keycloak-adapter-subsystem">
-            <maven-resource group="org.keycloak" artifact="keycloak-adapter-subsystem"/>
+            <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter-subsystem"/>
         </module-def>
         <module-def name="org.keycloak.keycloak-as7-subsystem">
             <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>

distribution/modules/pom.xml 4(+2 -2) 

diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 713b912..d1d3b8c 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -56,12 +56,12 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-subsystem</artifactId>
+            <artifactId>keycloak-wildfly-server-subsystem</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-adapter-subsystem</artifactId>
+            <artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

integration/pom.xml 4(+2 -2) 

diff --git a/integration/pom.xml b/integration/pom.xml
index 9f1680c..4f5369d 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -24,8 +24,8 @@
         <module>undertow</module>
         <module>wildfly-adapter</module>
         <module>wildfly-extensions</module>
-        <module>keycloak-server-subsystem</module>
-        <module>keycloak-adapter-subsystem</module>
+        <module>wildfly-server-subsystem</module>
+        <module>wildfly-adapter-subsystem</module>
         <module>keycloak-as7-subsystem</module>
         <module>js</module>
         <module>installed</module>

pom.xml 2(+1 -1) 

diff --git a/pom.xml b/pom.xml
index 917c8ba..796918a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-adapter-subsystem</artifactId>
+                <artifactId>keycloak-wildfly-adapter-subsystem</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github