KEYCLOAK-856 Rename wildfly-subsystem to keycloak-subsystem

distribution/appliance-dist/src/main/xslt/standalone.xsl

@@ -12,7 +12,7 @@
     <xsl:template match="node()[name(.)='extensions']">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
         </xsl:copy>
     </xsl:template>
 

distribution/as7-adapter-zip/assembly.xml

@@ -12,7 +12,7 @@
             <excludes>
                 <exclude>org/picketlink/**</exclude>
                 <exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
-                <exclude>org/keycloak/keycloak-wildfly-subsystem/**</exclude>
+                <exclude>org/keycloak/keycloak-subsystem/**</exclude>
                 <exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
             </excludes>
             <outputDirectory>modules</outputDirectory>

distribution/eap6-adapter-zip/assembly.xml

@@ -12,7 +12,7 @@
             <excludes>
                 <exclude>org/picketlink/**</exclude>
                 <exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
-                <exclude>org/keycloak/keycloak-wildfly-subsystem/**</exclude>
+                <exclude>org/keycloak/keycloak-subsystem/**</exclude>
                 <exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
             </excludes>
             <outputDirectory>modules/system/layers/base</outputDirectory>

distribution/modules/build.xml

@@ -83,8 +83,8 @@
             <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/>
         </module-def>
 
-        <module-def name="org.keycloak.keycloak-wildfly-subsystem">
-            <maven-resource group="org.keycloak" artifact="keycloak-wildfly-subsystem"/>
+        <module-def name="org.keycloak.keycloak-subsystem">
+            <maven-resource group="org.keycloak" artifact="keycloak-subsystem"/>
         </module-def>
         <module-def name="org.keycloak.keycloak-as7-subsystem">
             <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>

distribution/modules/pom.xml

@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-wildfly-subsystem</artifactId>
+            <artifactId>keycloak-subsystem</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -214,7 +214,7 @@
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/modules/org/keycloak/keycloak-wildfly-subsystem/main/auth-server</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/modules/org/keycloak/keycloak-subsystem/main/auth-server</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

distribution/modules/src/main/resources/modules/org/keycloak/keycloak-subsystem/main/module.xml

@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-wildfly-subsystem">
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-subsystem">
     <properties>
         <property name="keycloak-version" value="${project.version}"/>
         <property name="auth-server-exploded" value="false"/>

docbook/reference/en/en-US/modules/jboss-adapter.xml

@@ -41,28 +41,12 @@ $ unzip keycloak-as7-adapter-dist.zip
         After adding the Keycloak modules, you must then enable the Keycloak Subsystem within your app server's server configuration:
         <literal>domain.xml</literal> or <literal>standalone.xml</literal>.
     </para>
-    <para>For Wildfly:
+    <para>
 <programlisting><![CDATA[
 <server xmlns="urn:jboss:domain:1.4">
 
     <extensions>
-        <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-          ...
-    </extensions>
-
-    <profile>
-        <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-         ...
-    </profile>
-]]>
-</programlisting>
-    </para>
-    <para>For JBoss AS 7.1.1 and EAP 6.x:
-<programlisting><![CDATA[
-<server xmlns="urn:jboss:domain:1.4">
-
-    <extensions>
-        <extension module="org.keycloak.keycloak-as7-subsystem"/>
+        <extension module="org.keycloak.keycloak-subsystem"/>
           ...
     </extensions>
 
@@ -74,7 +58,7 @@ $ unzip keycloak-as7-adapter-dist.zip
 </programlisting>
     </para>
         <para>
-            Finally, for both AS7, EAP 6.x, and Wildfly installations you must specify a shared keycloak security domain.
+            Finally, you must specify a shared keycloak security domain.
             This security domain should be used with EJBs and other components when you need the security context created
             in the secured web tier to be propagated to the EJBs (other EE component) you are invoking.  Otherwise
             this configuration is optional.

examples/demo-template/README.md

@@ -57,12 +57,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -71,21 +69,6 @@ For Wildfly:
             ...
         </profile>
 
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-
 Step 2: Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

examples/demo-template/README.md.unconfigured

@@ -37,7 +37,7 @@ Next configure the Keycloak adapter by editing `standalone/configuration/standal
 
     <extensions>
         ....
-        <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+        <extension module="org.keycloak.keycloak-subsystem"/>
     </extensions>
 
 You also need to add realm config to the same file. Add a new child-element to `<profile>`:

examples/saml/post-basic/README.md

@@ -45,12 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -59,21 +57,6 @@ For Wildfly:
             ...
         </profile>
 
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-
 Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

examples/saml/post-with-encryption/README.md

@@ -45,12 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -59,21 +57,6 @@ For Wildfly:
             ...
         </profile>
 
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-
 Boot Keycloak Server
 ---------------------------------------
 Where you go to start up the Keycloak Server depends on which distro you installed.

examples/saml/post-with-signature/README.md

@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 

examples/saml/redirect-basic/README.md

@@ -45,26 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
-
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 

examples/saml/redirect-with-signature/README.md

@@ -45,12 +45,10 @@ For JBoss AS 7.1.1:
 Unzipping the adapter ZIP only installs the JAR files.  You must also add the Keycloak Subsystem to the server's
 configuration (standalone/configuration/standalone.xml).
 
-For Wildfly:
-
     <server xmlns="urn:jboss:domain:1.4">
 
         <extensions>
-            <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+            <extension module="org.keycloak.keycloak-subsystem"/>
             ...
         </extensions>
 
@@ -59,19 +57,6 @@ For Wildfly:
             ...
         </profile>
 
-For JBoss 7.1.1 and EAP 6.x:
-
-    <server xmlns="urn:jboss:domain:1.4">
-
-        <extensions>
-            <extension module="org.keycloak.keycloak-as7-subsystem"/>
-            ...
-        </extensions>
-
-        <profile>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.0"/>
-            ...
-        </profile>
 
 
 Boot Keycloak Server

integration/keycloak-subsystem/pom.xml

@@ -24,8 +24,8 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>keycloak-wildfly-subsystem</artifactId>
-    <name>Keycloak Wildfly Subsystem</name>
+    <artifactId>keycloak-subsystem</artifactId>
+    <name>Keycloak Subsystem</name>
     <description/>
     <packaging>jar</packaging>
 

integration/keycloak-subsystem/src/main/java/org/keycloak/subsystem/extension/Environment.java

@@ -28,7 +28,7 @@ import org.jboss.modules.ModuleLoadException;
  * @author Stan Silvert ssilvert@redhat.com (C) 2014 Red Hat Inc.
  */
 public class Environment {
-    private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-wildfly-subsystem");
+    private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-subsystem");
 
     private static final boolean isWildFly = findIsWildFly();
 

integration/keycloak-subsystem/src/main/java/org/keycloak/subsystem/extension/authserver/AuthServerUtil.java

@@ -54,7 +54,7 @@ import org.jboss.modules.ModuleLoadException;
  */
 public class AuthServerUtil {
 
-    private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-wildfly-subsystem");
+    private static final ModuleIdentifier KEYCLOAK_SUBSYSTEM = ModuleIdentifier.create("org.keycloak.keycloak-subsystem");
 
     private final String deploymentName;
     private final Module subsysModule;
@@ -84,7 +84,7 @@ public class AuthServerUtil {
 
     private URI findAuthServerUri() throws IllegalStateException {
         try {
-            URL subsysJar = this.subsysModule.getExportedResource("keycloak-wildfly-subsystem-" + this.keycloakVersion + ".jar");
+            URL subsysJar = this.subsysModule.getExportedResource("keycloak-subsystem-" + this.keycloakVersion + ".jar");
             File subsysDir = new File(subsysJar.toURI()).getParentFile();
             File authServerDir = new File(subsysDir, "auth-server");
             if (this.isAuthServerExploded) {
@@ -106,7 +106,7 @@ public class AuthServerUtil {
         op.get(PERSISTENT).set(false); // prevents writing this deployment out to standalone.xml
 
         if (authServerUri == null) {
-            throw new OperationFailedException("Keycloak Auth Server WAR not found in keycloak-wildfly-subsystem module");
+            throw new OperationFailedException("Keycloak Auth Server WAR not found in keycloak-subsystem module");
         }
 
         op.get(CONTENT).add(makeContentItem());

integration/keycloak-subsystem/src/main/resources/subsystem-templates/keycloak.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--  Template used by WildFly build when directed to include Keycloak subsystem in a configuration. -->
 <config>
-   <extension-module>org.keycloak.keycloak-wildfly-subsystem</extension-module>
+   <extension-module>org.keycloak.keycloak-subsystem</extension-module>
    <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
        <?WILDFLY-WEB-CONSOLE-CONFIG?>
    </subsystem>

integration/pom.xml

@@ -23,7 +23,7 @@
         <module>jetty</module>
         <module>undertow</module>
         <module>wildfly-adapter</module>
-        <module>wildfly-subsystem</module>
+        <module>keycloak-subsystem</module>
         <module>js</module>
         <module>installed</module>
         <module>admin-client</module>