keycloak-uncached

tomcat7 distro

10/29/2014 2:30:12 PM

Bill Burke

Commit: 9350459

Tree: 2bbda00

Parents: d289fa7

Changes

distribution/appliance-dist/assembly.xml 1(+1 -0)

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

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

distribution/tomcat7-adapter-zip/assembly.xml 20(+20 -0)

distribution/tomcat7-adapter-zip/pom.xml 53(+53 -0)

distribution/war-dist/assembly.xml 1(+1 -0)

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

testsuite/tomcat7/src/test/java/org/keycloak/testsuite/tomcat7/TomcatAdapterTest.java 24(+0 -24)

Details

distribution/appliance-dist/assembly.xml 1(+1 -0)

diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 73f33c7..0e788d8 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -85,6 +85,7 @@
                 <include>org.keycloak:keycloak-wildfly-adapter-dist:zip</include>
                 <include>org.keycloak:keycloak-as7-adapter-dist:zip</include>
                 <include>org.keycloak:keycloak-eap6-adapter-dist:zip</include>
+                <include>org.keycloak:keycloak-tomcat7-adapter-dist:zip</include>
             </includes>
             <outputDirectory>adapters</outputDirectory>
         </dependencySet>

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

diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml
index c75c5fc..28105f6 100755
--- a/distribution/appliance-dist/pom.xml
+++ b/distribution/appliance-dist/pom.xml
@@ -28,6 +28,12 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-tomcat7-adapter-dist</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-eap6-adapter-dist</artifactId>
             <version>${project.version}</version>
             <type>zip</type>

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

diff --git a/distribution/pom.xml b/distribution/pom.xml
index c958393..be012fa 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -27,6 +27,7 @@
     <modules>
         <module>modules</module>
         <module>as7-adapter-zip</module>
+        <module>tomcat7-adapter-zip</module>
         <module>eap6-adapter-zip</module>
         <module>wildfly-adapter-zip</module>
         <module>examples-docs-zip</module>

distribution/tomcat7-adapter-zip/assembly.xml 20(+20 -0)

diff --git a/distribution/tomcat7-adapter-zip/assembly.xml b/distribution/tomcat7-adapter-zip/assembly.xml
new file mode 100755
index 0000000..46a3065
--- /dev/null
+++ b/distribution/tomcat7-adapter-zip/assembly.xml
@@ -0,0 +1,20 @@
+<assembly>
+    <id>war-dist</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <unpack>false</unpack>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <includes>
+                <include>org.keycloak:keycloak-tomcat7-adapter</include>
+            </includes>
+            <outputDirectory></outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>

distribution/tomcat7-adapter-zip/pom.xml 53(+53 -0)

diff --git a/distribution/tomcat7-adapter-zip/pom.xml b/distribution/tomcat7-adapter-zip/pom.xml
new file mode 100755
index 0000000..52b829c
--- /dev/null
+++ b/distribution/tomcat7-adapter-zip/pom.xml
@@ -0,0 +1,53 @@
+<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-Alpha1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>keycloak-tomcat7-adapter-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>Keycloak Tomcat 7 Adapter Distro</name>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-tomcat7-adapter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <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/war-dist/assembly.xml 1(+1 -0)

diff --git a/distribution/war-dist/assembly.xml b/distribution/war-dist/assembly.xml
index 7d45e6f..adf071b 100755
--- a/distribution/war-dist/assembly.xml
+++ b/distribution/war-dist/assembly.xml
@@ -31,6 +31,7 @@
                 <include>org.keycloak:keycloak-wildfly-adapter-dist:zip</include>
                 <include>org.keycloak:keycloak-as7-adapter-dist:zip</include>
                 <include>org.keycloak:keycloak-eap6-adapter-dist:zip</include>
+                <include>org.keycloak:keycloak-tomcat7-adapter-dist:zip</include>
             </includes>
             <outputDirectory>adapters</outputDirectory>
         </dependencySet>

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

diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml
index b7cc797..fb03295 100755
--- a/distribution/war-dist/pom.xml
+++ b/distribution/war-dist/pom.xml
@@ -28,6 +28,12 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-tomcat7-adapter-dist</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
             <artifactId>keycloak-eap6-adapter-dist</artifactId>
             <version>${project.version}</version>
             <type>zip</type>