Return-Path: 
 <scm-return-16489-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 31392 invoked from network); 12 Dec 2006 19:43:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Dec 2006 19:43:38 -0000
Received: (qmail 62083 invoked by uid 500); 12 Dec 2006 19:43:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 61943 invoked by uid 500); 12 Dec 2006 19:43:45 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 61932 invoked by uid 99); 12 Dec 2006 19:43:45 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 11:43:45 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 11:43:36 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6DC941A981A; Tue, 12 Dec 2006 11:42:52 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r486291 - in /geronimo/server/trunk: ./ configs/
 configs/dojo-jetty/ configs/jetty-clustering-builder-wadi/
 configs/jetty-clustering-wadi/ configs/jetty/ configs/uddi-jetty/
 configs/webconsole-jetty/ modules/ modules/geronimo-jetty-builder/
Date: Tue, 12 Dec 2006 19:42:52 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061212194252.6DC941A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Tue Dec 12 11:42:51 2006
New Revision: 486291

URL: http://svn.apache.org/viewvc?view=rev&rev=486291
Log:
Remove jetty 5 modules (geronimo-jetty-builder)
-  Note, had to keep geronimo-jetty and geronimo-jetty-clustering-wadi for now due to wadi module/config dependencies
Remove jetty 6 configs (dojo-jetty, jetty-clustering-builder-wadi, jetty, uddi-jetty, webconsole-jetty, geronimo-jetty-builder)
-  Note, had to keep jetty-deployer for now due to wadi module/config dependencies

Removed:
    geronimo/server/trunk/configs/dojo-jetty/
    geronimo/server/trunk/configs/jetty/
    geronimo/server/trunk/configs/jetty-clustering-builder-wadi/
    geronimo/server/trunk/configs/jetty-clustering-wadi/
    geronimo/server/trunk/configs/uddi-jetty/
    geronimo/server/trunk/configs/webconsole-jetty/
    geronimo/server/trunk/modules/geronimo-jetty-builder/
Modified:
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=486291&r1=486290&r2=486291
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Dec 12 11:42:51 2006
@@ -47,7 +47,6 @@
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${version}/car</jettyDeployer>
         <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
 
         <!-- Common plan properties -->
@@ -138,10 +137,6 @@
         <module>j2ee-server</module>
         <module>j2ee-system</module>
         <module>javamail</module>
-        <module>jetty</module>
-        <module>jetty-clustering-builder-wadi</module>
-        <module>jetty-clustering-wadi</module>
-        <module>jetty-deployer</module>
         <module>jsp-examples-jetty</module>
         <module>jsp-examples-tomcat</module>
         <module>ldap-demo-jetty</module>
@@ -162,7 +157,6 @@
         <module>tomcat6</module>
         <module>tomcat6-deployer</module>
         <!--<module>transaction</module>-->
-        <module>uddi-jetty</module>
         <module>uddi-tomcat</module>
         <module>unavailable-client-deployer</module>
         <module>unavailable-ejb-deployer</module>
@@ -170,11 +164,9 @@
         <module>upgrade</module>
         <module>upgrade-cli</module>
         <module>wadi-clustering</module>
-        <module>webconsole-jetty</module>
         <module>webconsole-tomcat</module>
         <module>welcome-jetty</module>
         <module>welcome-tomcat</module>
-        <module>dojo-jetty</module>
         <module>dojo-tomcat</module>
         <module>ca-helper-jetty</module>
         <module>ca-helper-tomcat</module>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=486291&r1=486290&r2=486291
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Dec 12 11:42:51 2006
@@ -73,9 +73,6 @@
         <module>geronimo-j2ee</module>
         <module>geronimo-j2ee-builder</module>
         <module>geronimo-j2ee-schema</module>
-        <module>geronimo-jetty</module>
-        <module>geronimo-jetty-clustering-wadi</module>
-        <module>geronimo-jetty-builder</module>
         <module>geronimo-jmx-remoting</module>
         <module>geronimo-kernel</module>
         <module>geronimo-mail</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=486291&r1=486290&r2=486291
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 12 11:42:51 2006
@@ -72,7 +72,6 @@
         HACK: Used by jsp and servlet example configs to point to the tomcat deployer
         -->
         <tomcatVersion>6.0.2-beta</tomcatVersion>
-        <tomcat5Version>5.5.15</tomcat5Version>
 
         <!--
         HACK: Used by uddi-jetty and uddi-tomcat config plans
@@ -839,30 +838,6 @@
             </dependency>
 
             <dependency>
-                <groupId>jetty</groupId>
-                <artifactId>org.mortbay.jetty</artifactId>
-                <version>5.1.11</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler-jdt</artifactId>
-                <version>${tomcat5Version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-                <version>${tomcat5Version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler</artifactId>
-                <version>${tomcat5Version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper</artifactId>
                 <version>${tomcatVersion}</version>
@@ -986,18 +961,6 @@
              <dependency>
                  <groupId>org.mortbay.jetty</groupId>
                  <artifactId>jetty-util</artifactId>
-                 <version>6.1-SNAPSHOT</version>
-             </dependency>
-
-             <dependency>
-                 <groupId>org.mortbay.jetty</groupId>
-                 <artifactId>jsp-2.1</artifactId>
-                 <version>6.1-SNAPSHOT</version>
-             </dependency>
-
-             <dependency>
-                 <groupId>org.mortbay.jetty</groupId>
-                 <artifactId>jsp-api-2.1</artifactId>
                  <version>6.1-SNAPSHOT</version>
              </dependency>