Merge pull request #1891 from mstruk/wildfly-modules-rename

KEYCLOAK-2099 WildFly 10 adapter subsystem
This commit is contained in:
Stian Thorgersen 2015-11-30 09:48:15 +01:00
commit 2c5510284d
62 changed files with 45 additions and 45 deletions

View file

@ -25,6 +25,6 @@
<module>tomcat7-adapter-zip</module> <module>tomcat7-adapter-zip</module>
<module>tomcat8-adapter-zip</module> <module>tomcat8-adapter-zip</module>
<module>wf8-adapter</module> <module>wf8-adapter</module>
<module>wf9-adapter</module> <module>wildfly-adapter</module>
</modules> </modules>
</project> </project>

View file

@ -6,15 +6,15 @@
<version>1.7.0.Final-SNAPSHOT</version> <version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath> <relativePath>../../../pom.xml</relativePath>
</parent> </parent>
<name>Keycloak Wildfly 9 Adapter</name> <name>Keycloak Wildfly Adapter</name>
<description/> <description/>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-wf9-adapter-dist-pom</artifactId> <artifactId>keycloak-wildfly-adapter-dist-pom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>wf9-modules</module> <module>wildfly-modules</module>
<module>wf9-adapter-zip</module> <module>wildfly-adapter-zip</module>
</modules> </modules>
</project> </project>

View file

