Prosoft Git

keycloak-uncached

Merge pull request #854 from patriot1burke/master jetty …

11/12/2014 1:44:53 PM
Bill Burke

Bill Burke

Commit: 8b515ae

Tree: 16b1dad

Parents: 7f23c0d
9a622a0

Changes

distribution/appliance-dist/pom.xml 6(+6 -0)

distribution/jetty81-adapter-zip/assembly.xml 2(+1 -1)

distribution/modules/build.xml 2(+1 -1)

distribution/modules/pom.xml 2(+1 -1)

distribution/pom.xml 1(+1 -0)

distribution/war-dist/pom.xml 6(+6 -0)

docbook/reference/en/en-US/master.xml 2(+2 -0)

docbook/reference/en/en-US/modules/jetty8-adapter.xml 47(+47 -0)

docbook/reference/en/en-US/modules/jetty9-adapter.xml 2(+1 -1)

examples/demo-template/customer-app/src/main/webapp/customers/session.jsp 2(+1 -1)

examples/demo-template/customer-app/src/main/webapp/customers/view.jsp 2(+1 -1)

examples/demo-template/product-app/src/main/webapp/products/view.jsp 2(+1 -1)

Details

distribution/appliance-dist/pom.xml 6(+6 -0) 

diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml
index cfd8497..c8688da 100755
--- a/distribution/appliance-dist/pom.xml
+++ b/distribution/appliance-dist/pom.xml
@@ -34,6 +34,12 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty81-adapter-dist</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-jetty91-adapter-dist</artifactId>
             <version>${project.version}</version>
             <type>zip</type>

distribution/jetty81-adapter-zip/assembly.xml 2(+1 -1) 

diff --git a/distribution/jetty81-adapter-zip/assembly.xml b/distribution/jetty81-adapter-zip/assembly.xml
index 441f907..53ddec6 100755
--- a/distribution/jetty81-adapter-zip/assembly.xml
+++ b/distribution/jetty81-adapter-zip/assembly.xml
@@ -12,7 +12,7 @@
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
-                <include>org.keycloak:keycloak-jetty91-adapter</include>
+                <include>org.keycloak:keycloak-jetty81-adapter</include>
             </includes>
             <excludes>
                 <exclude>org.eclipse.jetty:jetty-server</exclude>

distribution/modules/build.xml 2(+1 -1) 

diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index e101928..7ea8576 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -107,7 +107,7 @@
             <maven-resource group="org.picketlink" artifact="picketlink-federation"/>
         </module-def>
         <module-def name="org.picketlink.federation.bindings">
-            <maven-resource group="org.picketlink" artifact="picketlink-wildlfy-common"/>
+            <maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/>
         </module-def>
         <module-def name="org.picketlink.idm">
             <maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>

distribution/modules/pom.xml 2(+1 -1) 

diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index d0a9838..40e03a2 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -106,7 +106,7 @@
         </dependency>
         <dependency>
             <groupId>org.picketlink</groupId>
-            <artifactId>picketlink-wildlfy-common</artifactId>
+            <artifactId>picketlink-wildfly-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.picketlink</groupId>

distribution/pom.xml 1(+1 -0) 

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 332b270..184aca1 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -30,6 +30,7 @@
         <module>tomcat7-adapter-zip</module>
         <module>eap6-adapter-zip</module>
         <module>wildfly-adapter-zip</module>
+        <module>jetty81-adapter-zip</module>
         <module>jetty91-adapter-zip</module>
         <module>jetty92-adapter-zip</module>
         <module>examples-docs-zip</module>

distribution/war-dist/pom.xml 6(+6 -0) 

diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml
index 00491c0..a8cab9d 100755
--- a/distribution/war-dist/pom.xml
+++ b/distribution/war-dist/pom.xml
@@ -40,6 +40,12 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty81-adapter-dist</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-jetty91-adapter-dist</artifactId>
             <version>${project.version}</version>
             <type>zip</type>

docbook/reference/en/en-US/master.xml 2(+2 -0) 

diff --git a/docbook/reference/en/en-US/master.xml b/docbook/reference/en/en-US/master.xml
index 0aa1711..c9a6f21 100755
--- a/docbook/reference/en/en-US/master.xml
+++ b/docbook/reference/en/en-US/master.xml
@@ -13,6 +13,7 @@
                 <!ENTITY JavascriptAdapter SYSTEM "modules/javascript-adapter.xml">
                 <!ENTITY TomcatAdapter SYSTEM "modules/tomcat-adapter.xml">
                 <!ENTITY Jetty9Adapter SYSTEM "modules/jetty9-adapter.xml">
+                <!ENTITY Jetty8Adapter SYSTEM "modules/jetty8-adapter.xml">
                 <!ENTITY InstalledApplications SYSTEM "modules/installed-applications.xml">
                 <!ENTITY Logout SYSTEM "modules/logout.xml">
                 <!ENTITY SAML SYSTEM "modules/saml.xml">
