geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r674681 - in /geronimo/sandbox/djencks/jetty7: ./ geronimo-jetty7-builder/ geronimo-jetty7-clustering-builder-wadi/ geronimo-jetty7-clustering-wadi/ geronimo-jetty7/ jetty7-clustering-builder-wadi/ jetty7-clustering-wadi/ jetty7-deployer/ j...
Date Tue, 08 Jul 2008 00:05:27 GMT
Author: djencks
Date: Mon Jul  7 17:05:26 2008
New Revision: 674681

URL: http://svn.apache.org/viewvc?rev=674681&view=rev
Log:
basic renumbering, disable all but first module till it compiles

Modified:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/pom.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/pom.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml
    geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/pom.xml
    geronimo/sandbox/djencks/jetty7/jetty7-clustering-wadi/pom.xml
    geronimo/sandbox/djencks/jetty7/jetty7-deployer/pom.xml
    geronimo/sandbox/djencks/jetty7/jetty7/pom.xml
    geronimo/sandbox/djencks/jetty7/pom.xml

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/pom.xml Mon Jul  7 17:05:26 2008
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-jetty6-builder</artifactId>
+    <artifactId>geronimo-jetty7-builder</artifactId>
     <name>Geronimo Plugins, Jetty :: Builder</name>
     
     <dependencies>
@@ -41,7 +41,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6</artifactId>
+            <artifactId>geronimo-jetty7</artifactId>
             <version>${version}</version>
         </dependency>
         

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml Mon Jul
 7 17:05:26 2008
@@ -24,18 +24,18 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
+    <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
     <name>Geronimo Plugins, Jetty :: Clustering Builder for WADI Core</name>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+            <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/pom.xml Mon Jul  7 17:05:26
2008
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+    <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
     <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
     
     <dependencies>
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-jetty6</artifactId>
+            <artifactId>geronimo-jetty7</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml Mon Jul  7 17:05:26 2008
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-jetty6</artifactId>
+    <artifactId>geronimo-jetty7</artifactId>
     <name>Geronimo Plugins, Jetty :: Core</name>
     
     <dependencies>
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-sslengine</artifactId>
+            <artifactId>jetty-ssl</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/pom.xml Mon Jul  7 17:05:26
2008
@@ -24,34 +24,34 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>jetty6-clustering-builder-wadi</artifactId>
+    <artifactId>jetty7-clustering-builder-wadi</artifactId>
     <name>Geronimo Plugins, Jetty :: Clustering Builder for WADI</name>
     <packaging>car</packaging>
 
-    <description>Deployment for WADI clustering on Jetty 6.</description>
+    <description>Deployment for WADI clustering on Jetty 7.</description>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>jetty7-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
+            <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-wadi</artifactId>
+            <artifactId>jetty7-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -70,21 +70,21 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jetty6-deployer</artifactId>
+                            <artifactId>jetty7-deployer</artifactId>
                             <version>${version}</version>
                             <type>car</type>
                         </dependency>
 
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
+                            <artifactId>geronimo-jetty7-clustering-builder-wadi</artifactId>
                             <version>${version}</version>
                             <type>jar</type>
                         </dependency>
 
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jetty6-clustering-wadi</artifactId>
+                            <artifactId>jetty7-clustering-wadi</artifactId>
                             <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/sandbox/djencks/jetty7/jetty7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-clustering-wadi/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-clustering-wadi/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-clustering-wadi/pom.xml Mon Jul  7 17:05:26 2008
@@ -24,13 +24,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>jetty6-clustering-wadi</artifactId>
-    <name>Geronimo Plugins, Jetty :: Jetty 6 Clustering over WADI</name>
+    <artifactId>jetty7-clustering-wadi</artifactId>
+    <name>Geronimo Plugins, Jetty :: Jetty 7 Clustering over WADI</name>
     <packaging>car</packaging>
 
     <description>WADI clustering for Jetty.</description>