@ -18,7 +18,7 @@
<include>org/keycloak/keycloak-jboss-adapter-core/**</include> <include>org/keycloak/keycloak-jboss-adapter-core/**</include>
<include>org/keycloak/keycloak-undertow-adapter/**</include> <include>org/keycloak/keycloak-undertow-adapter/**</include>
<include>org/keycloak/keycloak-wildfly-adapter/**</include> <include>org/keycloak/keycloak-wildfly-adapter/**</include>
<include>org/keycloak/keycloak-wf9-subsystem/**</include> <include>org/keycloak/keycloak-wildfly-subsystem/**</include>
<include>org/keycloak/keycloak-adapter-subsystem/**</include> <include>org/keycloak/keycloak-adapter-subsystem/**</include>
<include>org/keycloak/keycloak-servlet-oauth-client/**</include> <include>org/keycloak/keycloak-servlet-oauth-client/**</include>
</includes> </includes>

View file

@ -8,15 +8,15 @@
<relativePath>../../../../pom.xml</relativePath> <relativePath>../../../../pom.xml</relativePath>
</parent> </parent>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Keycloak Wildfly 9 Adapter Distro</name> <name>Keycloak Wildfly Adapter Distro</name>
<description/> <description/>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-modules</artifactId> <artifactId>keycloak-wildfly-modules</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
</dependencies> </dependencies>
@ -37,7 +37,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-modules</artifactId> <artifactId>keycloak-wildfly-modules</artifactId>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/unpacked</outputDirectory> <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
</artifactItem> </artifactItem>

View file

@ -70,8 +70,8 @@
<maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/> <maven-resource group="org.keycloak" artifact="keycloak-wildfly-adapter"/>
</module-def> </module-def>
<module-def name="org.keycloak.keycloak-wf9-subsystem"> <module-def name="org.keycloak.keycloak-wildfly-subsystem">
<maven-resource group="org.keycloak" artifact="keycloak-wf9-subsystem"/> <maven-resource group="org.keycloak" artifact="keycloak-wildfly-subsystem"/>
</module-def> </module-def>
<module-def name="org.keycloak.keycloak-servlet-oauth-client"> <module-def name="org.keycloak.keycloak-servlet-oauth-client">

View file

@ -12,9 +12,9 @@
<relativePath>../../../../pom.xml</relativePath> <relativePath>../../../../pom.xml</relativePath>
</parent> </parent>
<artifactId>keycloak-wf9-modules</artifactId> <artifactId>keycloak-wildfly-modules</artifactId>
<name>Keycloak Wildfly 9 Modules</name> <name>Keycloak Wildfly Modules</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
@ -51,7 +51,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-subsystem</artifactId> <artifactId>keycloak-wildfly-subsystem</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

View file

@ -30,6 +30,6 @@
</resources> </resources>
<dependencies> <dependencies>
<module name="org.keycloak.keycloak-wf9-subsystem" export="true" services="export"/> <module name="org.keycloak.keycloak-wildfly-subsystem" export="true" services="export"/>
</dependencies> </dependencies>
</module> </module>

View file

@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-wf9-subsystem"> <module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-wildfly-subsystem">
<resources> <resources>
<resource-root path="."/> <resource-root path="."/>

View file

@ -33,7 +33,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked/keycloak-wf9-adapter-${project.version}</directory> <directory>${project.build.directory}/unpacked/keycloak-wildfly-adapter-${project.version}</directory>
<outputDirectory>keycloak</outputDirectory> <outputDirectory>keycloak</outputDirectory>
<excludes> <excludes>
<exclude>standalone/configuration/standalone-keycloak.xml</exclude> <exclude>standalone/configuration/standalone-keycloak.xml</exclude>

View file

@ -21,7 +21,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency> <dependency>
@ -99,9 +99,9 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/unpacked/keycloak-wf9-adapter-${project.version}</outputDirectory> <outputDirectory>${project.build.directory}/unpacked/keycloak-wildfly-adapter-${project.version}</outputDirectory>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>

View file

@ -239,12 +239,12 @@
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>tar.gz</type> <type>tar.gz</type>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>

View file

@ -34,7 +34,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-subsystem</artifactId> <artifactId>keycloak-wildfly-subsystem</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

View file

@ -28,6 +28,6 @@
</resources> </resources>
<dependencies> <dependencies>
<module name="org.keycloak.keycloak-wf9-subsystem" export="true" services="export"/> <module name="org.keycloak.keycloak-wildfly-subsystem" export="true" services="export"/>
</dependencies> </dependencies>
</module> </module>

View file

@ -22,10 +22,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
--> -->
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-wf9-subsystem"> <module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-wildfly-subsystem">
<resources> <resources>
<artifact name="${org.keycloak:keycloak-wf9-subsystem}"/> <artifact name="${org.keycloak:keycloak-wildfly-subsystem}"/>
</resources> </resources>
<dependencies> <dependencies>

View file

@ -14,10 +14,10 @@
the Keycloak download site. They are also available as a maven artifact. the Keycloak download site. They are also available as a maven artifact.
</para> </para>
<para> <para>
Install on Wildfly 9: Install on Wildfly 9 or 10:
<programlisting> <programlisting>
$ cd $WILDFLY_HOME $ cd $WILDFLY_HOME
$ unzip keycloak-wf9-adapter-dist.zip $ unzip keycloak-wildfly-adapter-dist.zip
</programlisting> </programlisting>
</para> </para>
<para> <para>

View file

@ -16,6 +16,6 @@
<modules> <modules>
<module>wildfly-adapter</module> <module>wildfly-adapter</module>
<module>wf8-subsystem</module> <module>wf8-subsystem</module>
<module>wf9-subsystem</module> <module>wildfly-subsystem</module>
</modules> </modules>
</project> </project>

View file

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

View file

@ -838,7 +838,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-subsystem</artifactId> <artifactId>keycloak-wildfly-subsystem</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -1137,7 +1137,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-modules</artifactId> <artifactId>keycloak-wildfly-modules</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
@ -1149,7 +1149,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
</dependency> </dependency>

View file

@ -21,7 +21,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency> <dependency>
@ -69,7 +69,7 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/wildfly-adapter</outputDirectory> <outputDirectory>${project.build.directory}/wildfly-adapter</outputDirectory>

View file

@ -167,7 +167,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
</dependencies> </dependencies>
@ -187,7 +187,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${keycloak.server.home}</outputDirectory> <outputDirectory>${keycloak.server.home}</outputDirectory>

View file

@ -13,7 +13,7 @@
<properties> <properties>
<adapter.libs.wildfly>${containers.home}/keycloak-wf9-adapter-dist</adapter.libs.wildfly> <adapter.libs.wildfly>${containers.home}/keycloak-wildfly-adapter-dist</adapter.libs.wildfly>
<!--this is needed for adapter tests that load system properties in adapter config--> <!--this is needed for adapter tests that load system properties in adapter config-->
<app.server.http.port>${auth.server.http.port}</app.server.http.port> <app.server.http.port>${auth.server.http.port}</app.server.http.port>
@ -27,7 +27,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
</dependencies> </dependencies>
@ -56,7 +56,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${adapter.libs.wildfly}</outputDirectory> <outputDirectory>${adapter.libs.wildfly}</outputDirectory>

View file

@ -13,7 +13,7 @@
<properties> <properties>
<app.server.wildfly.home>${containers.home}/wildfly-${wildfly.version}</app.server.wildfly.home> <app.server.wildfly.home>${containers.home}/wildfly-${wildfly.version}</app.server.wildfly.home>
<adapter.libs.wildfly>${containers.home}/keycloak-wf9-adapter-dist</adapter.libs.wildfly> <adapter.libs.wildfly>${containers.home}/keycloak-wildfly-adapter-dist</adapter.libs.wildfly>
</properties> </properties>
<dependencies> <dependencies>
@ -28,7 +28,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
</dependencies> </dependencies>
@ -63,7 +63,7 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wf9-adapter-dist</artifactId> <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${adapter.libs.wildfly}</outputDirectory> <outputDirectory>${adapter.libs.wildfly}</outputDirectory>