From b768d593a2b66e581a5b2a42ddd2b3e66df3efed Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Fri, 5 Dec 2014 18:30:41 -0500 Subject: [PATCH] rm adapters from appliance/war-dist --- distribution/appliance-dist/assembly.xml | 24 +----- distribution/js-adapter-zip/assembly.xml | 19 +++++ distribution/js-adapter-zip/pom.xml | 74 +++++++++++++++++++ distribution/pom.xml | 1 + distribution/war-dist/assembly.xml | 6 +- .../modules/MigrationFromOlderVersions.xml | 2 + .../en/en-US/modules/javascript-adapter.xml | 4 +- .../en/en-US/modules/jboss-adapter.xml | 4 +- .../en/en-US/modules/jetty8-adapter.xml | 7 +- .../en/en-US/modules/jetty9-adapter.xml | 13 ++-- .../en/en-US/modules/server-installation.xml | 12 +-- .../en/en-US/modules/tomcat-adapter.xml | 7 +- 12 files changed, 127 insertions(+), 46 deletions(-) create mode 100755 distribution/js-adapter-zip/assembly.xml create mode 100755 distribution/js-adapter-zip/pom.xml diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml index 942162d321..81efad19f2 100755 --- a/distribution/appliance-dist/assembly.xml +++ b/distribution/appliance-dist/assembly.xml @@ -56,14 +56,6 @@ ${project.build.directory}/unpacked/adapter keycloak - - ${project.build.directory}/unpacked/js-adapter - adapters/js-adapter - - **/*.js - **/*.html - - src/main/welcome-content keycloak/welcome-content @@ -72,6 +64,7 @@ + diff --git a/distribution/js-adapter-zip/assembly.xml b/distribution/js-adapter-zip/assembly.xml new file mode 100755 index 0000000000..f3cad4a7ff --- /dev/null +++ b/distribution/js-adapter-zip/assembly.xml @@ -0,0 +1,19 @@ + + war-dist + + + zip + + true + + + + ${project.build.directory}/unpacked/js-adapter + + + **/*.js + **/*.html + + + + diff --git a/distribution/js-adapter-zip/pom.xml b/distribution/js-adapter-zip/pom.xml new file mode 100755 index 0000000000..5b654e405b --- /dev/null +++ b/distribution/js-adapter-zip/pom.xml @@ -0,0 +1,74 @@ + + 4.0.0 + + keycloak-parent + org.keycloak + 1.1.0.Beta2-SNAPSHOT + ../../pom.xml + + + keycloak-js-adapter-dist + pom + Keycloak JS Adapter Distribution + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + unpack + prepare-package + + unpack + + + + + org.keycloak + keycloak-js-adapter + ${project.version} + ${project.build.directory}/unpacked/js-adapter + *.js + + + **/welcome-content/* + + + + + + maven-assembly-plugin + 2.4 + + + assemble + package + + single + + + + assembly.xml + + + target + + + target/assembly/work + + false + + + + + + + + diff --git a/distribution/pom.xml b/distribution/pom.xml index 2b1a739ce1..2a6cdd0e68 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -35,6 +35,7 @@ jetty81-adapter-zip jetty91-adapter-zip jetty92-adapter-zip + js-adapter-zip examples-docs-zip theme-template-zip war-zip diff --git a/distribution/war-dist/assembly.xml b/distribution/war-dist/assembly.xml index 40fdfd8652..54915e9258 100755 --- a/distribution/war-dist/assembly.xml +++ b/distribution/war-dist/assembly.xml @@ -14,7 +14,8 @@ **/js-adapter/** - + + true false diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml index df3e3715a5..c7a263e1d1 100755 --- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml +++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml @@ -82,6 +82,8 @@
Migrating from 1.1.Beta1 to 1.1.Beta2 + Adapters are now a separate download. They are not included in appliance and war distribution. We have too many now and the distro + is getting bloated. The tomcat adapter valve has moved to a different package. From org.keycloak.adapters.tomcat7.KeycloakAuthenticatorValve to org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve From the 'tomcat7' package to just 'tomcat'. diff --git a/docbook/reference/en/en-US/modules/javascript-adapter.xml b/docbook/reference/en/en-US/modules/javascript-adapter.xml index dd6c3ee56e..b8ceafeaa4 100755 --- a/docbook/reference/en/en-US/modules/javascript-adapter.xml +++ b/docbook/reference/en/en-US/modules/javascript-adapter.xml @@ -1,7 +1,9 @@
Pure Client Javascript Adapter - The Keycloak Server comes with a Javascript library you can use to secure pure HTML/Javascript applications. It + The Keycloak Server comes with a Javascript library you can use to secure pure HTML/Javascript applications. This + library is referencable directly from the keycloak server. You can also download the adapter from Keycloak's download + site if you want a static copy of this library. It works in the same way as other application adapters except that your browser is driving the OAuth redirect protocol rather than the server. diff --git a/docbook/reference/en/en-US/modules/jboss-adapter.xml b/docbook/reference/en/en-US/modules/jboss-adapter.xml index 73d194e2b4..0896672b3c 100755 --- a/docbook/reference/en/en-US/modules/jboss-adapter.xml +++ b/docbook/reference/en/en-US/modules/jboss-adapter.xml @@ -10,8 +10,8 @@
Adapter Installation - There is a adapter zip file for AS7, EAP, and Wildfly in the adapters/ directory in the Keycloak - distribution. + Adapters are no longer included with the appliance or war distribution.Each adapter is a separate download on + the Keycloak download site. They are also available as a maven artifact. Install on Wildfly: diff --git a/docbook/reference/en/en-US/modules/jetty8-adapter.xml b/docbook/reference/en/en-US/modules/jetty8-adapter.xml index 7aa2ecf528..43e45c2f7f 100755 --- a/docbook/reference/en/en-US/modules/jetty8-adapter.xml +++ b/docbook/reference/en/en-US/modules/jetty8-adapter.xml @@ -7,9 +7,12 @@
Adapter Installation + + Adapters are no longer included with the appliance or war distribution.Each adapter is a separate download on + the Keycloak download site. They are also available as a maven artifact. + - There is a adapter zip file for Jetty 8.1.x in the adapters/ directory in the Keycloak appliance - or war distribution. You must unzip this file into Jetty 8.1.x's root directory. Including + You must unzip the Jetty 8.1.x distro into Jetty 8.1.x's root directory. Including adapter's jars within your WEB-INF/lib directory will not work! diff --git a/docbook/reference/en/en-US/modules/jetty9-adapter.xml b/docbook/reference/en/en-US/modules/jetty9-adapter.xml index b7f4af6391..ad7d1c86b1 100755 --- a/docbook/reference/en/en-US/modules/jetty9-adapter.xml +++ b/docbook/reference/en/en-US/modules/jetty9-adapter.xml @@ -7,11 +7,14 @@
Adapter Installation - - There is a adapter zip file for Jetty 9.x in the adapters/ directory in the Keycloak appliance - or war distribution. Depending on your version of Jetty, you must unzip this file into Jetty's root directory. Including - adapter's jars within your WEB-INF/lib directory will not work! - + + Adapters are no longer included with the appliance or war distribution.Each adapter is a separate download on + the Keycloak download site. They are also available as a maven artifact. + + + You must unzip the Jetty 9.x distro into Jetty 9.x's root directory. Including + adapter's jars within your WEB-INF/lib directory will not work! + $ cd $JETTY_HOME diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml index 6fe16368e7..6ae4d47ec3 100755 --- a/docbook/reference/en/en-US/modules/server-installation.xml +++ b/docbook/reference/en/en-US/modules/server-installation.xml @@ -41,10 +41,6 @@ keycloak-appliance-dist-all-&project.version;/ standalone/configuration/ keycloak-server.json themes/ - adapters/ - keycloak-as7-adapter-dist-&project.version;.zip - keycloak-eap6-adapter-dist-&project.version;.zip - keycloak-wildfly-adapter-dist-&project.version;.zip examples/ docs/ @@ -86,10 +82,6 @@ keycloak-war-dist-all-&project.version;/ configuration/ keycloak-server.json themes/ - adapters/ - keycloak-as7-adapter-dist-&project.version;.zip - keycloak-eap6-adapter-dist-&project.version;.zip - keycloak-wildfly-adapter-dist-&project.version;.zip examples/ docs/ @@ -107,7 +99,7 @@ keycloak-war-dist-all-&project.version;/ - After these steps you should also install the client adapter + After these steps you MUST then download and install the client adapter as this may contain modules the server needs (like Bouncycastle). You will also need to install the adapter to run the examples on the same server. @@ -121,7 +113,7 @@ keycloak-war-dist-all-&project.version;/ enter in a new password. - If you have Keycloak on JBoss AS 7.1.1 these steps. + You can no longer run Keycloak on JBoss AS 7.1.1. You must run on EAP 6.x or Wildfly.
diff --git a/docbook/reference/en/en-US/modules/tomcat-adapter.xml b/docbook/reference/en/en-US/modules/tomcat-adapter.xml index 0f3d75e2e4..e898f9469b 100755 --- a/docbook/reference/en/en-US/modules/tomcat-adapter.xml +++ b/docbook/reference/en/en-US/modules/tomcat-adapter.xml @@ -7,9 +7,12 @@
Adapter Installation + + Adapters are no longer included with the appliance or war distribution. Each adapter is a separate download on + the Keycloak download site. They are also available as a maven artifact. + - There is a adapter zip file for Tomcat in the adapters/ directory in the Keycloak appliance - or war distribution. You must unzip this file into Tomcat's lib/ directory. Including + You must unzip the adapter distro into Tomcat's lib/ directory. Including adapter's jars within your WEB-INF/lib directory will not work! The Keycloak adapter is implemented as a Valve and valve code must reside in Tomcat's main lib/ directory.