libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #1266 from stianst/master

Browse source 
Dist fixes
This commit is contained in:
Stian Thorgersen 2015-05-19 08:30:44 +02:00
commit d8226c457f
19 changed files with 290 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
distribution/demo-dist/assembly.xml
View file

@ -14,7 +14,6 @@
<outputDirectory>keycloak</outputDirectory> <outputDirectory>keycloak</outputDirectory>
<excludes> <excludes>
<exclude>**/*.sh</exclude> <exclude>**/*.sh</exclude>
<exclude>standalone/configuration/standalone.xml</exclude>
<exclude>standalone/configuration/standalone-keycloak.xml</exclude> <exclude>standalone/configuration/standalone-keycloak.xml</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
@ -36,11 +35,4 @@
</fileSet> </fileSet>
</fileSets> </fileSets>
<files>
<file>
<source>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration/standalone-keycloak.xml</source>
<outputDirectory>keycloak/standalone/configuration</outputDirectory>
<destName>standalone.xml</destName>
</file>
</files>
</assembly> </assembly>

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

@ -115,6 +115,32 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>

72
distribution/demo-dist/src/main/keycloak-server.json Normal file
View file

@ -0,0 +1,72 @@
{
"admin": {
"realm": "master"
},
"eventsStore": {
"provider": "jpa",
"jpa": {
"exclude-events": [ "REFRESH_TOKEN" ]
}
},
"realm": {
"provider": "jpa"
},
"user": {
"provider": "jpa"
},
"userSessions": {
"provider" : "mem"
},
"realmCache": {
"provider": "mem"
},
"userCache": {
"provider": "mem",
"mem": {
"maxSize": 20000
}
},
"timer": {
"provider": "basic"
},
"theme": {
"default": "keycloak",
"staticMaxAge": 2592000,
"cacheTemplates": true,
"cacheThemes": true,
"folder": {
"dir": "${jboss.server.config.dir}/themes"
}
},
"login": {
"provider": "freemarker"
},
"account": {
"provider": "freemarker"
},
"email": {
"provider": "freemarker"
},
"scheduled": {
"interval": 900
},
"connectionsJpa": {
"default": {
"dataSource": "java:jboss/datasources/KeycloakDS",
"databaseSchema": "update"
}
}
}

2
distribution/demo-dist/src/main/providers/README.txt Normal file
View file

@ -0,0 +1,2 @@
Any provider implementation jars and libraries in this folder will be loaded by Keycloak. See the providers
section in the documentation for more details.

3
distribution/demo-dist/src/main/themes/README.txt Normal file
View file

@ -0,0 +1,3 @@
Themes to configure the look and feel of login pages and account management console. It's not recommended to
modify existing the built-in themes, instead you should create a new theme that extends a built-in theme. See the theme
section in the documentation for more details.

72
distribution/demo-dist/src/main/xslt/standalone.xsl Executable file
View file

@ -0,0 +1,72 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
xmlns:j="urn:jboss:domain:3.0"
xmlns:ds="urn:jboss:domain:datasources:3.0"
xmlns:k="urn:jboss:domain:keycloak:1.1"
xmlns:sec="urn:jboss:domain:security:1.2"
version="2.0"
exclude-result-prefixes="xalan j ds 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="//j:extensions">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-server-subsystem"/>
<extension module="org.keycloak.keycloak-adapter-subsystem"/>
</xsl:copy>
</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-server:1.1">
<auth-server name="main-auth-server">
<enabled>true</enabled>
<web-context>auth</web-context>
</auth-server>
</subsystem>
</xsl:copy>
</xsl:template>
<xsl:template match="//sec:security-domains">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='security-domain']"/>
<security-domain name="keycloak">
<authentication>
<login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required"/>
</authentication>
</security-domain>
<security-domain name="sp" cache-type="default">
<authentication>
<login-module code="org.picketlink.identity.federation.bindings.wildfly.SAML2LoginModule" flag="required"/>
</authentication>
</security-domain>
</xsl:copy>
</xsl:template>
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>

2
distribution/feature-packs/pom.xml
View file

@ -14,7 +14,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>adapter-feature-pack</module> <!--<module>adapter-feature-pack</module>-->
<module>server-feature-pack</module> <module>server-feature-pack</module>
</modules> </modules>
</project> </project>

14
distribution/feature-packs/server-feature-pack/assembly.xml
View file

