KEYCLOAK-2805 - Support for JBoss Fuse 6.3

Upgrade of CXF, Jetty and Pax-Web required to rewrite part of the integration.

examples/fuse/camel/pom.xml

@@ -32,15 +32,21 @@
     <description/>
 
     <properties>
-        <camel.version>2.15.1</camel.version>
+
         <keycloak.osgi.export>
         </keycloak.osgi.export>
         <keycloak.osgi.import>
-            org.eclipse.jetty.security;version="[8.1,10)",
-            org.eclipse.jetty.util.security;version="[8.1,10)",
-            org.apache.camel;version="[2.12,3)",
+            javax.servlet;version="[3,4)",
+            javax.servlet.http;version="[3,4)",
+            org.apache.camel.*,
+            org.apache.camel;version="[2.13,3)",
+            org.eclipse.jetty.security;version="[8,10)",
+            org.eclipse.jetty.server.nio;version="[8,10)",
+            org.eclipse.jetty.util.security;version="[8,10)",
             org.keycloak.*;version="${project.version}",
-            *;resolution:=optional
+            org.osgi.service.blueprint,
+            org.osgi.service.blueprint.container,
+            org.osgi.service.event,
         </keycloak.osgi.import>
         <keycloak.osgi.private>
             org.keycloak.example.*
@@ -63,7 +69,7 @@
             <version>${camel.version}</version>
         </dependency>
         <dependency><groupId>org.apache.camel</groupId>
-            <artifactId>camel-jetty</artifactId>
+            <artifactId>camel-jetty9</artifactId>
             <version>${camel.version}</version>
         </dependency>
     </dependencies>

examples/fuse/cxf-jaxrs/pom.xml

@@ -31,7 +31,6 @@
     <name>CXF JAXRS Example - Secured in Karaf/Fuse</name>
 
     <properties>
-        <cxf.version>3.0.4</cxf.version>
         <keycloak.osgi.export>
         </keycloak.osgi.export>
         <keycloak.osgi.import>
@@ -40,9 +39,11 @@
             org.apache.cxf.transport.http;version="[2.7,3.2)",
             org.apache.cxf.*;version="[2.7,3.2)",
             com.fasterxml.jackson.jaxrs.json;version="${jackson.version}",
+            org.eclipse.jetty.security;version="[8,10)",
+            org.eclipse.jetty.util.security;version="[8,10)",
+            org.keycloak.*;version="${project.version}",
             org.keycloak.adapters.jetty;version="${project.version}",
-            org.keycloak.adapters;version="${project.version}",
-            *
+            *;resolution:=optional
         </keycloak.osgi.import>
         <keycloak.osgi.private>
             org.keycloak.example.rs.*

examples/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -69,9 +69,9 @@
     <bean id="defaultCxfReregistration" class="org.keycloak.adapters.osgi.ServletReregistrationService" depends-on="cxfKeycloakPaxWebIntegration"
           init-method="start" destroy-method="stop">
         <property name="bundleContext" ref="blueprintBundleContext" />
-        <property name="servletReference">
-            <reference interface="javax.servlet.Servlet" filter="(alias=/cxf)" timeout="5000" />
+        <property name="managedServiceReference">
+            <reference interface="org.osgi.service.cm.ManagedService" filter="(service.pid=org.apache.cxf.osgi)" timeout="5000"  />
         </property>
     </bean>
 
-</blueprint>
+</blueprint>

examples/fuse/cxf-jaxws/pom.xml

@@ -32,7 +32,6 @@
     <description/>
 
     <properties>
-        <cxf.version>3.0.4</cxf.version>
         <keycloak.osgi.export>
         </keycloak.osgi.export>
         <keycloak.osgi.import>
@@ -50,7 +49,9 @@
             org.apache.cxf.transport.http;version="[2.7,3.2)",
             org.apache.cxf.*;version="[2.7,3.2)",
             org.springframework.beans.factory.config,
-            *;resolution:=optional
+            org.eclipse.jetty.security;version="[8,10)",
+            org.eclipse.jetty.util.security;version="[8,10)",
+            org.keycloak.*;version="${project.version}"
         </keycloak.osgi.import>
         <keycloak.osgi.private>
             org.keycloak.example.ws.*

examples/fuse/features/src/main/resources/features.xml

@@ -18,13 +18,32 @@
 
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="keycloak-${project.version}">
 
-    <feature name="keycloak-fuse-example" version="${project.version}">
+      <feature name="keycloak-fuse-6.3-example" version="${project.version}">
+          <details>The keycloak fuse example</details>
+          <feature>war</feature>
+          <feature>camel</feature>
+          <feature>camel-jetty9</feature>
+          <feature>cxf</feature>
+          <feature>keycloak</feature>
+          <feature>keycloak-jetty9-adapter</feature>
+          <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
+          <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
+          <bundle>mvn:org.keycloak.example.demo/product-portal-fuse-example/${project.version}</bundle>
+          <bundle>mvn:org.keycloak.example.demo/customer-portal-fuse-example/${project.version}/war</bundle>
+          <bundle>mvn:org.keycloak.example.demo/camel-endpoint-example/${project.version}</bundle>
+          <bundle>mvn:org.keycloak.example.demo/cxf-jaxws-example/${project.version}</bundle>
+          <bundle>mvn:org.keycloak.example.demo/cxf-jaxrs-example/${project.version}</bundle>
+      </feature>
+
+      <!-- The difference are keycloak-jetty8-adapter and camel-jetty feature -->
+    <feature name="keycloak-fuse-6.2-example" version="${project.version}">
         <details>The keycloak fuse example</details>
         <feature>war</feature>
         <feature>camel</feature>
         <feature>camel-jetty</feature>
         <feature>cxf</feature>
         <feature>keycloak</feature>
+        <feature>keycloak-jetty8-adapter</feature>
         <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
         <bundle>mvn:org.keycloak.example.demo/product-portal-fuse-example/${project.version}</bundle>
@@ -34,4 +53,4 @@
         <bundle>mvn:org.keycloak.example.demo/cxf-jaxrs-example/${project.version}</bundle>
     </feature>
 
-</features>
+</features>

examples/fuse/pom.xml

@@ -29,7 +29,10 @@
 
     <artifactId>keycloak-examples-fuse-parent</artifactId>
     <packaging>pom</packaging>
-
+    <properties>
+        <cxf.version>3.1.5</cxf.version>
+        <camel.version>2.16.1</camel.version>
+    </properties>
     <modules>
         <module>customer-app-fuse</module>
         <module>product-app-fuse</module>
@@ -39,4 +42,4 @@
         <module>features</module>
     </modules>
 
-</project>
+</project>