Return-Path: 
 <scm-return-37155-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 4159 invoked from network); 20 Jun 2009 09:18:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Jun 2009 09:18:02 -0000
Received: (qmail 80595 invoked by uid 500); 20 Jun 2009 09:18:13 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 80523 invoked by uid 500); 20 Jun 2009 09:18:13 -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 80514 invoked by uid 99); 20 Jun 2009 09:18:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jun 2009 09:18:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jun 2009 09:18:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DA7EF2388893; Sat, 20 Jun 2009 09:17:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r786773 - in /geronimo/server/trunk: assemblies/
 assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-minimal/
 assemblies/geronimo-jetty7-javaee5/ assemblies/geronimo-jetty7-minimal/
 framework/buildsupport/geronimo-plugin-archetyp...
Date: Sat, 20 Jun 2009 09:17:45 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090620091746.DA7EF2388893@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xuhaihong
Date: Sat Jun 20 09:17:43 2009
New Revision: 786773

URL: http://svn.apache.org/viewvc?rev=786773&view=rev
Log:
GERONIMO-4697 Update those folders contained jetty6 to jetty

Added:
    geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/   (props changed)
      - copied from r786765, geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/
    geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/   (props changed)
      - copied from r786765, geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/   (props changed)
      - copied from r786765, geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/
    geronimo/server/trunk/plugins/dojo/dojo-jetty/   (props changed)
      - copied from r786765, geronimo/server/trunk/plugins/dojo/dojo-jetty6/
    geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/   (props changed)
      - copied from r786765, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/
Removed:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/
    geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/dojo-legacy/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/dojo/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/uddi/uddi-server/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun 20 09:17:43 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml Sat Jun 20 09:17:43 2009
@@ -28,8 +28,8 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-jetty6-javaee5</artifactId>
-    <name>Geronimo Assemblies :: JavaEE 5 + Jetty6</name>
+    <artifactId>geronimo-jetty7-javaee5</artifactId>
+    <name>Geronimo Assemblies :: JavaEE 5 + Jetty7</name>
     <packaging>server-assembly</packaging>
 
     <description>

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun 20 09:17:43 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml Sat Jun 20 09:17:43 2009
@@ -28,7 +28,7 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-jetty6-minimal</artifactId>
+    <artifactId>geronimo-jetty7-minimal</artifactId>
     <name>Geronimo Assemblies :: Minimal + Jetty6</name>
     <packaging>server-assembly</packaging>
 

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Sat Jun 20 09:17:43 2009
@@ -39,8 +39,8 @@
     </properties>
 
     <modules>
-        <module>geronimo-jetty6-minimal</module>
-        <module>geronimo-jetty6-javaee5</module>
+        <module>geronimo-jetty7-minimal</module>
+        <module>geronimo-jetty7-javaee5</module>
         <module>geronimo-tomcat6-minimal</module>
         <module>geronimo-tomcat6-javaee5</module>
     </modules>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Sat Jun 20 09:17:43 2009
@@ -21,7 +21,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jetty6Deployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>
@@ -61,7 +61,7 @@
                         <!-- gbean deployer is default.  For jee apps include all deployers your app needs, see properties -->
                         <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${jettyDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
                         <!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
                     </deploymentConfigs>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Sat Jun 20 09:17:43 2009
@@ -21,7 +21,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jetty6Deployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>

Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -113,7 +113,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>uddi-jetty6</artifactId>
+            <artifactId>uddi-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>uddi-jetty6</artifactId>
+        <artifactId>uddi-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-it/pom.xml Sat Jun 20 09:17:43 2009
@@ -75,7 +75,7 @@
                             <assembly>
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-javaee5</artifactId>
+                                <artifactId>geronimo-jetty7-javaee5</artifactId>
                                 <version>${version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
@@ -84,7 +84,7 @@
                             <assembly>
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-minimal</artifactId>
+                                <artifactId>geronimo-jetty7-minimal</artifactId>
                                 <version>${version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -80,7 +80,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-legacy-jetty6</artifactId>
+            <artifactId>dojo-legacy-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-legacy-jetty6</artifactId>
+        <artifactId>dojo-legacy-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Propchange: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>dojo-legacy-jetty6</artifactId>
+    <artifactId>dojo-legacy-jetty</artifactId>
     <name>Geronimo Plugins, Dojo Legacy :: Jetty6</name>
     <packaging>car</packaging>
     

Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-legacy-jetty6</artifactId>
+        <artifactId>dojo-legacy-jetty</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>

Modified: geronimo/server/trunk/plugins/dojo-legacy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/pom.xml Sat Jun 20 09:17:43 2009
@@ -37,7 +37,7 @@
     </description>
 
     <modules>
-        <module>dojo-legacy-jetty6</module>
+        <module>dojo-legacy-jetty</module>
         <module>dojo-legacy-tomcat</module>
         <module>geronimo-dojo-legacy</module>
     </modules>

Propchange: geronimo/server/trunk/plugins/dojo/dojo-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun 20 09:17:43 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Propchange: geronimo/server/trunk/plugins/dojo/dojo-jetty/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -29,8 +29,8 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>dojo-jetty6</artifactId>
-    <name>Geronimo Plugins, Dojo :: Jetty6</name>
+    <artifactId>dojo-jetty</artifactId>
+    <name>Geronimo Plugins, Dojo :: Jetty</name>
     <packaging>car</packaging>
     
     <description>

Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty6</artifactId>
+        <artifactId>dojo-jetty</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>

Modified: geronimo/server/trunk/plugins/dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/pom.xml Sat Jun 20 09:17:43 2009
@@ -37,7 +37,7 @@
     </description>
 
     <modules>
-        <module>dojo-jetty6</module>
+        <module>dojo-jetty</module>
         <module>dojo-tomcat</module>
         <module>geronimo-dojo</module>
     </modules>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -94,7 +94,7 @@
 	
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
+            <artifactId>dojo-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty6</artifactId>
+        <artifactId>dojo-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -73,7 +73,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
+            <artifactId>dojo-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty6</artifactId>
+        <artifactId>dojo-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/pom.xml Sat Jun 20 09:17:43 2009
@@ -49,7 +49,7 @@
     </dependencyManagement>
     <modules>
         <module>geronimo-uddi-server</module>
-        <module>uddi-jetty6</module>
+        <module>uddi-jetty</module>
         <module>uddi-tomcat</module>
     </modules>
 

Propchange: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jun 20 09:17:43 2009
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings

Propchange: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/pom.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/pom.xml Sat Jun 20 09:17:43 2009
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>uddi-jetty6</artifactId>
+    <artifactId>uddi-jetty</artifactId>
     <name>Geronimo Plugins, UDDI Server :: Jetty6</name>
     <packaging>car</packaging>
 

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/src/main/history/dependencies.xml?rev=786773&r1=786765&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty/src/main/history/dependencies.xml Sat Jun 20 09:17:43 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>uddi-jetty6</artifactId>
+        <artifactId>uddi-jetty</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=786773&r1=786772&r2=786773&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Sat Jun 20 09:17:43 2009
@@ -41,7 +41,7 @@
     -->
     
     <properties>
-        <container>jetty6</container>
+        <container>jetty7</container>
     </properties>
 
     <dependencies>