libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #1178 from stianst/master

Browse source 
More dist updates
This commit is contained in:
Stian Thorgersen 2015-04-24 09:24:10 +02:00
commit 68c3652078
21 changed files with 376 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
distribution/server-bundle-dist/assembly.xml → distribution/demo-dist/assembly.xml
View file

@ -1,11 +1,11 @@
<assembly>
<id>server-bundle-dist</id>
<id>demo-dist</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
<format>dir</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
@ -23,5 +23,12 @@
<outputDirectory></outputDirectory>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
<includes>
<include>org.keycloak:keycloak-docs-dist:zip</include>
</includes>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
</assembly>

11
distribution/server-bundle-dist/pom.xml → distribution/demo-dist/pom.xml
View file

@ -8,9 +8,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>keycloak-server-bundle-dist</artifactId>
<artifactId>keycloak-demo-dist</artifactId>
<packaging>pom</packaging>
<name>Keycloak Server Bundle Distribution</name>
<name>Keycloak Demo Distribution</name>
<description/>
<dependencies>
@ -24,10 +24,15 @@
<artifactId>keycloak-examples-dist</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-docs-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<finalName>keycloak-${project.version}</finalName>
<finalName>keycloak-demo-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>

0
distribution/server-bundle-dist/src/main/providers/README.txt → distribution/demo-dist/src/main/providers/README.txt
View file

0
distribution/server-bundle-dist/src/main/themes/README.txt → distribution/demo-dist/src/main/themes/README.txt
View file

0
distribution/server-bundle-dist/src/main/welcome-content/index.html → distribution/demo-dist/src/main/welcome-content/index.html
View file

0
distribution/server-bundle-dist/src/main/xslt/standalone.xsl → distribution/demo-dist/src/main/xslt/standalone.xsl
View file

33
distribution/docs-dist/assembly.xml Executable file
View file

@ -0,0 +1,33 @@
<assembly>
<id>docs-dist</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>../../target/site/apidocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../../services/target/apidocs</directory>
<outputDirectory>rest-api</outputDirectory>
</fileSet>
<fileSet>
<directory>../../docbook/target/docbook/publish/en-US</directory>
<outputDirectory>userguide</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
<source>src/index.html</source>
<outputDirectory></outputDirectory>
</file>
</files>
</assembly>

122
distribution/docs-dist/build.xml Executable file
View file

@ -0,0 +1,122 @@
<project name="example-dist" basedir="." default="all">
<target name="all">
<delete dir="target/examples"/>
<copy todir="target/examples/cors" overwrite="true">
<fileset dir="../../examples/cors">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/cordova" overwrite="true">
<fileset dir="../../examples/cordova">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/providers" overwrite="true">
<fileset dir="../../examples/providers">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/saml" overwrite="true">
<fileset dir="../../examples/saml">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/broker/saml-broker-authentication" overwrite="true">
<fileset dir="../../examples/broker/saml-broker-authentication">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/js-console" overwrite="true">
<fileset dir="../../examples/js-console">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/multi-tenant" overwrite="true">
<fileset dir="../../examples/multi-tenant">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/basic-auth" overwrite="true">
<fileset dir="../../examples/basic-auth">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/admin-client" overwrite="true">
<fileset dir="../../examples/admin-client">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/themes" overwrite="true">
<fileset dir="../../examples/themes">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/preconfigured-demo" overwrite="true">
<fileset dir="../../examples/demo-template">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/*.unconfigured"/>
<exclude name="**/subsystem-config.xml"/>
</fileset>
</copy>
<copy todir="target/examples/unconfigured-demo" overwrite="true">
<fileset dir="../../examples/demo-template">
<exclude name="**/*.wildfly"/>
<exclude name="**/*.as7"/>
<exclude name="**/WEB-INF/jboss-web.xml"/>
<exclude name="**/keycloak.json"/>
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
<exclude name="**/README.md"/>
</fileset>
</copy>
<copy todir="target/examples/fuse" overwrite="true">
<fileset dir="../../examples/fuse">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
</fileset>
</copy>
<copy todir="target/examples/kerberos" overwrite="true">
<fileset dir="../../examples/kerberos">
<exclude name="**/target/**"/>
<exclude name="**/*.iml"/>
</fileset>
</copy>
<copy file="../../examples/README.md" tofile="target/examples/README.md"/>
<move file="target/examples/unconfigured-demo/README.md.unconfigured" tofile="target/examples/unconfigured-demo/README.md"/>
<move file="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml"/>
<move file="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml"/>
<move file="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/database-service/src/main/webapp/WEB-INF/web.xml"/>
</target>
</project>

