From 770f9645b397303630607734493102138efb6816 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 26 Aug 2013 08:56:13 +0200
Subject: [PATCH 1/3] disable cdi descovery for webapp, guava and jsersey-guava

---
 pom.xml                                      |  3 +
 scm-core/pom.xml                             |  2 +-
 scm-webapp/pom.xml                           | 64 ++++++++++++++++++--
 scm-webapp/src/main/webapp/WEB-INF/beans.xml |  6 ++
 scm-webapp/src/main/webapp/WEB-INF/web.xml   |  3 +-
 5 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 scm-webapp/src/main/webapp/WEB-INF/beans.xml

diff --git a/pom.xml b/pom.xml
index 2113dee6fe..9b4c4071dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,6 +432,9 @@
     <!-- repostitory libraries -->
     <jgit.version>3.0.0.201306101825-r</jgit.version>
     <svnkit.version>1.7.10-scm3</svnkit.version>
+    
+    <!-- util libraries -->
+    <guava.version>14.0.1</guava.version>
 
     <!-- build properties -->
     <project.build.javaLevel>1.6</project.build.javaLevel>
diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 13b0c31bf0..8f190d2da3 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>${guava.version}</version>
     </dependency>
     
     <dependency>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 13b31ff60c..928ffe6def 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -113,12 +113,8 @@
       <groupId>com.sun.jersey.contribs</groupId>
       <artifactId>jersey-guice</artifactId>
       <version>${jersey.version}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>jersey-grizzly2</artifactId>
-          <groupId>com.sun.jersey</groupId>
-        </exclusion>
-      </exclusions>
+      <!-- included by dependency rewrite -->
+      <scope>provided</scope>
     </dependency>
     
     <dependency>
@@ -189,6 +185,14 @@
       <version>3.3.1</version>
     </dependency>
     
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+      <!-- included by dependency rewrite -->
+      <scope>provided</scope>
+    </dependency>
+    
     <!-- template engine -->
 
     <dependency>
@@ -385,6 +389,54 @@
           </execution>
         </executions>
       </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>repack</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                add beans.xml to jersey-guice and guava
+                -->
+                
+                <!-- jersey guice -->
+                
+                <unzip src="${com.sun.jersey.contribs:jersey-guice:jar}" dest="${project.build.directory}/tmp/jersey-guice"/>
+                <copy file="src/main/webapp/WEB-INF/beans.xml" toDir="${project.build.directory}/tmp/jersey-guice/META-INF" />
+                <zip basedir="${project.build.directory}/tmp/jersey-guice" destfile="${project.build.directory}/dependency-rewrite/WEB-INF/lib/jersey-guice-${jersey.version}.jar"/>
+                
+                <!-- guava -->
+                
+                <unzip src="${com.google.guava:guava:jar}" dest="${project.build.directory}/tmp/guava"/>
+                <copy file="src/main/webapp/WEB-INF/beans.xml" toDir="${project.build.directory}/tmp/guava/META-INF" />
+                <zip basedir="${project.build.directory}/tmp/guava" destfile="${project.build.directory}/dependency-rewrite/WEB-INF/lib/guava-${guava.version}.jar"/>
+                
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${project.build.directory}/dependency-rewrite</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>sonia.maven</groupId>
diff --git a/scm-webapp/src/main/webapp/WEB-INF/beans.xml b/scm-webapp/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..785e21c1d9
--- /dev/null
+++ b/scm-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="none">
+</beans>
\ No newline at end of file
diff --git a/scm-webapp/src/main/webapp/WEB-INF/web.xml b/scm-webapp/src/main/webapp/WEB-INF/web.xml
index 964b355aca..b8a21e834f 100644
--- a/scm-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/scm-webapp/src/main/webapp/WEB-INF/web.xml
@@ -34,7 +34,8 @@
 
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
+         metadata-complete="true">
 
     <listener>
       <listener-class>sonia.scm.boot.BootstrapListener</listener-class>

From d2bcfb82f6b5a3c34bba8689a8781c8e903c6c0a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 26 Aug 2013 09:00:05 +0200
Subject: [PATCH 2/3] fix release build

---
 scm-webapp/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 928ffe6def..4e228b716b 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -543,6 +543,9 @@
                 <resource>
                   <directory>${project.build.directory}/web-compressor</directory>
                 </resource>
+                <resource>
+                  <directory>${project.build.directory}/dependency-rewrite</directory>
+                </resource>
               </webResources>
             </configuration>
           </plugin>

From 2cb8cee05193a664031a529876d39c27905eddbd Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 27 Aug 2013 08:02:05 +0200
Subject: [PATCH 3/3] improve dependency rewrite

---
 scm-webapp/pom.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 4e228b716b..bb769a42d6 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -406,19 +406,22 @@
                 <!--
                 add beans.xml to jersey-guice and guava
                 -->
-                
+                <property name="beans.file" value="src/main/webapp/WEB-INF/beans.xml" />
+                <property name="temp.dir" value="${project.build.directory}/tmp" />
+                <property name="rewrite.dir" value="${project.build.directory}/dependency-rewrite/WEB-INF/lib" />
+                <property name="suffix" value="gfcdifix" />
+
                 <!-- jersey guice -->
-                
-                <unzip src="${com.sun.jersey.contribs:jersey-guice:jar}" dest="${project.build.directory}/tmp/jersey-guice"/>
-                <copy file="src/main/webapp/WEB-INF/beans.xml" toDir="${project.build.directory}/tmp/jersey-guice/META-INF" />
-                <zip basedir="${project.build.directory}/tmp/jersey-guice" destfile="${project.build.directory}/dependency-rewrite/WEB-INF/lib/jersey-guice-${jersey.version}.jar"/>
+                <property name="jersey.tmp" value="${temp.dir}/jersey-guice" />
+                <unzip src="${com.sun.jersey.contribs:jersey-guice:jar}" dest="${jersey.tmp}"/>
+                <copy file="${beans.file}" toDir="${jersey.tmp}/META-INF" />
+                <zip basedir="${jersey.tmp}" destfile="${rewrite.dir}/jersey-guice-${jersey.version}-${suffix}.jar"/>
                 
                 <!-- guava -->
-                
-                <unzip src="${com.google.guava:guava:jar}" dest="${project.build.directory}/tmp/guava"/>
-                <copy file="src/main/webapp/WEB-INF/beans.xml" toDir="${project.build.directory}/tmp/guava/META-INF" />
-                <zip basedir="${project.build.directory}/tmp/guava" destfile="${project.build.directory}/dependency-rewrite/WEB-INF/lib/guava-${guava.version}.jar"/>
-                
+                <property name="guava.tmp" value="${temp.dir}/guava" />
+                <unzip src="${com.google.guava:guava:jar}" dest="${guava.tmp}"/>
+                <copy file="${beans.file}" toDir="${guava.tmp}/META-INF" />
+                <zip basedir="${guava.tmp}" destfile="${rewrite.dir}/guava-${guava.version}-${suffix}.jar"/>
               </target>
             </configuration>
           </execution>