External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

KEYCLOAK-3258 Add server dist changes to product profile

Browse Source
This commit is contained in:
Stian Thorgersen 2017-03-24 16:16:09 +01:00
parent ed67dcc712
commit 9303a9c7d0
19 changed files with 207 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
distribution/feature-packs/server-feature-pack/assembly.xml
View File

@ -23,7 +23,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<!-- If war is filtered it will get corrupted. Only need to filter module.xml -->
<fileSets>
<fileSet>
@ -31,8 +31,12 @@
<outputDirectory/>
<filtered>true</filtered>
<includes>
<include>**/module.xml</include>
<include>**/MANIFEST.MF</include>
<include>**/module.xml</include>
<include>**/MANIFEST.MF</include>
<include>**/template.xml</include>
<include>**/host.xml</include>
<include>**/host-master.xml</include>
<include>**/host-slave.xml</include>
</includes>
</fileSet>
<fileSet>
@ -42,6 +46,10 @@
<excludes>
<exclude>**/module.xml</exclude>
<exclude>**/MANIFEST.MF</exclude>
<exclude>**/template.xml</exclude>
<exclude>**/host.xml</exclude>
<exclude>**/host-master.xml</exclude>
<exclude>**/host-slave.xml</exclude>
</excludes>
</fileSet>
<fileSet>
@ -58,5 +66,21 @@
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/resources/identity</directory>
<outputDirectory>content/bin</outputDirectory>
<includes>
<include>**/product.conf</include>
</includes>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/main/resources/identity/module</directory>
<outputDirectory>modules/system/layers/keycloak/org/jboss/as/product/${product.slot}</outputDirectory>
<includes>
<include>**/*</include>
</includes>
<filtered>true</filtered>
</fileSet>
</fileSets>
</assembly>

2
distribution/feature-packs/server-feature-pack/feature-pack-build.xml
View File

@ -17,7 +17,7 @@
<build xmlns="urn:wildfly:feature-pack-build:1.1">
<dependencies>
<artifact name="org.wildfly:wildfly-feature-pack" />
<artifact name="${feature.parent}" />
</dependencies>
<config>
<standalone template="configuration/standalone/template.xml" subsystems="configuration/standalone/subsystems.xml" output-file="standalone/configuration/standalone.xml" />

64
distribution/feature-packs/server-feature-pack/pom.xml
View File

@ -47,27 +47,10 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-server-subsystem</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<type>zip</type>
<!-- Need to exlcude that in order to use the right guava version for drools -->
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions></executions>
</plugin>
<plugin>
<groupId>org.wildfly.build</groupId>
<artifactId>wildfly-feature-pack-build-maven-plugin</artifactId>
@ -111,4 +94,51 @@
</plugins>
</build>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<properties>
<feature.parent>org.wildfly:wildfly-feature-pack</feature.parent>
<xmlns.domain>urn:jboss:domain:4.0</xmlns.domain>
</properties>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<type>zip</type>
</dependency>
</dependencies>
</profile>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<properties>
<feature.parent>org.jboss.eap:wildfly-feature-pack</feature.parent>
<xmlns.domain>urn:jboss:domain:4.1</xmlns.domain>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-feature-pack</artifactId>
<version>${eap.version}</version>
<type>zip</type>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

2
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml
View File

@ -17,7 +17,7 @@
~ limitations under the License.
-->
<domain xmlns="urn:jboss:domain:4.0">
<domain xmlns="${xmlns.domain}">
<extensions>
<?EXTENSIONS?>

2
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml
View File

@ -22,7 +22,7 @@
is also started by this host controller file. The other instance must be started
via host-slave.xml
-->
<host name="master" xmlns="urn:jboss:domain:4.0">
<host name="master" xmlns="${xmlns.domain}">
<extensions>
<?EXTENSIONS?>
</extensions>

2
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml
View File

@ -17,7 +17,7 @@
~ limitations under the License.
-->
<host xmlns="urn:jboss:domain:4.0">
<host xmlns="${xmlns.domain}">
<extensions>
<?EXTENSIONS?>
</extensions>

2
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml
View File

@ -23,7 +23,7 @@
via host-slave.xml
-->
<host name="master" xmlns="urn:jboss:domain:4.0">
<host name="master" xmlns="${xmlns.domain}">
<extensions>
<?EXTENSIONS?>
</extensions>

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

@ -17,7 +17,7 @@
~ limitations under the License.
-->
<server xmlns="urn:jboss:domain:4.0">
<server xmlns="${xmlns.domain}">
<extensions>
<?EXTENSIONS?>

1
distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf
View File

@ -1 +0,0 @@
slot=keycloak

4
distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt
View File

@ -1,2 +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.
Any provider implementation jars and libraries in this folder will be loaded. See the providers section in the
documentation for more details.

2
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/dir/META-INF/MANIFEST.MF → distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/dir/META-INF/MANIFEST.MF
View File

@ -1,3 +1,3 @@
JBoss-Product-Release-Name: ${product.name}
JBoss-Product-Release-Version: ${product.version}
JBoss-Product-Console-Slot: main
JBoss-Product-Console-Slot: ${product.wildfly.console.slot}

2
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml → distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/module.xml
View File

@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="keycloak">
<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="${product.slot}">
<properties>
<property name="jboss.api" value="private"/>
</properties>

1
distribution/feature-packs/server-feature-pack/src/main/resources/identity/product.conf Normal file
View File

@ -0,0 +1 @@
slot=${product.slot}

19
distribution/server-dist/assembly.xml
View File

@ -39,21 +39,23 @@
<outputDirectory/>
<filtered>false</filtered>
<excludes>
<exclude>**/*.sh</exclude>
<exclude>**/module.xml</exclude>
<exclude>bin/*.sh</exclude>
<exclude>module.xml</exclude>
<exclude>welcome-content/**</exclude>
<exclude>appclient</exclude>
<exclude>appclient/**</exclude>
<exclude>bin/appclient.*</exclude>
<exclude>copyright.txt</exclude>
<exclude>README.txt</exclude>
<exclude>themes/**</exclude>
<exclude>version.txt</exclude>
<exclude>${profileExcludes}</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>target/${project.build.finalName}</directory>
<outputDirectory/>
<includes>
<include>**/*.sh</include>
<include>bin/*.sh</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
@ -88,4 +90,13 @@
</includes>
</fileSet>
</fileSets>
<files>
<file>
<source>src/main/version.txt</source>
<outputDirectory/>
<filtered>true</filtered>
</file>
</files>
</assembly>

44
distribution/server-dist/pom.xml
View File

@ -38,8 +38,6 @@
</dependencies>
<build>
<finalName>keycloak-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.wildfly.build</groupId>
@ -69,7 +67,7 @@
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
<descriptor>${assemblyFile}</descriptor>
</descriptors>
<recompressZippedFiles>true</recompressZippedFiles>
<finalName>${project.build.finalName}</finalName>
@ -107,4 +105,44 @@
</plugins>
</build>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<properties>
<assemblyFile>assembly.xml</assemblyFile>
</properties>
<build>
<finalName>keycloak-${project.version}</finalName>
</build>
</profile>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<properties>
<assemblyFile>assembly.xml</assemblyFile>
<profileExcludes>%regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)]</profileExcludes>
</properties>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<finalName>${product.name}-${product.filename.version}</finalName>
</build>
</profile>
</profiles>
</project>

1
distribution/server-dist/src/main/version.txt Normal file
View File

@ -0,0 +1 @@
${product.name.full} - Version ${product.version}

46
distribution/server-overlay/assembly.xml
View File

@ -26,34 +26,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/keycloak</directory>
<outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/keycloak-${project.version}/themes</directory>
<outputDirectory>themes</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/keycloak-${project.version}/providers</directory>
<outputDirectory>providers</outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet>
<fileSet>
<directory>../../</directory>
<includes>
<include>License.html</include>
</includes>
<outputDirectory></outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/cli</directory>
<includes>
@ -62,21 +34,21 @@
<outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/keycloak-${project.version}/bin</directory>
<directory>${project.build.directory}/unpacked/${serverDistDir}</directory>
<outputDirectory/>
<includes>
<include>add-user-keycloak.*</include>
<include>federation-sssd-setup.sh</include>
<include>kcadm.*</include>
<include>kcreg.*</include>
<include>**/**</include>
</includes>
<outputDirectory>bin</outputDirectory>
<excludes>
<exclude>modules/**</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked/keycloak-${project.version}/bin/client</directory>
<directory>${project.build.directory}/unpacked/${serverDistDir}/modules/system/layers/keycloak</directory>
<outputDirectory>modules/system/${identityType}/keycloak</outputDirectory>
<includes>
<include>keycloak*</include>
<include>**/**</include>
</includes>
<outputDirectory>bin/client</outputDirectory>
</fileSet>
</fileSets>

