From 9303a9c7d03581ca1ef7ccec2dca20178fb97361 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 24 Mar 2017 16:16:09 +0100 Subject: [PATCH 1/2] KEYCLOAK-3258 Add server dist changes to product profile --- .../server-feature-pack/assembly.xml | 30 ++++++++- .../feature-pack-build.xml | 2 +- .../feature-packs/server-feature-pack/pom.xml | 64 ++++++++++++++----- .../configuration/domain/template.xml | 2 +- .../configuration/host/host-master.xml | 2 +- .../configuration/host/host-slave.xml | 2 +- .../resources/configuration/host/host.xml | 2 +- .../configuration/standalone/template.xml | 2 +- .../main/resources/content/bin/product.conf | 1 - .../resources/content/providers/README.txt | 4 +- .../module}/dir/META-INF/MANIFEST.MF | 2 +- .../keycloak => identity/module}/module.xml | 2 +- .../src/main/resources/identity/product.conf | 1 + distribution/server-dist/assembly.xml | 19 ++++-- distribution/server-dist/pom.xml | 44 ++++++++++++- distribution/server-dist/src/main/version.txt | 1 + distribution/server-overlay/assembly.xml | 46 +++---------- distribution/server-overlay/pom.xml | 50 ++++++++++++++- pom.xml | 7 ++ 19 files changed, 207 insertions(+), 76 deletions(-) delete mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf rename distribution/feature-packs/server-feature-pack/src/main/resources/{modules/system/layers/keycloak/org/jboss/as/product/keycloak => identity/module}/dir/META-INF/MANIFEST.MF (61%) rename distribution/feature-packs/server-feature-pack/src/main/resources/{modules/system/layers/keycloak/org/jboss/as/product/keycloak => identity/module}/module.xml (97%) create mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources/identity/product.conf create mode 100644 distribution/server-dist/src/main/version.txt diff --git a/distribution/feature-packs/server-feature-pack/assembly.xml b/distribution/feature-packs/server-feature-pack/assembly.xml index 8714ccd113..631a62cc8a 100644 --- a/distribution/feature-packs/server-feature-pack/assembly.xml +++ b/distribution/feature-packs/server-feature-pack/assembly.xml @@ -23,7 +23,7 @@ zip false - + @@ -31,8 +31,12 @@ true - **/module.xml - **/MANIFEST.MF + **/module.xml + **/MANIFEST.MF + **/template.xml + **/host.xml + **/host-master.xml + **/host-slave.xml @@ -42,6 +46,10 @@ **/module.xml **/MANIFEST.MF + **/template.xml + **/host.xml + **/host-master.xml + **/host-slave.xml @@ -58,5 +66,21 @@ **/** + + src/main/resources/identity + content/bin + + **/product.conf + + true + + + src/main/resources/identity/module + modules/system/layers/keycloak/org/jboss/as/product/${product.slot} + + **/* + + true + diff --git a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml index 8db3dfca2f..2cb52d6bd4 100644 --- a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml +++ b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml @@ -17,7 +17,7 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index 2232d88c8e..99df51f936 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -47,27 +47,10 @@ org.keycloak keycloak-wildfly-server-subsystem - - org.wildfly - wildfly-feature-pack - zip - - - - com.google.guava - guava - - - - - org.apache.maven.plugins - maven-resources-plugin - - org.wildfly.build wildfly-feature-pack-build-maven-plugin @@ -111,4 +94,51 @@ + + + community + + + !product + + + + + org.wildfly:wildfly-feature-pack + urn:jboss:domain:4.0 + + + + + org.wildfly + wildfly-feature-pack + zip + + + + + product + + + product + + + + + org.jboss.eap:wildfly-feature-pack + urn:jboss:domain:4.1 + + + + + org.jboss.eap + wildfly-feature-pack + ${eap.version} + zip + + + + + + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml index e7b5885177..7a9d6a0c17 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml index f5d89ee791..6366860354 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml @@ -22,7 +22,7 @@ is also started by this host controller file. The other instance must be started via host-slave.xml --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml index f8695d71a0..e90b782f8d 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml index a5c9afbdcc..1dce732bec 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml @@ -23,7 +23,7 @@ via host-slave.xml --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml index c0cc9e578a..0a72df3d4c 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf deleted file mode 100644 index 030791ca69..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf +++ /dev/null @@ -1 +0,0 @@ -slot=keycloak diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt index a6d523b43f..20b281aefd 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt @@ -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. \ No newline at end of file +Any provider implementation jars and libraries in this folder will be loaded. See the providers section in the +documentation for more details. \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/dir/META-INF/MANIFEST.MF b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/dir/META-INF/MANIFEST.MF similarity index 61% rename from distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/dir/META-INF/MANIFEST.MF rename to distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/dir/META-INF/MANIFEST.MF index dbaf97f345..5c2cb16d8b 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/dir/META-INF/MANIFEST.MF +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/dir/META-INF/MANIFEST.MF @@ -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} diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/module.xml similarity index 97% rename from distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml rename to distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/module.xml index 739393a414..272eb54de5 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/module/module.xml @@ -15,7 +15,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/identity/product.conf b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/product.conf new file mode 100644 index 0000000000..523592f81b --- /dev/null +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/identity/product.conf @@ -0,0 +1 @@ +slot=${product.slot} diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml index b7881589b1..dc0790454f 100755 --- a/distribution/server-dist/assembly.xml +++ b/distribution/server-dist/assembly.xml @@ -39,21 +39,23 @@ false - **/*.sh - **/module.xml + bin/*.sh + module.xml welcome-content/** - appclient appclient/** + bin/appclient.* copyright.txt README.txt themes/** + version.txt + ${profileExcludes} target/${project.build.finalName} - **/*.sh + bin/*.sh 0755 @@ -88,4 +90,13 @@ + + + + src/main/version.txt + + true + + + diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml index f34601f193..c870aba3de 100755 --- a/distribution/server-dist/pom.xml +++ b/distribution/server-dist/pom.xml @@ -38,8 +38,6 @@ - keycloak-${project.version} - org.wildfly.build @@ -69,7 +67,7 @@ - assembly.xml + ${assemblyFile} true ${project.build.finalName} @@ -107,4 +105,44 @@ + + + community + + + !product + + + + assembly.xml + + + keycloak-${project.version} + + + + + product + + + product + + + + assembly.xml + %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + + + + org.wildfly + wildfly-dist + zip + + + + ${product.name}-${product.filename.version} + + + + diff --git a/distribution/server-dist/src/main/version.txt b/distribution/server-dist/src/main/version.txt new file mode 100644 index 0000000000..c9db8ca50e --- /dev/null +++ b/distribution/server-dist/src/main/version.txt @@ -0,0 +1 @@ +${product.name.full} - Version ${product.version} diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml index 47a108a981..c2b5275c51 100755 --- a/distribution/server-overlay/assembly.xml +++ b/distribution/server-overlay/assembly.xml @@ -26,34 +26,6 @@ false - - ${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/keycloak - modules/system/add-ons/keycloak - - **/** - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/themes - themes - - **/** - - - - ${project.build.directory}/unpacked/keycloak-${project.version}/providers - providers - - **/** - - - - ../../ - - License.html - - - ${project.build.directory}/cli @@ -62,21 +34,21 @@ bin - ${project.build.directory}/unpacked/keycloak-${project.version}/bin + ${project.build.directory}/unpacked/${serverDistDir} + - add-user-keycloak.* - federation-sssd-setup.sh - kcadm.* - kcreg.* + **/** - bin + + modules/** + - ${project.build.directory}/unpacked/keycloak-${project.version}/bin/client + ${project.build.directory}/unpacked/${serverDistDir}/modules/system/layers/keycloak + modules/system/${identityType}/keycloak - keycloak* + **/** - bin/client diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index f2e727e352..6b6143f64d 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -37,9 +37,22 @@ + + + ${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* + + + keycloak-overlay-${project.version} - org.apache.maven.plugins @@ -77,6 +90,7 @@ keycloak-server-dist zip ${project.build.directory}/unpacked + ${filesToInclude} @@ -169,4 +183,38 @@ + + + + community + + + !product + + + + add-ons + keycloak-${project.version} + ${commonFilesToInclude} + + + + + product + + + product + + + + layers + ${product.name}-${product.filename.version} + + ${commonFilesToInclude}, + ${serverDistDir}/bin/product.conf, + ${serverDistDir}/modules/layers.conf + + + + diff --git a/pom.xml b/pom.xml index 5acdba263e..0308b69423 100755 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ 7.2.0.Final 10.0.0.Final + 7.0.5.GA-redhat-2 1.1.0.Beta32 1.0.0.Beta14 @@ -1508,6 +1509,9 @@ Keycloak + Keycloak + keycloak + main \u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E ${project.version} community @@ -1522,7 +1526,10 @@ + Red Hat Single Sign-On rh-sso + rh-sso + eap \u003Cstrong\u003ERed Hat\u003C\u002Fstrong\u003E\u003Csup\u003E\u00AE\u003C\u002Fsup\u003E Single Sign On ${project.version} product From 6b21b4d87b5f7cc5a347aac009afaa4661a47e55 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 27 Mar 2017 20:46:38 +0200 Subject: [PATCH 2/2] KEYCLOAK-4657 Sort out REST API for prod profile --- services/pom.xml | 25 ++++++++++++++++++++++-- services/src/docs/asciidoc/overview.adoc | 5 ++--- services/src/docs/swagger/apiinfo.json | 4 ++-- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/services/pom.xml b/services/pom.xml index 341a02c2bf..0329f55063 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -218,6 +218,27 @@ + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + target/docs + + + src/docs + true + + + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -244,7 +265,7 @@ ${project.basedir}/target/apidocs-rest/swagger false - -skipUiFiles -apiVersion 1 -includeResourcePrefixes org.keycloak.services.resources.admin,org.keycloak.protocol.oidc -docBasePath /apidocs -apiBasePath http://localhost:8080/auth -apiInfoFile ${project.basedir}/src/docs/swagger/apiinfo.json + -skipUiFiles -apiVersion 1 -includeResourcePrefixes org.keycloak.services.resources.admin,org.keycloak.protocol.oidc -docBasePath /apidocs -apiBasePath http://localhost:8080/auth -apiInfoFile ${project.basedir}/target/docs/swagger/apiinfo.json javadoc @@ -289,7 +310,7 @@ process-asciidoc - ${project.basedir}/src/docs/asciidoc + ${project.basedir}/target/docs/asciidoc index.adoc ${project.basedir}/target/apidocs-rest/output html5 diff --git a/services/src/docs/asciidoc/overview.adoc b/services/src/docs/asciidoc/overview.adoc index e2457abf15..1d19c96e93 100644 --- a/services/src/docs/asciidoc/overview.adoc +++ b/services/src/docs/asciidoc/overview.adoc @@ -1,7 +1,7 @@ -= Keycloak Admin REST API += ${product.name.full} Admin REST API == Overview -This is a REST API reference for the Keycloak Admin +This is a REST API reference for the ${product.name.full} Admin === Version information Version: 1 @@ -10,4 +10,3 @@ Version: 1 Host: localhost:8080 BasePath: /auth Schemes: HTTP - diff --git a/services/src/docs/swagger/apiinfo.json b/services/src/docs/swagger/apiinfo.json index 575955f57d..870e294748 100644 --- a/services/src/docs/swagger/apiinfo.json +++ b/services/src/docs/swagger/apiinfo.json @@ -1,4 +1,4 @@ { - "title": "Keycloak Admin REST API", - "description": "This is a REST API reference for the Keycloak Admin" + "title": "${product.name.full} Admin REST API", + "description": "This is a REST API reference for the ${product.name.full} Admin" } \ No newline at end of file