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

Fixed server-dist

Browse source
This commit is contained in:
Stian Thorgersen 2015-05-18 11:40:13 +02:00
parent d9297cee16
commit 362babe5e2
12 changed files with 36 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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>

0
distribution/server-overlay/src/main/providers/README.txt → distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/providers/README.txt
View file

0
distribution/server-overlay/src/main/themes/README.txt → distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/themes/README.txt
View file

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>

7
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>

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

@ -16,7 +16,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-jboss-modules</artifactId> <artifactId>keycloak-server-feature-pack</artifactId>
<type>zip</type> <type>zip</type>
</dependency> </dependency>
<dependency> <dependency>
@ -61,9 +61,9 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-jboss-modules</artifactId> <artifactId>keycloak-server-feature-pack</artifactId>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/unpacked/modules</outputDirectory> <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>

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>