keycloak-uncached
Changes
distribution/appliance-dist/assembly.xml 24(+1 -23)
distribution/js-adapter-zip/assembly.xml 19(+19 -0)
distribution/js-adapter-zip/pom.xml 74(+74 -0)
distribution/pom.xml 1(+1 -0)
distribution/war-dist/assembly.xml 6(+5 -1)
Details
distribution/appliance-dist/assembly.xml 24(+1 -23)
diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 942162d..81efad1 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -57,14 +57,6 @@
<outputDirectory>keycloak</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/unpacked/js-adapter</directory>
- <outputDirectory>adapters/js-adapter</outputDirectory>
- <includes>
- <include>**/*.js</include>
- <include>**/*.html</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>src/main/welcome-content</directory>
<outputDirectory>keycloak/welcome-content</outputDirectory>
<includes>
@@ -72,6 +64,7 @@
</includes>
</fileSet>
</fileSets>
+ <!--
<dependencySets>
<dependencySet>
<unpack>false</unpack>
@@ -90,20 +83,5 @@
<outputDirectory>adapters</outputDirectory>
</dependencySet>
</dependencySets>
- <!--
- <moduleSets>
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
- <includes>
- <include>org.keycloak:keycloak-wildfly-adapter-dist</include>
- </includes>
- <binaries>
- <outputDirectory>adapters</outputDirectory>
- <attachmentClassifier>zip</attachmentClassifier>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-->
</assembly>
distribution/js-adapter-zip/assembly.xml 19(+19 -0)
diff --git a/distribution/js-adapter-zip/assembly.xml b/distribution/js-adapter-zip/assembly.xml
new file mode 100755
index 0000000..f3cad4a
--- /dev/null
+++ b/distribution/js-adapter-zip/assembly.xml
@@ -0,0 +1,19 @@
+<assembly>
+ <id>war-dist</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/unpacked/js-adapter</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*.js</include>
+ <include>**/*.html</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
distribution/js-adapter-zip/pom.xml 74(+74 -0)
diff --git a/distribution/js-adapter-zip/pom.xml b/distribution/js-adapter-zip/pom.xml
new file mode 100755
index 0000000..5b654e4
--- /dev/null
+++ b/distribution/js-adapter-zip/pom.xml
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>keycloak-parent</artifactId>
+ <groupId>org.keycloak</groupId>
+ <version>1.1.0.Beta2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>keycloak-js-adapter-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Keycloak JS Adapter Distribution</name>
+ <description/>
+
+ <dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <!--<version>2.7</version> -->
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-js-adapter</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+ <includes>*.js</includes>
+ </artifactItem>
+ </artifactItems>
+ <excludes>**/welcome-content/*</excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ <outputDirectory>
+ target
+ </outputDirectory>
+ <workDirectory>
+ target/assembly/work
+ </workDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
distribution/pom.xml 1(+1 -0)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2b1a739..2a6cdd0 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -35,6 +35,7 @@
<module>jetty81-adapter-zip</module>
<module>jetty91-adapter-zip</module>
<module>jetty92-adapter-zip</module>
+ <module>js-adapter-zip</module>
<module>examples-docs-zip</module>
<module>theme-template-zip</module>
<module>war-zip</module>
distribution/war-dist/assembly.xml 6(+5 -1)
diff --git a/distribution/war-dist/assembly.xml b/distribution/war-dist/assembly.xml
index 40fdfd8..54915e9 100755
--- a/distribution/war-dist/assembly.xml
+++ b/distribution/war-dist/assembly.xml
@@ -14,7 +14,8 @@
<exclude>**/js-adapter/**</exclude>
</excludes>
</fileSet>
- <fileSet>
+ <!--
+ <fileSet>
<directory>${project.build.directory}/unpacked/js-adapter</directory>
<outputDirectory>adapters/js-adapter</outputDirectory>
<includes>
@@ -22,8 +23,10 @@
<include>**/*.html</include>
</includes>
</fileSet>
+ -->
</fileSets>
<dependencySets>
+ <!--
<dependencySet>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -40,6 +43,7 @@
</includes>
<outputDirectory>adapters</outputDirectory>
</dependencySet>
+ -->
<dependencySet>
<unpack>true</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
diff --git a/docbook/reference/en/en-US/modules/javascript-adapter.xml b/docbook/reference/en/en-US/modules/javascript-adapter.xml
index dd6c3ee..b8ceafe 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 @@
<section id="javascript-adapter">
<title>Pure Client Javascript Adapter</title>
<para>
- 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.
</para>
diff --git a/docbook/reference/en/en-US/modules/jboss-adapter.xml b/docbook/reference/en/en-US/modules/jboss-adapter.xml
index 73d194e..0896672 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 @@
<section id="jboss-adapter-installation">
<title>Adapter Installation</title>
<para>
- There is a adapter zip file for AS7, EAP, and Wildfly in the <literal>adapters/</literal> 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.
</para>
<para>
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 7aa2ecf..43e45c2 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 @@
</para>
<section id="jetty8-adapter-installation">
<title>Adapter Installation</title>
+ <para>
+ 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.
+ </para>
<para>
- There is a adapter zip file for Jetty 8.1.x in the <literal>adapters/</literal> 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!
</para>
<para>
diff --git a/docbook/reference/en/en-US/modules/jetty9-adapter.xml b/docbook/reference/en/en-US/modules/jetty9-adapter.xml
index b7f4af6..ad7d1c8 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 @@
</para>
<section id="jetty9-adapter-installation">
<title>Adapter Installation</title>
- <para>
- There is a adapter zip file for Jetty 9.x in the <literal>adapters/</literal> 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!
- </para>
+ <para>
+ 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.
+ </para>
+ <para>
+ 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!
+ </para>
<para>
<programlisting>
$ cd $JETTY_HOME
diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index df3e371..c7a263e 100755
--- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -82,6 +82,8 @@
<section>
<title>Migrating from 1.1.Beta1 to 1.1.Beta2</title>
<itemizedlist>
+ <listitem>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.</listitem>
<listitem>The tomcat adapter valve has moved to a different package. From <literal>org.keycloak.adapters.tomcat7.KeycloakAuthenticatorValve</literal> to <literal>org.keycloak.adapters.tomcat.KeycloakAuthenticatorValve</literal>
From the 'tomcat7' package to just 'tomcat'.
</listitem>
diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index 6fe1636..6ae4d47 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/
</programlisting>
@@ -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/
</programlisting>
@@ -107,7 +99,7 @@ keycloak-war-dist-all-&project.version;/
</programlisting>
</para>
<para>
- After these steps you should also <link linkend='jboss-adapter-installation'>install the client adapter</link>
+ After these steps you MUST then <link linkend='jboss-adapter-installation'>download and install the client adapter</link>
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.
</para>
@@ -121,7 +113,7 @@ keycloak-war-dist-all-&project.version;/
enter in a new password.
</para>
<para>
- If you have Keycloak on JBoss AS 7.1.1 <link linkend="as7-specifics">these steps</link>.
+ You can no longer run Keycloak on JBoss AS 7.1.1. You must run on EAP 6.x or Wildfly.
</para>
</section>
<section>
diff --git a/docbook/reference/en/en-US/modules/tomcat-adapter.xml b/docbook/reference/en/en-US/modules/tomcat-adapter.xml
index 0f3d75e..e898f94 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 @@
</para>
<section id="tomcat-adapter-installation">
<title>Adapter Installation</title>
+ <para>
+ 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.
+ </para>
<para>
- There is a adapter zip file for Tomcat in the <literal>adapters/</literal> directory in the Keycloak appliance
- or war distribution. You must unzip this file into Tomcat's <literal>lib/</literal> directory. Including
+ You must unzip the adapter distro into Tomcat's <literal>lib/</literal> 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.
</para>