@ -49,5 +49,19 @@
<exclude>**/module.xml</exclude> <exclude>**/module.xml</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>../../../</directory>
<includes>
<include>License.html</include>
</includes>
<outputDirectory>content</outputDirectory>
</fileSet>
<fileSet>
<directory>../../../forms/common-themes/src/main/resources/theme</directory>
<outputDirectory>content/standalone/configuration/themes</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

18
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
View file

@ -3,33 +3,21 @@
<config> <config>
<subsystems> <subsystems>
<subsystem>logging.xml</subsystem> <subsystem>logging.xml</subsystem>
<subsystem>batch.xml</subsystem> <!-- resteasy complains if bean-validation is missing -->
<subsystem>bean-validation.xml</subsystem> <subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem> <subsystem>keycloak-datasources.xml</subsystem>
<subsystem>deployment-scanner.xml</subsystem> <subsystem supplement="web-build">ee.xml</subsystem>
<subsystem>ee.xml</subsystem>
<subsystem>ejb3.xml</subsystem>
<subsystem>io.xml</subsystem> <subsystem>io.xml</subsystem>
<subsystem>infinispan.xml</subsystem> <subsystem>infinispan.xml</subsystem>
<subsystem>jaxrs.xml</subsystem> <subsystem>jaxrs.xml</subsystem>
<subsystem>jca.xml</subsystem> <subsystem>jca.xml</subsystem>
<subsystem>jdr.xml</subsystem>
<subsystem>jmx.xml</subsystem>
<subsystem>jpa.xml</subsystem> <subsystem>jpa.xml</subsystem>
<subsystem>jsf.xml</subsystem> <subsystem supplement="web-build">naming.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>naming.xml</subsystem>
<subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
<subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem> <subsystem>request-controller.xml</subsystem>
<subsystem>sar.xml</subsystem>
<subsystem>security-manager.xml</subsystem> <subsystem>security-manager.xml</subsystem>
<subsystem>security.xml</subsystem> <subsystem>security.xml</subsystem>
<subsystem>transactions.xml</subsystem> <subsystem>transactions.xml</subsystem>
<subsystem>undertow.xml</subsystem> <subsystem>undertow.xml</subsystem>
<subsystem>webservices.xml</subsystem>
<subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem> <subsystem>keycloak-server.xml</subsystem>
</subsystems> </subsystems>
</config> </config>

2
distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/providers/README.txt Normal file
View file

@ -0,0 +1,2 @@
Any provider implementation jars and libraries in this folder will be loaded by Keycloak. See the providers
section in the documentation for more details.

3
distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/themes/README.txt Normal file
View file

@ -0,0 +1,3 @@
Themes to configure the look and feel of login pages and account management console. It's not recommended to
modify existing the built-in themes, instead you should create a new theme that extends a built-in theme. See the theme
section in the documentation for more details.

4
distribution/pom.xml
View file

@ -28,13 +28,13 @@
<modules> <modules>
<module>adapters</module> <module>adapters</module>
<module>demo-dist</module> <!--<module>demo-dist</module>-->
<module>docs-dist</module> <module>docs-dist</module>
<module>examples-dist</module> <module>examples-dist</module>
<module>modules</module> <module>modules</module>
<module>proxy-dist</module> <module>proxy-dist</module>
<module>server-dist</module> <module>server-dist</module>
<module>server-overlay</module> <!--<module>server-overlay</module>-->
<module>src-dist</module> <module>src-dist</module>
<module>subsystem-war</module> <module>subsystem-war</module>
<module>feature-packs</module> <module>feature-packs</module>

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

@ -8,7 +8,6 @@
<includeBaseDirectory>true</includeBaseDirectory> <includeBaseDirectory>true</includeBaseDirectory>
<!-- If war is filtered it will get corrupted. Only need to filter module.xml -->
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/${project.build.finalName}</directory> <directory>target/${project.build.finalName}</directory>
@ -38,30 +37,5 @@
<include>*.*</include> <include>*.*</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>../../forms/common-themes/src/main/resources/theme</directory>
<outputDirectory>standalone/configuration/themes</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>../../</directory>
<includes>
<include>License.html</include>
</includes>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets> </fileSets>
<files>
<file>
<source>../server-overlay/src/main/themes/README.txt</source>
<outputDirectory>standalone/configuration/themes</outputDirectory>
</file>
<file>
<source>../server-overlay/src/main/providers/README.txt</source>
<outputDirectory>standalone/configuration/providers</outputDirectory>
</file>
</files>
</assembly> </assembly>

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

@ -16,12 +16,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-server-overlay</artifactId> <artifactId>keycloak-server-feature-pack</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
</dependencies> </dependencies>

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

