Author: jsdelfino
Date: Fri Mar 21 13:42:34 2008
New Revision: 639820
URL: http://svn.apache.org/viewvc?rev=639820&view=rev
Log:
Merged changes from trunk SVN revision r639817. Simplified cloud contribution
uri and namespace.
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite
(original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud.composite Fri
Mar 21 13:42:34 2008
@@ -20,12 +20,12 @@
<composite name="cloud"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0/";
xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0";>
- <include name="ns2:CurrencyNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:CatalogsNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:StoreNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:StoreMergerNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:StoreDBNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:StoreSupplierNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:StoreEUNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
- <include name="ns2:CatalogWebAppNode"
uri="http://tuscany.apache.org/xmlns/sca/1.0/cloud"; xmlns:ns2="cloud:/"/>
+ <include name="ns2:CurrencyNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:CatalogsNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:StoreNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:StoreMergerNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:StoreDBNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:StoreSupplierNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:StoreEUNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
+ <include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud";
xmlns:ns2="http://tuscany.apache.org/cloud"/>
</composite>
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogWebAppNode.composite
Fri Mar 21 13:42:34 2008
@@ -20,7 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:c="http://catalog";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
name="CatalogWebAppNode">
<component name="CatalogWebAppNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CatalogsNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:c="http://cloud";
name="CatalogsNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/CurrencyNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:c="http://cloud";
name="CurrencyNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreDBNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:s="http://store";
name="StoreDBNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreEUNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:s="http://store";
name="StoreEUNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreMergerNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:s="http://store";
name="StoreMergerNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:s="http://store";
name="StoreNode">
Modified:
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite?rev=639820&r1=639819&r2=639820&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite
(original)
+++
incubator/tuscany/branches/sca-java-1.2/tutorial/domain/cloud/StoreSupplierNode.composite
Fri Mar 21 13:42:34 2008
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="cloud:/"
+ targetNamespace="http://tuscany.apache.org/cloud";
xmlns:s="http://store";
name="StoreSupplierNode">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
