geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r487148 - in /geronimo/server/branches/2.0-M1: ./ configs/ configs/dojo-jetty/ configs/jetty-clustering-builder-wadi/ configs/jetty-clustering-wadi/ configs/jetty-deployer/ configs/jetty/ configs/uddi-jetty/ configs/webconsole-jetty/ module...
Date Thu, 14 Dec 2006 09:44:07 GMT
Author: djencks
Date: Thu Dec 14 01:44:05 2006
New Revision: 487148

URL: http://svn.apache.org/viewvc?view=rev&rev=487148
Log:
GERONIMO-2662 remove jetty 5 support from 2.0-M1

Removed:
    geronimo/server/branches/2.0-M1/configs/dojo-jetty/
    geronimo/server/branches/2.0-M1/configs/jetty/
    geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/
    geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/
    geronimo/server/branches/2.0-M1/configs/jetty-deployer/
    geronimo/server/branches/2.0-M1/configs/uddi-jetty/
    geronimo/server/branches/2.0-M1/configs/webconsole-jetty/
    geronimo/server/branches/2.0-M1/modules/geronimo-clustering-builder-wadi/
    geronimo/server/branches/2.0-M1/modules/geronimo-jetty/
    geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/
    geronimo/server/branches/2.0-M1/modules/geronimo-jetty-clustering-wadi/
Modified:
    geronimo/server/branches/2.0-M1/configs/pom.xml
    geronimo/server/branches/2.0-M1/modules/pom.xml
    geronimo/server/branches/2.0-M1/pom.xml

Modified: geronimo/server/branches/2.0-M1/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/pom.xml?view=diff&rev=487148&r1=487147&r2=487148
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/pom.xml Thu Dec 14 01:44:05 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>
@@ -161,8 +156,6 @@
         <module>system-database</module>
         <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 +163,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/branches/2.0-M1/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/pom.xml?view=diff&rev=487148&r1=487147&r2=487148
==============================================================================
--- geronimo/server/branches/2.0-M1/modules/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/modules/pom.xml Thu Dec 14 01:44:05 2006
@@ -55,7 +55,6 @@
         <module>geronimo-client</module>
         <module>geronimo-client-builder</module>
         <module>geronimo-clustering</module>
-        <module>geronimo-clustering-builder-wadi</module>
         <module>geronimo-clustering-wadi</module>
         <module>geronimo-common</module>
         <module>geronimo-connector</module>
@@ -73,9 +72,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/branches/2.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/pom.xml?view=diff&rev=487148&r1=487147&r2=487148
==============================================================================
--- geronimo/server/branches/2.0-M1/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/pom.xml Thu Dec 14 01:44:05 2006
@@ -845,12 +845,6 @@
             </dependency>
 
             <dependency>
-                <groupId>jetty</groupId>
-                <artifactId>org.mortbay.jetty</artifactId>
-                <version>5.1.12</version>
-            </dependency>
-
-            <dependency>
                 <groupId>tomcat</groupId>
                 <artifactId>jasper-compiler-jdt</artifactId>
                 <version>${tomcat5Version}</version>



Mime
View raw message