Update the travelsample with 2.x namespace/api/dependency (not completed yet)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923913 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 21 insertions, 21 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
index 94802269bb..3dcae3b88b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
@@ -22,9 +22,9 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent><version>2.0-SNAPSHOT</version>

     <artifactId>scatours-domainconfig-fullapp</artifactId>

     <name>Apache Tuscany SCA Tours Full App Domain Configuration</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
index 284376538a..addf035219 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
@@ -19,8 +19,8 @@
 -->

 <composite name="cloud.composite"

            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"

+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

+           xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"

            xmlns:ns2="http://tuscany.apache.org/cloud">

       

   <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
index b6d9d51cbc..73dce21da1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
index b42457154f..38dab5354e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
index 5c66ff2796..4a7429c3b0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
index 185112122c..56861dc4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
index 323700b4a0..0c0fcbc511 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
index b27b57fad5..4fb057536d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
index 7bec251965..fa19f52f7d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

         targetNamespace="http://tuscany.apache.org/cloud"

         xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
index e86bef1c56..1328021ce9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

 		targetNamespace="http://tuscany.apache.org/cloud"

 		xmlns:s="http://tuscanyscatours.com/"

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
index b26f71aa94..2413fea1af 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
@@ -19,8 +19,8 @@
 -->

 <composite name="domain.composite"

            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"

+           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

+           xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"

            xmlns:ns2="http://tuscanyscatours.com/">

        

   <include name="ns2:creditcard" uri="fullapp-creditcard" />         

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
index 9cc529cd90..f07dde2e95 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
@@ -22,9 +22,9 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent><version>2.0-SNAPSHOT</version>

     <artifactId>scatours-domainconfig-introducing</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Domain Configuration</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
index 5d400e1be8..3163b640ac 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
@@ -19,7 +19,7 @@
 -->
 <composite local="true" 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">
+  xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
   <include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
   <include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
   <include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
index adf8f0e9cb..4109f70a50 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
 
 	<component name="ClientNode">
 		<t:implementation.node uri="introducing-client" composite="c:Client" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
index 6e8f7fadb6..5d2853f644 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
 
 	<component name="ToursNode">
 		<t:implementation.node uri="introducing-tours" composite="c:Tours" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
index 9e4b454941..f0f1de9d9a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
 
 	<component name="TripsNode">
 		<t:implementation.node uri="introducing-trips" composite="c:Trips" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
index ec0f71484b..b610acd5c9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
@@ -19,7 +19,7 @@
 -->
 <composite local="true" name="domain"
   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">
+  xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
   <include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
   <include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
   <include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>