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

Merge pull request #4464 from patriot1burke/master

Browse source 
KEYCLOAK-5439
This commit is contained in:
Bill Burke 2017-09-11 18:46:14 -04:00 committed by GitHub
commit 2637a9ccd4
6 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,10 +27,8 @@
<subsystem>keycloak-infinispan.xml</subsystem>
<subsystem>jaxrs.xml</subsystem>
<subsystem>jca.xml</subsystem>
<subsystem>jdr.xml</subsystem>
<subsystem supplement="domain">jmx.xml</subsystem>
<subsystem>jpa.xml</subsystem>
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>naming.xml</subsystem>
<subsystem>remoting.xml</subsystem>
@ -54,11 +52,9 @@
<subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
<subsystem>jaxrs.xml</subsystem>
<subsystem>jca.xml</subsystem>
<subsystem>jdr.xml</subsystem>
<subsystem>jgroups.xml</subsystem>
<subsystem supplement="domain">jmx.xml</subsystem>
<subsystem>jpa.xml</subsystem>
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>mod_cluster.xml</subsystem>
<subsystem>naming.xml</subsystem>

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

@ -29,11 +29,9 @@
<subsystem supplement="ha">keycloak-infinispan.xml</subsystem>
<subsystem>jaxrs.xml</subsystem>
<subsystem>jca.xml</subsystem>
<subsystem>jdr.xml</subsystem>
<subsystem supplement="default">jgroups.xml</subsystem>
<subsystem>jmx.xml</subsystem>
<subsystem>jpa.xml</subsystem>
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem supplement="default">mod_cluster.xml</subsystem>
<subsystem>naming.xml</subsystem>

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

@ -29,10 +29,8 @@
<subsystem>keycloak-infinispan.xml</subsystem>
<subsystem>jaxrs.xml</subsystem>
<subsystem>jca.xml</subsystem>
<subsystem>jdr.xml</subsystem>
<subsystem>jmx.xml</subsystem>
<subsystem>jpa.xml</subsystem>
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>naming.xml</subsystem>
<subsystem>remoting.xml</subsystem>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
View file

@ -49,7 +49,6 @@
<module name="javax.mail.api"/>
<module name="javax.xml.soap.api"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/>
<module name="org.jboss.resteasy.resteasy-crypto"/>
<module name="org.jboss.resteasy.resteasy-multipart-provider"/>
<module name="org.jboss.dmr"/>
<module name="javax.servlet.api"/>

2
distribution/pom.xml
View file

@ -34,9 +34,9 @@
<modules>
<module>adapters</module>
<module>saml-adapters</module>
<module>feature-packs</module>
<module>server-dist</module>
<module>server-overlay</module>
<module>feature-packs</module>
</modules>
<profiles>

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

@ -33,6 +33,19 @@
<includes>
<include>**/module.xml</include>
</includes>
<!-- unused resteasy providers eat up memory, can't remove them as it my effect RH-SSO patching
<excludes>
<exclude>**/jose-jwt/**</exclude>
<exclude>**/resteasy-atom-provider/**</exclude>
<exclude>**/resteasy-crypto/**</exclude>
<exclude>**/resteasy-jettison-provider/**</exclude>
<exclude>**/resteasy-json-p-provider/**</exclude>
<exclude>**/resteasy-jsapi/**</exclude>
<exclude>**/resteasy-spring/**</exclude>
<exclude>**/resteasy-yaml-provider/**</exclude>
<exclude>**/jettison/**</exclude>
</excludes>
-->
</fileSet>
<fileSet>
<directory>target/${project.build.finalName}</directory>
@ -40,6 +53,10 @@
<filtered>false</filtered>
<excludes>
<exclude>bin/*.sh</exclude>
<!-- jboss-client.jar unused Unfortunately, this may screw up our patch process so it can't be removed.
<exclude>bin/client/README-EJB-JMS.txt</exclude>
<exclude>bin/client/jboss-client.jar</exclude>
-->
<exclude>module.xml</exclude>
<exclude>welcome-content/**</exclude>
<exclude>appclient/**</exclude>
@ -49,8 +66,20 @@
<exclude>themes/**</exclude>
<exclude>version.txt</exclude>
<exclude>${profileExcludes}</exclude>
<!-- unused resteasy providers eat up memory can't remove them as it my effect RH-SSO patching
<exclude>**/jose-jwt/**</exclude>
<exclude>**/resteasy-atom-provider/**</exclude>
<exclude>**/resteasy-crypto/**</exclude>
<exclude>**/resteasy-jettison-provider/**</exclude>
<exclude>**/resteasy-json-p-provider/**</exclude>
<exclude>**/resteasy-jsapi/**</exclude>
<exclude>**/resteasy-spring/**</exclude>
<exclude>**/resteasy-yaml-provider/**</exclude>
<exclude>**/jettison/**</exclude>
-->
</excludes>
</fileSet>
<fileSet>
<directory>target/${project.build.finalName}</directory>
<outputDirectory/>