From 709e75d3651b67d9442709160f174b17f45ecdab Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 13 Jul 2009 21:51:51 +0000
Subject: Update Jetty to 6.1.19 and set up the cargo plugin to use a
 customized version of Jetty

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@793724 13f79535-47bb-0310-9956-ffa450edef68
---
 .../distribution/all/src/main/release/bin/LICENSE  |   4 +-
 .../distribution/webapp-helloworld-jsp/pom.xml     | 110 ++++++++++++++++-----
 java/sca/modules/host-jetty/pom.xml                |   4 +-
 java/sca/samples/webapps/helloworld-bpel/pom.xml   |   2 +-
 4 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/java/sca/distribution/all/src/main/release/bin/LICENSE b/java/sca/distribution/all/src/main/release/bin/LICENSE
index 96ed880995..cc44a9beb0 100644
--- a/java/sca/distribution/all/src/main/release/bin/LICENSE
+++ b/java/sca/distribution/all/src/main/release/bin/LICENSE
@@ -255,8 +255,8 @@ The following components come under Apache Software License 2.0
  geronimo-transaction-2.0.1.jar
  httpcore-4.0-beta1.jar
  httpcore-nio-4.0-beta1.jar
- jetty-6.1.15.jar
- jetty-util-6.1.15.jar
+ jetty-6.1.19.jar
+ jetty-util-6.1.19.jar
  juli-6.0.18.jar
  log4j-1.2.13.jar
  mex-1.41-impl.jar
diff --git a/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml b/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml
index 495dc636a7..bd2232e3d8 100644
--- a/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/java/sca/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -35,14 +35,14 @@
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
-        </dependency>        
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>sample-helloworld-jsp</artifactId>
             <type>war</type>
             <version>2.0-SNAPSHOT</version>
-        </dependency>        
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -58,8 +58,16 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jsp-2.0</artifactId>
+            <version>6.1.19</version>
+            <type>pom</type>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -85,38 +93,94 @@
                 <configuration>
                     <wait>false</wait>
                     <container>
-                        <containerId>jetty6x</containerId>
-                        <type>embedded</type>  
-                        <systemProperties>
-                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-                        </systemProperties>
+                        <!--
+                            you can call the containerid anything that doesn't start with 'jetty' (Jetty will work fine)
+                            if it starts with 'jetty' it will use the automatic dependency mechanism which you don't
+                            want
+                        -->
+                        <containerId>latest-jetty6x</containerId>
+                        <implementation>org.codehaus.cargo.container.jetty.Jetty6xEmbeddedLocalContainer
+                        </implementation>
+                        <type>embedded</type>
+                        <dependencies>
+                            <!-- add all the other dependencies that the embedded jetty server needs here -->
+                            <dependency>
+                                <groupId>org.mortbay.jetty</groupId>
+                                <artifactId>jetty</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.mortbay.jetty</groupId>
+                                <artifactId>jetty-util</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>javax.servlet</groupId>
+                                <artifactId>servlet-api</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.mortbay.jetty</groupId>
+                                <artifactId>jsp-2.0</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>tomcat</groupId>
+                                <artifactId>jasper-runtime</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>tomcat</groupId>
+                                <artifactId>jasper-compiler</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>commons-logging</groupId>
+                                <artifactId>commons-logging</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>tomcat</groupId>
+                                <artifactId>jasper-compiler-jdt</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.mortbay.jetty</groupId>
+                                <artifactId>jsp-api-2.0</artifactId>
+                            </dependency>
+                            <dependency>
+                                <groupId>commons-el</groupId>
+                                <artifactId>commons-el</artifactId>
+                            </dependency>
+
+                        </dependencies>
                     </container>
-                    <!-- container>
+                    <!-- Uncomment the following to enable Tomcat container -->
+                    <!-- 
+                    <container>
                         <containerId>tomcat6x</containerId>
                         <home>/Tomcat/apache-tomcat-6.0.18</home>
-                    </container -->
+                    </container>
+                    -->
                     <configuration>
+                        <implementation>org.codehaus.cargo.container.jetty.Jetty6xEmbeddedStandaloneLocalConfiguration
+                        </implementation>
+
                         <home>${project.build.directory}/cargo-jetty</home>
                         <properties>
-                            <!-- NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug
-                                       uncomment/comment the container above to be the Tomcat container and set home to point
-                                       to your local Tomcat installation   -->
-                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs> 
+                            <!--
+                                NOTE: remote debugging doesn't work with the embedded Jetty container. To remote debug
+                                uncomment/comment the container above to be the Tomcat container and set home to point
+                                to your local Tomcat installation
+                            -->
+                            <cargo.jvmargs><![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y]]></cargo.jvmargs>
                             <cargo.servlet.port>8085</cargo.servlet.port>
                             <context>helloworld-jsp</context>
                         </properties>
                         <deployables>
-                           <deployable>
-                              <groupId>org.apache.tuscany.sca</groupId>
-                              <artifactId>sample-helloworld-jsp</artifactId>
-                              <type>war</type>
-                              <properties>
-                                 <context>helloworld-jsp</context>
-                              </properties>
-                           </deployable>
+                            <deployable>
+                                <groupId>org.apache.tuscany.sca</groupId>
+                                <artifactId>sample-helloworld-jsp</artifactId>
+                                <type>war</type>
+                                <properties>
+                                    <context>helloworld-jsp</context>
+                                </properties>
+                            </deployable>
                         </deployables>
                     </configuration>
-                </configuration>                
+                </configuration>
             </plugin>
 
         </plugins>
diff --git a/java/sca/modules/host-jetty/pom.xml b/java/sca/modules/host-jetty/pom.xml
index abca9ee15d..b4a3a4a9d1 100644
--- a/java/sca/modules/host-jetty/pom.xml
+++ b/java/sca/modules/host-jetty/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.15</version>
+            <version>6.1.19</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mortbay.jetty</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>6.1.15</version>
+            <version>6.1.19</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mortbay.jetty</groupId>
diff --git a/java/sca/samples/webapps/helloworld-bpel/pom.xml b/java/sca/samples/webapps/helloworld-bpel/pom.xml
index 566ecc8148..57d1e0c567 100644
--- a/java/sca/samples/webapps/helloworld-bpel/pom.xml
+++ b/java/sca/samples/webapps/helloworld-bpel/pom.xml
@@ -34,7 +34,7 @@
 
 	<properties>
 		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
-		<jetty.version>6.1.18</jetty.version>
+		<jetty.version>6.1.19</jetty.version>
 	</properties>
 
 	<dependencies>
-- 
cgit v1.2.3