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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2014-12-02 14:38:57 -05:00
commit 090162ce8a
5 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/as7-adapter-zip/assembly.xml
View file

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

1
distribution/eap6-adapter-zip/assembly.xml
View file

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

1
distribution/wildfly-adapter-zip/assembly.xml
View file

@ -11,7 +11,6 @@
<directory>${project.build.directory}/unpacked</directory> <directory>${project.build.directory}/unpacked</directory>
<excludes> <excludes>
<exclude>org/keycloak/keycloak-as7-adapter/**</exclude> <exclude>org/keycloak/keycloak-as7-adapter/**</exclude>
<exclude>org/keycloak/keycloak-as7-subsystem/**</exclude>
<exclude>org/bouncycastle/**</exclude> <exclude>org/bouncycastle/**</exclude>
<exclude>org/picketlink/**</exclude> <exclude>org/picketlink/**</exclude>
</excludes> </excludes>

2
testsuite/docker-cluster/pom.xml
View file

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>keycloak-testsuite-pom</artifactId> <artifactId>keycloak-testsuite-pom</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>1.1.0-Alpha1-SNAPSHOT</version> <version>1.1.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

8
testsuite/docker-cluster/shared-files/keycloak-base-prepare.sh
View file

@ -6,13 +6,7 @@ mkdir -p mysql/main && mv /mysql-connector-java-5.1.32.jar mysql/main/
cp /keycloak-docker-cluster/shared-files/mysql-module.xml mysql/main/module.xml cp /keycloak-docker-cluster/shared-files/mysql-module.xml mysql/main/module.xml
mv mysql $JBOSS_MODULES_HOME/com/ mv mysql $JBOSS_MODULES_HOME/com/
if [ $JBOSS_TYPE == "eap63" ]; then sed -i -e "s/<extensions>/&\n <extension module=\"org.keycloak.keycloak-subsystem\"\/>/" $JBOSS_HOME/standalone/configuration/standalone-ha.xml
EXT="as7";
else
EXT=$JBOSS_TYPE;
fi;
sed -i -e "s/<extensions>/&\n <extension module=\"org.keycloak.keycloak-$EXT-subsystem\"\/>/" $JBOSS_HOME/standalone/configuration/standalone-ha.xml
sed -i -e 's/<profile>/&\n <subsystem xmlns="urn:jboss:domain:keycloak:1.0"\/>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \ sed -i -e 's/<profile>/&\n <subsystem xmlns="urn:jboss:domain:keycloak:1.0"\/>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \
sed -i -e 's/<security-domains>/&\n <security-domain name="keycloak">\n <authentication>\n <login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required"\/>\n <\/authentication>\n <\/security-domain>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \ sed -i -e 's/<security-domains>/&\n <security-domain name="keycloak">\n <authentication>\n <login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required"\/>\n <\/authentication>\n <\/security-domain>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \
sed -i -e 's/<drivers>/&\n <driver name="mysql" module="com.mysql">\n <xa-datasource-class>com.mysql.jdbc.Driver<\/xa-datasource-class>\n <driver-class>com.mysql.jdbc.Driver<\/driver-class>\n <\/driver>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \ sed -i -e 's/<drivers>/&\n <driver name="mysql" module="com.mysql">\n <xa-datasource-class>com.mysql.jdbc.Driver<\/xa-datasource-class>\n <driver-class>com.mysql.jdbc.Driver<\/driver-class>\n <\/driver>/' $JBOSS_HOME/standalone/configuration/standalone-ha.xml && \