You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/05/31 00:06:21 UTC
svn commit: r661893 - in /geronimo/samples/trunk/samples:
app-per-port/app-per-port-tomcat/src/main/plan/ bank/bank-jetty/
bank/bank-tomcat/ inventory/ inventory/inventory-ear/
inventory/inventory-jetty/ inventory/inventory-jetty/src/main/plan/
invento...
Author: djencks
Date: Fri May 30 15:06:21 2008
New Revision: 661893
URL: http://svn.apache.org/viewvc?rev=661893&view=rev
Log:
naming convention 3, remove unneeded ears from web-only projects
Removed:
geronimo/samples/trunk/samples/inventory/inventory-ear/
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/
geronimo/samples/trunk/samples/sendmail/sendmail-ear/
Modified:
geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml
geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/inventory/pom.xml
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/jaxws-calculator/pom.xml
geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
geronimo/samples/trunk/samples/sample-datasource/pom.xml
geronimo/samples/trunk/samples/sendmail/pom.xml
geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml
geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml Fri May 30 15:06:21 2008
@@ -43,7 +43,7 @@
<gbean name="TomcatWebConnector1" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
<attribute name="name">HTTP</attribute>
<attribute name="host">localhost</attribute>
- <attribute name="port">8081</attribute>
+ <attribute name="port">8090</attribute>
<attribute name="maxHttpHeaderSize">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
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=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Fri May 30 15:06:21 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/trunk/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml Fri May 30 15:06:21 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/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/pom.xml Fri May 30 15:06:21 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/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=661893&r1=661892&r2=661893&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 Fri May 30 15:06:21 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/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/pom.xml Fri May 30 15:06:21 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/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml Fri May 30 15:06:21 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/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sample-datasource/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sample-datasource/pom.xml (original)
+++ geronimo/samples/trunk/samples/sample-datasource/pom.xml Fri May 30 15:06:21 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/trunk/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/pom.xml Fri May 30 15:06:21 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/trunk/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml Fri May 30 15:06:21 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/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml Fri May 30 15:06:21 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/trunk/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml Fri May 30 15:06:21 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/trunk/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml Fri May 30 15:06:21 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/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=661893&r1=661892&r2=661893&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri May 30 15:06:21 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>