You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/09 23:30:38 UTC
svn commit: r654940 - in /geronimo/samples/branches/2.1/samples:
jaxws-calculator/ jaxws-calculator/jaxws-calculator-jetty/
jaxws-calculator/jaxws-calculator-jetty/src/
jaxws-calculator/jaxws-calculator-jetty/src/main/
jaxws-calculator/jaxws-calculator...
Author: jbohn
Date: Fri May 9 14:30:36 2008
New Revision: 654940
URL: http://svn.apache.org/viewvc?rev=654940&view=rev
Log:
merge r640490 from trunk - add plugins for rest of the samples
Added:
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/
geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/LICENSE.txt
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/NOTICE.txt
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/LICENSE.txt
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/NOTICE.txt
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/LICENSE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/LICENSE.txt
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/NOTICE.txt
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/NOTICE.txt
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
- copied, changed from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/
- copied from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/
geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
- copied unchanged from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml
Modified:
geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
geronimo/samples/branches/2.1/samples/sendmail/pom.xml
Copied: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (from r640490, geronimo/samples/trunk/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?p2=geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml&p1=geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Copied: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (from r640490, geronimo/samples/trunk/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?p2=geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml&p1=geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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=654940&r1=654939&r2=654940&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Fri May 9 14:30:36 2008
@@ -42,6 +42,8 @@
<modules>
<module>jaxws-calculator-war</module>
<module>jaxws-calculator-ear</module>
+ <module>jaxws-calculator-jetty</module>
+ <module>jaxws-calculator-tomcat</module>
</modules>
<build>
Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml?rev=654940&r1=654939&r2=654940&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml Fri May 9 14:30:36 2008
@@ -8,7 +8,7 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
Copied: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?p2=geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml&p1=geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jms-mdb-sample</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Copied: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (from r640490, geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml?p2=geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml&p1=geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jms-mdb-sample</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml?rev=654940&r1=654939&r2=654940&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml Fri May 9 14:30:36 2008
@@ -43,6 +43,8 @@
<module>jms-mdb-sample-ejb</module>
<module>jms-mdb-sample-war</module>
<module>jms-mdb-sample-ear</module>
+ <module>jms-mdb-sample-jetty</module>
+ <module>jms-mdb-sample-tomcat</module>
</modules>
<dependencies>
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=654940&r1=654939&r2=654940&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/pom.xml Fri May 9 14:30:36 2008
@@ -42,6 +42,8 @@
<modules>
<module>sendmail-war</module>
<module>sendmail-ear</module>
+ <module>sendmail-jetty</module>
+ <module>sendmail-tomcat</module>
</modules>
<build>
Copied: geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml (from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml?p2=geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml&p1=geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Copied: geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml (from r640490, geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml?p2=geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml&p1=geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml&r1=640490&r2=654940&rev=654940&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml Fri May 9 14:30:36 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>