Return-Path: 
 <scm-return-32717-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 9316 invoked from network); 13 Oct 2008 17:50:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Oct 2008 17:50:03 -0000
Received: (qmail 16503 invoked by uid 500); 13 Oct 2008 17:50:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 16371 invoked by uid 500); 13 Oct 2008 17:50:03 -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 16362 invoked by uid 99); 13 Oct 2008 17:50:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2008 10:50:03 -0700
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; Mon, 13 Oct 2008 17:49:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D86F123888A5; Mon, 13 Oct 2008 10:49:41 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r704183 - in /geronimo/server/trunk: ./
 plugingroups/clustering-jetty/ plugingroups/web-jetty/
 plugins/activemq/activemq-console-jetty/
 plugins/activemq5/activemq5-console-jetty/
 plugins/ca-helper/ca-helper-jetty/ plugins/console/console-je...
Date: Mon, 13 Oct 2008 17:49:40 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081013174941.D86F123888A5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Mon Oct 13 10:49:39 2008
New Revision: 704183

URL: http://svn.apache.org/viewvc?rev=704183&view=rev
Log:
GERONIMO-4249 Make it easier to switch between jetty6 and jetty7

Modified:
    geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml
    geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
    geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
    geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-builder-wadi</artifactId>
+            <artifactId>${jetty}-clustering-builder-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -166,7 +166,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -166,7 +166,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -49,7 +49,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -87,7 +87,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -90,7 +90,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -114,7 +114,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -136,7 +136,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -74,7 +74,7 @@
         <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -105,7 +105,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Mon Oct 13 10:49:39 2008
@@ -82,8 +82,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')"/>
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')"/>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Mon Oct 13 10:49:39 2008
@@ -82,12 +82,12 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')">
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')">
                                 <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'jetty6')">
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')">
                                 <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
                                     <attribute name="listener">?name=#{webcontainer}</attribute>
                                 </gbean>

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=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -110,7 +110,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
@@ -123,16 +123,6 @@
                     <osiApproved>true</osiApproved>
                     <instance>
                         <plugin-artifact>
-                            <prerequisite>
-                                <id>
-                                    <groupId>org.apache.geronimo.configs</groupId>
-                                    <artifactId>jetty6</artifactId>
-                                </id>
-                                <resource-type>Web Container</resource-type>
-                                <description>
-                                    This version of the plugin works with the Geronimo/Jetty distribution.
-                                </description>
-                            </prerequisite>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml Mon Oct 13 10:49:39 2008
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -80,7 +80,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml Mon Oct 13 10:49:39 2008
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -80,7 +80,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.modules</groupId>

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=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -41,7 +41,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -110,7 +110,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -110,7 +110,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -84,7 +84,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -39,7 +39,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -240,7 +240,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml Mon Oct 13 10:49:39 2008
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -115,7 +115,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty/pom.xml Mon Oct 13 10:49:39 2008
@@ -51,7 +51,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -96,7 +96,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=704183&r1=704182&r2=704183&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Oct 13 10:49:39 2008
@@ -83,6 +83,8 @@
         <openjpaVersion>1.2.0</openjpaVersion>
         <xbeanVersion>3.4.1</xbeanVersion>
         <wadiVersion>2.1-SNAPSHOT</wadiVersion>
+        <jetty>jetty6</jetty>
+        <!--<jetty>jetty7</jetty>-->
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
@@ -96,8 +98,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
-        <jetty7Deployer>org.apache.geronimo.configs/jetty7-deployer/${version}/car</jetty7Deployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${version}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>