50
distribution/server-overlay/pom.xml
View File

@ -37,9 +37,22 @@
</dependency>
</dependencies>
<properties>
<commonFilesToInclude>
${serverDistDir}/modules/system/layers/keycloak/**,
${serverDistDir}/themes/**,
${serverDistDir}/providers/**,
${serverDistDir}/License.html,
${serverDistDir}/bin/client/keycloak*,
${serverDistDir}/bin/*keycloak*,
${serverDistDir}/bin/kc*,
${serverDistDir}/bin/federation-sssd-setup.sh,
${serverDistDir}/bin/migrate*
</commonFilesToInclude>
</properties>
<build>
<finalName>keycloak-overlay-${project.version}</finalName>
<resources></resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -77,6 +90,7 @@
<artifactId>keycloak-server-dist</artifactId>
<type>zip</type>
<outputDirectory>${project.build.directory}/unpacked</outputDirectory>
<includes>${filesToInclude}</includes>
</artifactItem>
</artifactItems>
</configuration>
@ -169,4 +183,38 @@
</plugins>
</build>
<profiles>
<profile>
<id>community</id>
<activation>
<property>
<name>!product</name>
</property>
</activation>
<properties>
<identityType>add-ons</identityType>
<serverDistDir>keycloak-${project.version}</serverDistDir>
<filesToInclude>${commonFilesToInclude}</filesToInclude>
</properties>
</profile>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<properties>
<identityType>layers</identityType>
<serverDistDir>${product.name}-${product.filename.version}</serverDistDir>
<filesToInclude>
${commonFilesToInclude},
${serverDistDir}/bin/product.conf,
${serverDistDir}/modules/layers.conf</filesToInclude>
</properties>
</profile>
</profiles>
</project>

7
pom.xml
View File

@ -42,6 +42,7 @@
<!-- WildFly -->
<jboss.as.version>7.2.0.Final</jboss.as.version>
<wildfly.version>10.0.0.Final</wildfly.version>
<eap.version>7.0.5.GA-redhat-2</eap.version>
<version.org.wildfly.security.wildfly-elytron>1.1.0.Beta32</version.org.wildfly.security.wildfly-elytron>
<version.org.wildfly.security.elytron-web.undertow-server>1.0.0.Beta14</version.org.wildfly.security.elytron-web.undertow-server>
@ -1508,6 +1509,9 @@
</activation>
<properties>
<product.name>Keycloak</product.name>
<product.name.full>Keycloak</product.name.full>
<product.slot>keycloak</product.slot>
<product.wildfly.console.slot>main</product.wildfly.console.slot>
<product.name-html>\u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E</product.name-html>
<product.version>${project.version}</product.version>
<product.default-profile>community</product.default-profile>
@ -1522,7 +1526,10 @@
</property>
</activation>
<properties>
<product.name.full>Red Hat Single Sign-On</product.name.full>
<product.name>rh-sso</product.name>
<product.slot>rh-sso</product.slot>
<product.wildfly.console.slot>eap</product.wildfly.console.slot>
<product.name-html>\u003Cstrong\u003ERed Hat\u003C\u002Fstrong\u003E\u003Csup\u003E\u00AE\u003C\u002Fsup\u003E Single Sign On</product.name-html>
<product.version>${project.version}</product.version>
<product.default-profile>product</product.default-profile>