22 files changed, 32 insertions, 38 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
index 8ab8cff332..dbcacc4d7f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/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-contribution-currency-corba</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With CORBA Binding</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
index f22dd9b55d..6a067411f1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <import.java package="com.tuscanyscatours.currencyconverter"/>
     <import.java package="com.tuscanyscatours.currencyconverter.impl"/>
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
index 3fde6ea309..492689290a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
     targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
index ef1aa9fd3a..1b63b608fc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/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-contribution-currency-jms</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With JMS Binding</name>
 
@@ -50,12 +50,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
index 89ba1a3578..0eea8a6b52 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <import.java package="com.tuscanyscatours.currencyconverter" />
     <import.java package="com.tuscanyscatours.currencyconverter.impl" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
index ac34d6f562..cc73ceb3ef 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.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"
     targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
index 5942d4f911..3aa04a0b7d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/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-contribution-currency-jsp</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
index 50667b1ac0..cbd39d03d2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
     targetNamespace="http://tuscanyscatours.com/"
     name="CurrencyConverterJSP">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
index 0bd15a7895..7c3f88c18f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/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-contribution-currency-rmi</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With RMI Binding</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
index cf7325d247..e335c8d4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <import.java package="com.tuscanyscatours.currencyconverter" />
     <import.java package="com.tuscanyscatours.currencyconverter.impl" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
index 52df3a183f..07dea033c2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
     targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
index cc4ba525a1..bce29ad874 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/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-contribution-currency-servlet</artifactId>
     <packaging>war</packaging>
     <name>Apache Tuscany SCA Tours Currency Converter Servlet Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
index 3584ebbb93..465c667f0b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Reference;
 
 import com.tuscanyscatours.currencyconverter.CurrencyConverter;
 
@@ -43,7 +43,7 @@ public class CurrencyConverterServlet extends HttpServlet {
             // annotation in containers supporting SCA "deep" integration. In other 
             // environments in can be looked up from the ComponentContext.
             ComponentContext context =
-                (ComponentContext)config.getServletContext().getAttribute("org.osoa.sca.ComponentContext");
+                (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
             currencyConverter = context.getService(CurrencyConverter.class, "currencyConverter");
         }
     }
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
index c9ef16ee1b..ce73eb15aa 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
     targetNamespace="http://scatours.com"
     name="CurrencyConverterServlet">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
index 5d309faa85..5286b36170 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/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-contribution-currency-ws</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution With Web Service Binding</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
index cf7325d247..e335c8d4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <import.java package="com.tuscanyscatours.currencyconverter" />
     <import.java package="com.tuscanyscatours.currencyconverter.impl" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
index b048a826f1..a1be5f52c3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.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"
     targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
index 0b35063efa..fa9a7a4f34 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/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-contribution-currency</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution</name>
 
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
index b1f783bfba..3ebd23b2d0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
  */
 package com.tuscanyscatours.currencyconverter;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
index 6ad9a957c7..ee81973986 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
@@ -21,14 +21,14 @@ package com.tuscanyscatours.currencyconverter.impl;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 import com.tuscanyscatours.currencyconverter.CurrencyConverter;
 
 /**
  * An implementation of the CurrencyConverter service
  */
-@Service(interfaces = {CurrencyConverter.class})
+@Service({CurrencyConverter.class})
 public class CurrencyConverterImpl implements CurrencyConverter {
 
     // currency index
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
index b11328f405..cfd2a68821 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
     <export.java package="com.tuscanyscatours.currencyconverter" />
     <export.java package="com.tuscanyscatours.currencyconverter.impl" />
 </contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
index 41d0d325d4..edfa249cb9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.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"
     targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">