You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/12/29 10:20:35 UTC
svn commit: r729845 - in /tuscany/branches/sca-java-1.x/samples:
calculator-webapp/src/main/webapp/META-INF/
calculator-ws-secure-webapp/src/main/webapp/META-INF/
calculator-ws-webapp/src/main/webapp/META-INF/
chat-webapp/src/main/webapp/META-INF/ cust...
Author: antelder
Date: Mon Dec 29 01:20:34 2008
New Revision: 729845
URL: http://svn.apache.org/viewvc?rev=729845&view=rev
Log:
Merge sca-contribution file target namespace fix from 1.4 branch to 1.x
Modified:
tuscany/branches/sca-java-1.x/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/ (props changed)
tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
Modified: tuscany/branches/sca-java-1.x/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:Calculator"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:Calculator"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:Calculator"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:Chat"/>
</contribution>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 29 01:20:34 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/customer-dojo:671193
+/tuscany/branches/sca-java-1.4/samples/customer-dojo-webapp:727449
Modified: tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:customer"/>
</contribution>
Modified: tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:customer"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:customer"/>
</contribution>
Modified: tuscany/branches/sca-java-1.x/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:Domain"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://aggregator"
xmlns:a="http://aggregator">
<deployable composite="a:FeedAggregator"/>
</contribution>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:helloworldjsonrpc"/>
</contribution>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:helloworldjsonrpc"/>
</contribution>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=729845&r1=729844&r2=729845&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Dec 29 01:20:34 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:helloworldws"/>
</contribution>
\ No newline at end of file