geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r786836 - in /geronimo/samples/trunk: ./ geronimo-samples-archetype/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/ repository/ samples/ samples/app-per-port/app-per-port-jetty/ samples/app-per-port/app-per-...
Date Sat, 20 Jun 2009 14:47:35 GMT
Author: xuhaihong
Date: Sat Jun 20 14:47:35 2009
New Revision: 786836

URL: http://svn.apache.org/viewvc?rev=786836&view=rev
Log:
Update configurations to reflect the changes in Geronimo trunk, including Jetty 7 and Tomcat
Ext

Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/repository/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
    geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml
    geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml
    geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
    geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
    geronimo/samples/trunk/samples/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/pom.xml Sat Jun 20 14:47:35 2009
@@ -33,7 +33,7 @@
 
     <artifactId>geronimo-samples-archetype</artifactId>
     <name>Geronimo Samples  ::  Archetype</name>
-    <packaging>maven-plugin</packaging>
+    <packaging>jar</packaging>
     
     <description> Plugin to help create a samples project</description>
 

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
Sat Jun 20 14:47:35 2009
@@ -47,7 +47,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -102,7 +102,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Sat Jun 20 14:47:35 2009
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>
@@ -49,6 +49,9 @@
         <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
         <siteId>geronimo-samples</siteId>
         <projectName>Apache Geronimo Samples</projectName>
+        <jetty>jetty7</jetty>
+        <tomcatVersion>6.0.18-SNAPSHOT</tomcatVersion>
+        <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
     </properties>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
@@ -140,7 +143,7 @@
                             <assembly>
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-javaee5</artifactId>
+                                <artifactId>geronimo-${jetty}-javaee5</artifactId>
                                 <version>${geronimoVersion}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
@@ -149,7 +152,7 @@
                             <assembly>
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-minimal</artifactId>
+                                <artifactId>geronimo-${jetty}-minimal</artifactId>
                                 <version>${geronimoVersion}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
@@ -295,6 +298,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+                    <optimize>true</optimize>
+                    <debug>false</debug>
+                    <showDeprecation>false</showDeprecation>
+                    <showWarnings>false</showWarnings>
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>

Modified: geronimo/samples/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/repository/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/repository/pom.xml (original)
+++ geronimo/samples/trunk/repository/pom.xml Sat Jun 20 14:47:35 2009
@@ -40,16 +40,19 @@
     <dependencies>
         <!-- See GERONIMO-3010 for proposed change in managed object lifecycle handling
with the tomcat team. -->
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>${tomcatGroupId}</groupId>
             <artifactId>catalina</artifactId>
+            <version>${tomcatVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>${tomcatGroupId}</groupId>
             <artifactId>jasper</artifactId>
+            <version>${tomcatVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>${tomcatGroupId}</groupId>
             <artifactId>jasper-el</artifactId>
+            <version>${tomcatVersion}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/pom.xml Sat Jun 20 14:47:35
2009
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -89,7 +89,7 @@
     <properties>
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jettyDeployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
     </properties>
 

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
Sat Jun 20 14:47:35 2009
@@ -40,7 +40,7 @@
     <module>
         <web>connectors.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-            <gbean name="JettyWebConnector1" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
+            <gbean name="JettyWebConnector1" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
                 <attribute name="host">localhost</attribute>
                 <attribute name="port">8090</attribute>
                 <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -53,7 +53,7 @@
                 <attribute name="maxThreads">50</attribute>
             </gbean>
 
-            <gbean name="JettyWebConnector2" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
+            <gbean name="JettyWebConnector2" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
                 <attribute name="host">localhost</attribute>
                 <attribute name="port">8091</attribute>
                 <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -70,7 +70,7 @@
     </module>
 
 
-    <gbean name="JettyWebContainer1" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+    <gbean name="JettyWebContainer1" class="org.apache.geronimo.jetty7.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty1</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -80,7 +80,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog1" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog1" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer1</name>
         </reference>
@@ -92,7 +92,7 @@
         <attribute name="logTimeZone">GMT</attribute>
     </gbean>
 
-    <gbean name="JettyWebContainer2" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+    <gbean name="JettyWebContainer2" class="org.apache.geronimo.jetty7.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty2</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -102,7 +102,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog2" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog2" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer2</name>
         </reference>

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/pom.xml Sat Jun 20
14:47:35 2009
@@ -89,7 +89,7 @@
     <properties>
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jettyDeployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
     </properties>
 

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
Sat Jun 20 14:47:35 2009
@@ -24,7 +24,7 @@
         <gbean-link>JettyWebContainer</gbean-link>
     </web-container>
 
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
         <attribute name="host">localhost</attribute>
         <attribute name="port">8090</attribute>
         <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -37,7 +37,7 @@
         <attribute name="maxThreads">50</attribute>
     </gbean>
 
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty7.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty1</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -47,7 +47,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>

Modified: geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -87,7 +87,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -130,7 +130,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml Sat Jun 20 14:47:35
2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -122,7 +122,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -95,7 +95,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -138,7 +138,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -92,7 +92,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -99,7 +99,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Sat Jun
20 14:47:35 2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -106,7 +106,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${cxfDeployer}</deploymentConfig>
                     </deploymentConfigs>

Modified: geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -86,7 +86,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -114,7 +114,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Sat Jun 20 14:47:35
2009
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -95,7 +95,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Sat Jun 20
14:47:35 2009
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -83,7 +83,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -106,7 +106,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml Sat Jun 20 14:47:35
2009
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -91,7 +91,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -120,7 +120,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -113,7 +113,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${jpaDeployer}</deploymentConfig>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Sat Jun 20 14:47:35 2009
@@ -45,7 +45,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</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
 

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml Sat Jun 20 14:47:35 2009
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -98,7 +98,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Sat Jun
20 14:47:35 2009
@@ -47,7 +47,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -83,7 +83,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml?rev=786836&r1=786835&r2=786836&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml Sat Jun 20 14:47:35
2009
@@ -54,7 +54,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <artifactId>${jetty}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
+            <artifactId>${jetty}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -98,7 +98,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>



Mime
View raw message