You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/01/15 18:37:41 UTC

svn commit: r612169 - in /incubator/tuscany/branches/sca-java-1.1/samples: calculator-ws-webapp/src/main/webapp/WEB-INF/ helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/ helloworld-ws-service-webapp/src/main/webapp/WEB-INF/

Author: rfeng
Date: Tue Jan 15 09:37:32 2008
New Revision: 612169

URL: http://svn.apache.org/viewvc?rev=612169&view=rev
Log:
Merge the fix for TUSCANY-1986 from trunk

Added:
    incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r612166, incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
    incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r612166, incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
    incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r612166, incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml

Copied: incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (from r612166, incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?p2=incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&r1=612166&r2=612169&rev=612169&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 15 09:37:32 2008
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-calculator-ws-webapp</d:artifactId>
-            <d:version>1.2-incubating-SNAPSHOT</d:version>
+            <d:version>1.1-incubating-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->

Copied: incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (from r612166, incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?p2=incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&r1=612166&r2=612169&rev=612169&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 15 09:37:32 2008
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-sdo-webapp</d:artifactId>
-            <d:version>1.2-incubating-SNAPSHOT</d:version>
+            <d:version>1.1-incubating-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->

Copied: incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (from r612166, incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?p2=incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&r1=612166&r2=612169&rev=612169&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jan 15 09:37:32 2008
@@ -24,7 +24,7 @@
         <d:moduleId>
             <d:groupId>org.apache.tuscany.sca</d:groupId>
             <d:artifactId>sample-helloworld-ws-service-webapp</d:artifactId>
-            <d:version>1.2-incubating-SNAPSHOT</d:version>
+            <d:version>1.1-incubating-SNAPSHOT</d:version>
             <d:type>war</d:type>
         </d:moduleId>
         <!-- TUSCANY-1986 -->



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org