55
distribution/docs-dist/pom.xml Executable file
View file

@ -0,0 +1,55 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.2.0.RC1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>keycloak-docs-dist</artifactId>
<packaging>pom</packaging>
<name>Keycloak Docs Distribution</name>
<description/>
<dependencies>
</dependencies>
<build>
<finalName>keycloak-docs-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<outputDirectory>
target
</outputDirectory>
<workDirectory>
target/assembly/work
</workDirectory>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0
distribution/examples-dist/index.html → distribution/docs-dist/src/index.html
View file

1
distribution/examples-dist/assembly.xml
View file

@ -4,6 +4,7 @@
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>

12
distribution/pom.xml
View file

@ -6,6 +6,7 @@
<version>1.2.0.RC1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Distribution Parent</name>
<description/>
<modelVersion>4.0.0</modelVersion>
@ -24,14 +25,17 @@
</plugin>
</plugins>
</build>
<modules>
<module>adapters</module>
<module>subsystem-war</module>
<module>modules</module>
<module>demo-dist</module>
<module>docs-dist</module>
<module>examples-dist</module>
<module>modules</module>
<module>proxy-dist</module>
<module>src-dist</module>
<module>server-overlay</module>
<module>server-dist</module>
<module>server-overlay</module>
<module>src-dist</module>
<module>subsystem-war</module>
</modules>
</project>

11
distribution/proxy-dist/assembly.xml
View file

@ -4,8 +4,19 @@
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>../../</directory>
<includes>
<include>License.html</include>
</includes>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<unpack>false</unpack>

7
distribution/server-dist/assembly.xml
View file

@ -16,6 +16,8 @@
<exclude>**/*.sh</exclude>
<exclude>welcome-content/**</exclude>
<exclude>docs/**</exclude>
<exclude>standalone/deployments</exclude>
<exclude>standalone/deployments/*</exclude>
</excludes>
</fileSet>
<fileSet>
@ -42,6 +44,11 @@
</includes>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>standalone/configuration/standalone-keycloak.xml</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
</assembly>

26
distribution/server-dist/pom.xml
View file

@ -53,6 +53,32 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>generate-resources</id>
<phase>package</phase>
<goals>
<goal>transform</goal>
</goals>
<configuration>
<transformationSets>
<transformationSet>
<dir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</dir>
<stylesheet>src/main/xslt/standalone.xsl</stylesheet>
<includes>
<include>standalone*.xml</include>
</includes>
<outputDir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</outputDir>
</transformationSet>
</transformationSets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>

61
distribution/server-dist/src/main/xslt/standalone.xsl Executable file
View file

@ -0,0 +1,61 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
xmlns:j="urn:jboss:domain:2.2"
xmlns:ds="urn:jboss:domain:datasources:2.0"
xmlns:dep="urn:jboss:domain:deployment-scanner:2.0"
xmlns:k="urn:jboss:domain:keycloak:1.0"
version="2.0"
exclude-result-prefixes="xalan j ds dep k">
<xsl:param name="config"/>
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="//j:extensions">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-subsystem"/>
</xsl:copy>
</xsl:template>
<xsl:template match="//j:extensions/j:extension[@module='org.jboss.as.deployment-scanner']">
</xsl:template>
<xsl:template match="//j:profile/dep:subsystem">
</xsl:template>
<xsl:template match="//ds:datasources">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='datasource']"/>
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
<password>sa</password>
</security>
</datasource>
<xsl:apply-templates select="node()[name(.)='drivers']"/>
</xsl:copy>
</xsl:template>
<xsl:template match="//j:profile">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<subsystem xmlns="urn:jboss:domain:keycloak:1.0">
<auth-server name="main-auth-server">
<enabled>true</enabled>
<web-context>auth</web-context>
</auth-server>
</subsystem>
</xsl:copy>
</xsl:template>
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>

28
distribution/server-overlay/assembly.xml
View file

@ -8,17 +8,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**/standalone*.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/modules</directory>
<outputDirectory>modules/system/layers/base</outputDirectory>
@ -37,21 +26,14 @@
</includes>
<outputDirectory></outputDirectory>
</fileSet>
<fileSet>
<directory>../../target/site/apidocs</directory>
<outputDirectory>docs/javadocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../../services/target/apidocs</directory>
<outputDirectory>docs/rest-api</outputDirectory>
</fileSet>
<fileSet>
<directory>../../docbook/target/docbook/publish/en-US</directory>
<outputDirectory>docs/userguide</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
<source>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration/standalone.xml</source>
<outputDirectory>standalone/configuration</outputDirectory>
<destName>standalone-keycloak.xml</destName>
</file>
<file>
<source>../subsystem-war/src/main/resources/META-INF/keycloak-server.json</source>
<outputDirectory>standalone/configuration</outputDirectory>