@@ -38,13 +38,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+            <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>jetty7</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/sandbox/djencks/jetty7/jetty7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-deployer/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-deployer/pom.xml Mon Jul  7 17:05:26 2008
@@ -24,12 +24,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>jetty6-deployer</artifactId>
+    <artifactId>jetty7-deployer</artifactId>
     <name>Geronimo Plugins, Jetty :: Deployer</name>
     <packaging>car</packaging>
 
@@ -53,7 +53,7 @@
         <!-- similar thing not needed in tomcat !!! -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>jetty7</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>runtime</scope>
@@ -61,7 +61,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-builder</artifactId>
+            <artifactId>geronimo-jetty7-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -90,7 +90,7 @@
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jetty6</artifactId>
+                            <artifactId>jetty7</artifactId>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
@@ -107,7 +107,7 @@
                         </dependency>
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jetty6-builder</artifactId>
+                            <artifactId>geronimo-jetty7-builder</artifactId>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/sandbox/djencks/jetty7/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7/pom.xml Mon Jul  7 17:05:26 2008
@@ -24,13 +24,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jetty</artifactId>
+        <artifactId>jetty7</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>jetty6</artifactId>
-    <name>Geronimo Plugins, Jetty :: Jetty 6</name>
+    <artifactId>jetty7</artifactId>
+    <name>Geronimo Plugins, Jetty :: Jetty 7</name>
     <packaging>car</packaging>
 
     <description>Geronimo Jetty Web Server integration.</description>
@@ -68,7 +68,7 @@
         <!-- This dependency should be retrieved by transitivity -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6</artifactId>
+            <artifactId>geronimo-jetty7</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -140,7 +140,7 @@
                         </dependency>
                         <dependency start="true">
                             <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jetty6</artifactId>
+                            <artifactId>geronimo-jetty7</artifactId>
                             <type>jar</type>
                         </dependency>
                         <dependency start="true">
@@ -197,7 +197,7 @@
                             <config-substitution key="HTTPSPort">8443</config-substitution>
                             <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
                             <config-substitution key="webcontainer">JettyWebContainer</config-substitution>
-                            <config-substitution key="webcontainerName">jetty6</config-substitution>
+                            <config-substitution key="webcontainerName">jetty7</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/pom.xml?rev=674681&r1=674680&r2=674681&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/pom.xml Mon Jul  7 17:05:26 2008
@@ -28,23 +28,54 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>jetty</artifactId>
-    <name>Geronimo Plugins, Jetty</name>
+    <artifactId>jetty7</artifactId>
+    <name>Geronimo Plugins, Jetty7</name>
     <packaging>pom</packaging>
     
     <description>
-        Jetty plugin
+        Jetty7 plugin
     </description>
+
+<dependencyManagement>
+<dependencies>
+<dependency>
+<groupId>org.mortbay.jetty</groupId>
+<artifactId>jetty</artifactId>
+<version>7.0-SNAPSHOT</version>
+</dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-ajp</artifactId>
+<version>7.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-ssl</artifactId>
+<version>7.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+<version>7.0-SNAPSHOT</version>
+        </dependency>
+
+</dependencies>
+</dependencyManagement>
     
+
     <modules>
-        <module>geronimo-jetty6</module>
-        <module>geronimo-jetty6-builder</module>
-        <module>jetty6</module>
-        <module>jetty6-deployer</module>
-        <module>geronimo-jetty6-clustering-builder-wadi</module>
-        <module>geronimo-jetty6-clustering-wadi</module>
-        <module>jetty6-clustering-builder-wadi</module>
-        <module>jetty6-clustering-wadi</module>
+        <module>geronimo-jetty7</module>
+<!--
+        <module>geronimo-jetty7-builder</module>
+        <module>jetty7</module>
+        <module>jetty7-deployer</module>
+        <module>geronimo-jetty7-clustering-builder-wadi</module>
+        <module>geronimo-jetty7-clustering-wadi</module>
+        <module>jetty7-clustering-builder-wadi</module>
+        <module>jetty7-clustering-wadi</module>
+-->
     </modules>
 
 </project>



Mime
View raw message