@@ -88,6 +89,7 @@ This one is short
         &JBossAdapter;
         &TomcatAdapter;
         &Jetty9Adapter;
+        &Jetty8Adapter;
         &JavascriptAdapter;
         &InstalledApplications;
         &Logout;

docbook/reference/en/en-US/modules/jetty8-adapter.xml 47(+47 -0) 

diff --git a/docbook/reference/en/en-US/modules/jetty8-adapter.xml b/docbook/reference/en/en-US/modules/jetty8-adapter.xml
new file mode 100755
index 0000000..7aa2ecf
--- /dev/null
+++ b/docbook/reference/en/en-US/modules/jetty8-adapter.xml
@@ -0,0 +1,47 @@
+<section id="jetty8-adapter">
+    <title>Jetty 8.1.x Adapter</title>
+    <para>
+        Keycloak has a separate adapter for Jetty 8.1.x that you will have to install into your Jetty
+        installation.  You then have to provide some extra configuration in each WAR you deploy to
+        Jetty.  Let's go over these steps.
+    </para>
+    <section id="jetty8-adapter-installation">
+        <title>Adapter Installation</title>
+    <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
+        adapter's jars within your WEB-INF/lib directory will not work!
+    </para>
+    <para>
+<programlisting>
+$ cd $JETTY_HOME
+$ unzip keycloak-jetty81-adapter-dist.zip
+</programlisting>
+    </para>
+    <para>
+        Next, you will have to enable the keycloak option.  Edit start.ini and add keycloak to the options
+    </para>
+        <para>
+<programlisting>
+<![CDATA[
+#===========================================================
+# Start classpath OPTIONS.
+# These control what classes are on the classpath
+# for a full listing do
+#   java -jar start.jar --list-options
+#-----------------------------------------------------------
+OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations,keycloak
+]]>
+</programlisting>
+
+        </para>
+    </section>
+
+    <section>
+        <title>Required Per WAR Configuration</title>
+        <para>
+            Enabling Keycloak for your WARs is the same as the Jetty 9.x adapter.  Our 8.1.x adapter supports both keycloak.json
+            and the jboss-web.xml advanced configuration.  See <link linkend="jetty9_per_war">Required Per WAR Configuration</link>
+        </para>
+     </section>
+</section>
\ No newline at end of file

docbook/reference/en/en-US/modules/jetty9-adapter.xml 2(+1 -1) 

diff --git a/docbook/reference/en/en-US/modules/jetty9-adapter.xml b/docbook/reference/en/en-US/modules/jetty9-adapter.xml
index 47f1dda..b7f4af6 100755
--- a/docbook/reference/en/en-US/modules/jetty9-adapter.xml
+++ b/docbook/reference/en/en-US/modules/jetty9-adapter.xml
@@ -30,7 +30,7 @@ $ java -jar $JETTY_HOME/start.jar --add-to-startd=keycloak
         </para>
     </section>
 
-    <section>
+    <section id="jetty9_per_war">
         <title>Required Per WAR Configuration</title>
         <para>
             This section describes how to secure a WAR directly by adding config and editing files within your WAR package.

examples/demo-template/customer-app/src/main/webapp/customers/session.jsp 2(+1 -1) 

diff --git a/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp b/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp
index 2bd9d16..2c3ddb3 100755
--- a/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp
+++ b/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1" %>
-<%@ page import="org.keycloak.ServiceUrlConstants" %>
+<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
 <%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
 <%@ page import="org.keycloak.representations.IDToken" %>
 <%@ page import="org.keycloak.util.HostUtils" %>

examples/demo-template/customer-app/src/main/webapp/customers/view.jsp 2(+1 -1) 

diff --git a/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp b/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp
index 881818d..04a54bb 100755
--- a/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp
+++ b/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1" %>
-<%@ page import="org.keycloak.ServiceUrlConstants" %>
+<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
 <%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
 <%@ page import="org.keycloak.representations.IDToken" %>
 <%@ page import="org.keycloak.util.KeycloakUriBuilder" %>

examples/demo-template/product-app/src/main/webapp/products/view.jsp 2(+1 -1) 

diff --git a/examples/demo-template/product-app/src/main/webapp/products/view.jsp b/examples/demo-template/product-app/src/main/webapp/products/view.jsp
index 92a6651..69be584 100755
--- a/examples/demo-template/product-app/src/main/webapp/products/view.jsp
+++ b/examples/demo-template/product-app/src/main/webapp/products/view.jsp
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
  pageEncoding="ISO-8859-1"%>
-<%@ page import="org.keycloak.ServiceUrlConstants" %>
+<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
 <%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
 <%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
 <%@ page session="false" %>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github