4
distribution/server-overlay/pom.xml
View file

@ -48,7 +48,7 @@
<outputDirectory>${project.build.directory}/unpacked</outputDirectory>
</artifactItem>
</artifactItems>
<includes>**/standalone*.xml</includes>
<includes>*/standalone/configuration/standalone.xml</includes>
</configuration>
</execution>
<execution>
@ -87,7 +87,7 @@
<dir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</dir>
<stylesheet>src/main/xslt/standalone.xsl</stylesheet>
<includes>
<include>standalone*.xml</include>
<include>standalone.xml</include>
</includes>
<outputDir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</outputDir>
</transformationSet>

37
distribution/server-overlay/src/main/xslt/standalone.xsl
View file

@ -1,22 +1,26 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
xmlns:j="urn:jboss:domain:1.3"
xmlns:j="urn:jboss:domain:2.2"
xmlns:ds="urn:jboss:domain:datasources:2.0"
xmlns:dep="urn:jboss:domain:deployment-scanner:2.0"
xmlns:k="urn:jboss:domain:keycloak:1.0"
xmlns:sec="urn:jboss:domain:security:1.2"
version="2.0"
exclude-result-prefixes="xalan j">
exclude-result-prefixes="xalan j ds dep k sec">
<xsl:param name="config"/>
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="node()[name(.)='extensions']">
<xsl:template match="//j:extensions">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-subsystem"/>
</xsl:copy>
</xsl:template>
<xsl:template match="node()[name(.)='datasources']">
<xsl:template match="//ds:datasources">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='datasource']"/>
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
@ -31,7 +35,7 @@
</xsl:copy>
</xsl:template>
<xsl:template match="node()[name(.)='profile']">
<xsl:template match="//j:profile">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<subsystem xmlns="urn:jboss:domain:keycloak:1.0">
@ -43,7 +47,7 @@
</xsl:copy>
</xsl:template>
<xsl:template match="node()[name(.)='security-domains']">
<xsl:template match="//sec:security-domains">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='security-domain']"/>
<security-domain name="keycloak">
@ -59,27 +63,6 @@
</xsl:copy>
</xsl:template>
<!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
longer works -->
<xsl:template match="node()[name(.)='management-interfaces']">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<native-interface security-realm="ManagementRealm">
<socket-binding native="management-native"/>
</native-interface>
</xsl:copy>
</xsl:template>
<!-- for some reason, Wildfly 8 final decided to turn off management-native which means jboss-as-maven-plugin no
longer works -->
<xsl:template match="node()[name(.)='socket-binding-group']">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<socket-binding name="management-native" interface="management" port="9999"/>
</xsl:copy>
</xsl:template>
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />

3
distribution/subsystem-war/pom.xml
View file

@ -15,9 +15,6 @@
<name>Keycloak Subsystem Server WAR</name>
<description/>
<dependencies>
</dependencies>
<build>
<finalName>auth-server</finalName>
<plugins>

18
pom.xml
View file

@ -920,6 +920,24 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-docs-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-examples-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak.subsystem</groupId>
<artifactId>keycloak-server</artifactId>