@ -5,12 +5,17 @@
<format>zip</format> <format>zip</format>
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked/modules</directory> <directory>${project.build.directory}/unpacked/modules</directory>
<outputDirectory>modules/system/layers/base</outputDirectory> <outputDirectory>modules</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/content</directory>
<outputDirectory></outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../forms/common-themes/src/main/resources/theme</directory> <directory>../../forms/common-themes/src/main/resources/theme</directory>
@ -35,7 +40,7 @@
<destName>standalone-keycloak.xml</destName> <destName>standalone-keycloak.xml</destName>
</file> </file>
<file> <file>
<source>../subsystem-war/src/main/resources/META-INF/keycloak-server.json</source> <source>src/main/keycloak-server.json</source>
<outputDirectory>standalone/configuration</outputDirectory> <outputDirectory>standalone/configuration</outputDirectory>
</file> </file>
<file> <file>

72
distribution/server-overlay/src/main/keycloak-server.json Normal file
View file

@ -0,0 +1,72 @@
{
"admin": {
"realm": "master"
},
"eventsStore": {
"provider": "jpa",
"jpa": {
"exclude-events": [ "REFRESH_TOKEN" ]
}
},
"realm": {
"provider": "jpa"
},
"user": {
"provider": "jpa"
},
"userSessions": {
"provider" : "mem"
},
"realmCache": {
"provider": "mem"
},
"userCache": {
"provider": "mem",
"mem": {
"maxSize": 20000
}
},
"timer": {
"provider": "basic"
},
"theme": {
"default": "keycloak",
"staticMaxAge": 2592000,
"cacheTemplates": true,
"cacheThemes": true,
"folder": {
"dir": "${jboss.server.config.dir}/themes"
}
},
"login": {
"provider": "freemarker"
},
"account": {
"provider": "freemarker"
},
"email": {
"provider": "freemarker"
},
"scheduled": {
"interval": 900
},
"connectionsJpa": {
"default": {
"dataSource": "java:jboss/datasources/KeycloakDS",
"databaseSchema": "update"
}
}
}

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

@ -1,12 +1,10 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan" xmlns:xalan="http://xml.apache.org/xalan"
xmlns:j="urn:jboss:domain:2.2" xmlns:j="urn:jboss:domain:3.0"
xmlns:ds="urn:jboss:domain:datasources:2.0" xmlns:ds="urn:jboss:domain:datasources:3.0"
xmlns:dep="urn:jboss:domain:deployment-scanner:2.0" xmlns:k="urn:jboss:domain:keycloak:1.1"
xmlns:k="urn:jboss:domain:keycloak:1.0"
xmlns:sec="urn:jboss:domain:security:1.2"
version="2.0" version="2.0"
exclude-result-prefixes="xalan j ds dep k sec"> exclude-result-prefixes="xalan j ds k">
<xsl:param name="config"/> <xsl:param name="config"/>
@ -17,7 +15,6 @@
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="node()|@*"/> <xsl:apply-templates select="node()|@*"/>
<extension module="org.keycloak.keycloak-server-subsystem"/> <extension module="org.keycloak.keycloak-server-subsystem"/>
<extension module="org.keycloak.keycloak-adapter-subsystem"/>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
@ -48,22 +45,6 @@
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
<xsl:template match="//sec:security-domains">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='security-domain']"/>
<security-domain name="keycloak">
<authentication>
<login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required"/>
</authentication>
</security-domain>
<security-domain name="sp" cache-type="default">
<authentication>
<login-module code="org.picketlink.identity.federation.bindings.wildfly.SAML2LoginModule" flag="required"/>
</authentication>
</security-domain>
</xsl:copy>
</xsl:template>
<xsl:template match="@*|node()"> <xsl:template match="@*|node()">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="@*|node()" /> <xsl:apply-templates select="@*|node()" />

8
integration/wildfly/wildfly-server-subsystem/src/main/resources/subsystem-templates/keycloak-datasources.xml
View file

@ -4,14 +4,6 @@
<extension-module>org.jboss.as.connector</extension-module> <extension-module>org.jboss.as.connector</extension-module>
<subsystem xmlns="urn:jboss:domain:datasources:3.0"> <subsystem xmlns="urn:jboss:domain:datasources:3.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
<password>sa</password>
</security>
</datasource>
<datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true"> <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> <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
<driver>h2</driver> <driver>h2</driver>

6
pom.xml
View file

@ -1128,6 +1128,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-feature-pack</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-testsuite-integration</artifactId> <artifactId>keycloak-testsuite-integration</artifactId>