geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r662489 - in /geronimo/samples/branches/2.1/samples: bank/bank-jetty/ bank/bank-tomcat/ inventory/ inventory/inventory-ear/ inventory/inventory-jetty/ inventory/inventory-jetty/src/main/plan/ inventory/inventory-tomcat/ inventory/inventory-...
Date Mon, 02 Jun 2008 17:14:00 GMT
Author: jbohn
Date: Mon Jun  2 10:13:59 2008
New Revision: 662489

URL: http://svn.apache.org/viewvc?rev=662489&view=rev
Log:
merge 661893 from trunk - naming convention 3, remove unneeded ears from web-only projects

Removed:
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/
Modified:
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml Mon Jun  2 10:13:59 2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml Mon Jun  2 10:13:59 2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml Mon Jun  2 10:13:59
2008
@@ -40,14 +40,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>inventory-ear</artifactId>
+            <artifactId>inventory-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -104,9 +104,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>inventory-ear</artifactId>
+                        <artifactId>inventory-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
Mon Jun  2 10:13:59 2008
@@ -19,6 +19,13 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-</application>
+    <context-root>/inventory</context-root>
+
+    <!-- define a reference name to the db pool-->
+    <resource-ref>
+        <ref-name>jdbc/InventoryDS</ref-name>
+        <resource-link>SampleTxDatasource</resource-link>
+    </resource-ref>
+</web-app>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml Mon Jun  2 10:13:59
2008
@@ -40,14 +40,14 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>inventory-ear</artifactId>
+            <artifactId>inventory-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -104,9 +104,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>inventory-ear</artifactId>
+                        <artifactId>inventory-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
Mon Jun  2 10:13:59 2008
@@ -19,6 +19,13 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-</application>
+    <context-root>/inventory</context-root>
+
+    <!-- define a reference name to the db pool-->
+    <resource-ref>
+        <ref-name>jdbc/InventoryDS</ref-name>
+        <resource-link>SampleTxDatasource</resource-link>
+    </resource-ref>
+</web-app>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/pom.xml Mon Jun  2 10:13:59 2008
@@ -40,7 +40,6 @@
     
    <modules>
         <module>inventory-war</module>
-        <module>inventory-ear</module>
         <module>inventory-jetty</module>
         <module>inventory-tomcat</module>
     </modules>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
(original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
Mon Jun  2 10:13:59 2008
@@ -40,9 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-ear</artifactId>
+            <artifactId>jaxws-calculator-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
         </dependency>
 
         <dependency>
@@ -111,9 +111,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>jaxws-calculator-ear</artifactId>
+                        <artifactId>jaxws-calculator-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
Mon Jun  2 10:13:59 2008
@@ -19,6 +19,19 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
 
-</application>
+ <context-root>/jaxws-calculator</context-root>
+
+ <service-ref>
+   <service-ref-name>services/Calculator</service-ref-name>
+   <port>
+      <port-name>CalculatorPort</port-name>
+      <protocol>http</protocol>
+      <host>localhost</host>
+      <port>8080</port>
+      <uri>/jaxws-calculator/calculator</uri>
+   </port>
+ </service-ref>
+
+</web-app>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
(original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
Mon Jun  2 10:13:59 2008
@@ -40,9 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-ear</artifactId>
+            <artifactId>jaxws-calculator-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
         
@@ -112,9 +112,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>jaxws-calculator-ear</artifactId>
+                        <artifactId>jaxws-calculator-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
Mon Jun  2 10:13:59 2008
@@ -19,6 +19,20 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+
+ <context-root>/jaxws-calculator</context-root>
+
+ <service-ref>
+   <service-ref-name>services/Calculator</service-ref-name>
+   <port>
+      <port-name>CalculatorPort</port-name>
+      <protocol>http</protocol>
+      <host>localhost</host>
+      <port>8080</port>
+      <uri>/jaxws-calculator/calculator</uri>
+   </port>
+ </service-ref>
+
+</web-app>
 
-</application>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Mon Jun  2 10:13:59 2008
@@ -40,7 +40,6 @@
     
    <modules>
         <module>jaxws-calculator-war</module>
-        <module>jaxws-calculator-ear</module>
         <module>jaxws-calculator-jetty</module>
         <module>jaxws-calculator-tomcat</module>
     </modules>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml Mon Jun  2
10:13:59 2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml Mon Jun 
2 10:13:59 2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml Mon Jun  2 10:13:59 2008
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.samples</groupId>
-    <artifactId>SampleDatasource</artifactId>
+    <artifactId>sample-datasource</artifactId>
     <packaging>car</packaging>
     <dependencies>
         <dependency>

Modified: geronimo/samples/branches/2.1/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/pom.xml Mon Jun  2 10:13:59 2008
@@ -40,7 +40,6 @@
     
    <modules>
         <module>sendmail-war</module>
-        <module>sendmail-ear</module>
         <module>sendmail-jetty</module>
         <module>sendmail-tomcat</module>
     </modules>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml Mon Jun  2 10:13:59
2008
@@ -40,9 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>sendmail-ear</artifactId>
+            <artifactId>sendmail-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
 
@@ -103,9 +103,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>sendmail-ear</artifactId>
+                        <artifactId>sendmail-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml Mon
Jun  2 10:13:59 2008
@@ -19,6 +19,12 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-   
-</application>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <context-root>/sendmail</context-root>
+    <resource-ref>
+        <!-- Used is web.xml -->
+        <ref-name>mail/testMailSession</ref-name>
+        <!-- Default Geronimo mail session -->
+        <resource-link>mail/MailSession</resource-link>
+    </resource-ref>
+</web-app>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml Mon Jun  2 10:13:59
2008
@@ -40,9 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>sendmail-ear</artifactId>
+            <artifactId>sendmail-war</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
         
@@ -103,9 +103,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.samples</groupId>
-                        <artifactId>sendmail-ear</artifactId>
+                        <artifactId>sendmail-war</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
Mon Jun  2 10:13:59 2008
@@ -19,6 +19,12 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-   
-</application>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <context-root>/sendmail</context-root>
+    <resource-ref>
+        <!-- Used is web.xml -->
+        <ref-name>mail/testMailSession</ref-name>
+        <!-- Default Geronimo mail session -->
+        <resource-link>mail/MailSession</resource-link>
+    </resource-ref>
+</web-app>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml Mon Jun  2 10:13:59
2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml Mon Jun  2
10:13:59 2008
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>SampleDatasource</artifactId>
+            <artifactId>sample-datasource</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=662489&r1=662488&r2=662489&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
Mon Jun  2 10:13:59 2008
@@ -30,7 +30,7 @@
     <dep:dependencies>
       <dep:dependency>
         <dep:groupId>org.apache.geronimo.samples</dep:groupId>
-        <dep:artifactId>SampleDatasource</dep:artifactId>
+        <dep:artifactId>sample-datasource</dep:artifactId>
         <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>



Mime
View raw message