Refactor some of the extensions and remove unnecessary namespace prefixes.

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

19 files changed, 162 insertions, 181 deletions

diff --git a/sca-cpp/trunk/samples/loan-python/loan.composite b/sca-cpp/trunk/samples/loan-python/loan.composite
index 0e64b5bf44..9052737cf0 100644
--- a/sca-cpp/trunk/samples/loan-python/loan.composite
+++ b/sca-cpp/trunk/samples/loan-python/loan.composite
@@ -18,19 +18,18 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="LoanApprovalUI">
-        <t:implementation.widget/>
+        <implementation.widget/>
         <reference name="loanApproval" target="LoanApproval"/>
     </component>
     
     <component name="LoanApproval">
-        <t:implementation.python script="loan-approval.py"/>
+        <implementation.python script="loan-approval.py"/>
         <service name="LoanApproval">
-            <t:binding.atom uri="loan-approval"/>
+            <binding.atom uri="loan-approval"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
@@ -38,7 +37,7 @@
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
diff --git a/sca-cpp/trunk/samples/relay-gae/domain.composite b/sca-cpp/trunk/samples/relay-gae/domain.composite
index 7f7302955e..470ac88da1 100644
--- a/sca-cpp/trunk/samples/relay-gae/domain.composite
+++ b/sca-cpp/trunk/samples/relay-gae/domain.composite
@@ -18,57 +18,56 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://relay"
   name="relay">
         
     <component name="JSONTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="jsontwit"/>
+            <binding.http uri="jsontwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="XMLTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="xmltwit"/>
+            <binding.http uri="xmltwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="RSSTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="rsstwit"/>
+            <binding.http uri="rsstwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="HTML">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="html"/>
+            <binding.http uri="html"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://people.apache.org/~jsdelfino/"/>
+            <binding.http uri="http://people.apache.org/~jsdelfino/"/>
         </reference>
     </component>
     
     <component name="JSONFB">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="jsonfb"/>
+            <binding.http uri="jsonfb"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="https://graph.facebook.com/100001053301307"/>
+            <binding.http uri="https://graph.facebook.com/100001053301307"/>
         </reference>
     </component>
     
diff --git a/sca-cpp/trunk/samples/relay-python/relay.composite b/sca-cpp/trunk/samples/relay-python/relay.composite
index 7f7302955e..470ac88da1 100644
--- a/sca-cpp/trunk/samples/relay-python/relay.composite
+++ b/sca-cpp/trunk/samples/relay-python/relay.composite
@@ -18,57 +18,56 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://relay"
   name="relay">
         
     <component name="JSONTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="jsontwit"/>
+            <binding.http uri="jsontwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.json?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="XMLTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="xmltwit"/>
+            <binding.http uri="xmltwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.xml?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="RSSTwit">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="rsstwit"/>
+            <binding.http uri="rsstwit"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
+            <binding.http uri="http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=jsdelfino"/>
         </reference>
     </component>
     
     <component name="HTML">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="html"/>
+            <binding.http uri="html"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://people.apache.org/~jsdelfino/"/>
+            <binding.http uri="http://people.apache.org/~jsdelfino/"/>
         </reference>
     </component>
     
     <component name="JSONFB">
-        <t:implementation.python script="relay.py"/>
+        <implementation.python script="relay.py"/>
         <service name="Relay">
-            <t:binding.http uri="jsonfb"/>
+            <binding.http uri="jsonfb"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="https://graph.facebook.com/100001053301307"/>
+            <binding.http uri="https://graph.facebook.com/100001053301307"/>
         </reference>
     </component>
     
diff --git a/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite b/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
index 137027a50c..c8955af24e 100644
--- a/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
+++ b/sca-cpp/trunk/samples/store-cluster/domains/jane/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,31 +32,31 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <property name="host">localhost</property>
         <property name="email">anonymous@localhost</property>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>
     </component>
 
diff --git a/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite b/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
index 137027a50c..c8955af24e 100644
--- a/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
+++ b/sca-cpp/trunk/samples/store-cluster/domains/joe/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,31 +32,31 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <property name="host">localhost</property>
         <property name="email">anonymous@localhost</property>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>
     </component>
 
diff --git a/sca-cpp/trunk/samples/store-cluster/shared/shared.composite b/sca-cpp/trunk/samples/store-cluster/shared/shared.composite
index b7eae5f78a..13b6fd5c80 100644
--- a/sca-cpp/trunk/samples/store-cluster/shared/shared.composite
+++ b/sca-cpp/trunk/samples/store-cluster/shared/shared.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://shared"
   name="shared">
         
     <component name="Cache">
         <implementation.cpp path="../../../components/cache" library="libdatacache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <reference name="l1reader" target="Memcache"/>
         <reference name="l1writer" target="Memcache"/>
@@ -36,7 +35,7 @@
     <component name="Memcache">
         <implementation.cpp path="../../../components/cache" library="libmemcache"/>
         <service name="Memcache">
-            <t:binding.atom uri="memcache"/>
+            <binding.atom uri="memcache"/>
         </service>
         <property name="servers">localhost:11211,localhost:11212,localhost:11213</property>
     </component>
@@ -46,7 +45,7 @@
         <property name="conninfo">host=localhost port=5432 dbname=db</property>
         <property name="table">store</property>
         <service name="Masterdb">
-            <t:binding.atom uri="masterdb"/>
+            <binding.atom uri="masterdb"/>
         </service>
     </component>
 
@@ -55,7 +54,7 @@
         <property name="conninfo">host=localhost port=5433 dbname=db</property>
         <property name="table">store</property>
         <service name="Standbydb">
-            <t:binding.atom uri="standbydb"/>
+            <binding.atom uri="standbydb"/>
         </service>
     </component>
 
diff --git a/sca-cpp/trunk/samples/store-cpp/store.composite b/sca-cpp/trunk/samples/store-cpp/store.composite
index 8b5edede99..5285f5d0c5 100644
--- a/sca-cpp/trunk/samples/store-cpp/store.composite
+++ b/sca-cpp/trunk/samples/store-cpp/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.widget location="store.html"/>
+        <implementation.widget location="store.html"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -36,7 +35,7 @@
         <implementation.cpp path="." library="libfruits-catalog"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
@@ -44,10 +43,10 @@
     <component name="ShoppingCart">
         <implementation.cpp path="." library="libshopping-cart"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
@@ -55,14 +54,14 @@
     <component name="CurrencyConverter">
         <implementation.cpp path="." library="libcurrency-converter"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
diff --git a/sca-cpp/trunk/samples/store-gae/domain-backend.composite b/sca-cpp/trunk/samples/store-gae/domain-backend.composite
index a543b9a6b5..13fa8406e2 100644
--- a/sca-cpp/trunk/samples/store-gae/domain-backend.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-backend.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store-backend">
         
     <component name="Cache">
         <implementation.python script="gmemcache.py"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-gae/domain-frontend.composite b/sca-cpp/trunk/samples/store-gae/domain-frontend.composite
index e7e10e2de1..181e86c100 100644
--- a/sca-cpp/trunk/samples/store-gae/domain-frontend.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-frontend.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store-frontend">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,33 +32,33 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache">
-            <t:binding.http uri="https://sca-store-backend.appspot.com/cache"/>
+            <binding.http uri="https://sca-store-backend.appspot.com/cache"/>
         </reference>
         <property name="host">localhost</property>
         <property name="email">anonymous@example.com</property>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-gae/domain-single.composite b/sca-cpp/trunk/samples/store-gae/domain-single.composite
index 4a5d53e695..79c5aca8e1 100644
--- a/sca-cpp/trunk/samples/store-gae/domain-single.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-single.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,21 +32,21 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
         <property name="host">localhost</property>
@@ -55,16 +54,16 @@
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.python script="gmemcache.py"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-gae/domain.composite b/sca-cpp/trunk/samples/store-gae/domain.composite
index 4a5d53e695..79c5aca8e1 100644
--- a/sca-cpp/trunk/samples/store-gae/domain.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,21 +32,21 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
         <property name="host">localhost</property>
@@ -55,16 +54,16 @@
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.python script="gmemcache.py"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-java/store.composite b/sca-cpp/trunk/samples/store-java/store.composite
index 4b0db9d05c..59c2310a60 100644
--- a/sca-cpp/trunk/samples/store-java/store.composite
+++ b/sca-cpp/trunk/samples/store-java/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.widget location="store.html"/>
+        <implementation.widget location="store.html"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -36,7 +35,7 @@
         <implementation.java class="store.FruitsCatalogImpl"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
@@ -44,10 +43,10 @@
     <component name="ShoppingCart">
         <implementation.java class="store.ShoppingCartImpl"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
@@ -55,14 +54,14 @@
     <component name="CurrencyConverter">
         <implementation.java class="store.CurrencyConverterImpl"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
diff --git a/sca-cpp/trunk/samples/store-nosql/store.composite b/sca-cpp/trunk/samples/store-nosql/store.composite
index 90e4323318..5989b698b0 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.composite
+++ b/sca-cpp/trunk/samples/store-nosql/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.scheme script="store.scm"/>
+        <implementation.scheme script="store.scm"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,29 +32,29 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.scheme script="fruits-catalog.scm"/> 
+        <implementation.scheme script="fruits-catalog.scm"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.scheme script="shopping-cart.scm"/>
+        <implementation.scheme script="shopping-cart.scm"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="NoSqldb"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.scheme script="currency-converter.scm"/>
+        <implementation.scheme script="currency-converter.scm"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
@@ -63,7 +62,7 @@
         <implementation.cpp path="../../components/nosqldb" library="libnosqldb"/>
         <property name="dbname">tmp/store.cdb</property>
         <service name="NoSqldb">
-            <t:binding.atom uri="nosqldb"/>
+            <binding.atom uri="nosqldb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-python/store.composite b/sca-cpp/trunk/samples/store-python/store.composite
index 912898123b..d33667e897 100644
--- a/sca-cpp/trunk/samples/store-python/store.composite
+++ b/sca-cpp/trunk/samples/store-python/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,36 +32,36 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
diff --git a/sca-cpp/trunk/samples/store-scheme/store.composite b/sca-cpp/trunk/samples/store-scheme/store.composite
index fd58ae6c9d..043c8214c0 100644
--- a/sca-cpp/trunk/samples/store-scheme/store.composite
+++ b/sca-cpp/trunk/samples/store-scheme/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.scheme script="store.scm"/>
+        <implementation.scheme script="store.scm"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,36 +32,36 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.scheme script="fruits-catalog.scm"/> 
+        <implementation.scheme script="fruits-catalog.scm"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.scheme script="shopping-cart.scm"/>
+        <implementation.scheme script="shopping-cart.scm"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.scheme script="currency-converter.scm"/>
+        <implementation.scheme script="currency-converter.scm"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
diff --git a/sca-cpp/trunk/samples/store-sql/store.composite b/sca-cpp/trunk/samples/store-sql/store.composite
index a10740b5f9..2bdaa4f7b5 100644
--- a/sca-cpp/trunk/samples/store-sql/store.composite
+++ b/sca-cpp/trunk/samples/store-sql/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.scheme script="store.scm"/>
+        <implementation.scheme script="store.scm"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,36 +32,36 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.scheme script="fruits-catalog.scm"/> 
+        <implementation.scheme script="fruits-catalog.scm"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.scheme script="shopping-cart.scm"/>
+        <implementation.scheme script="shopping-cart.scm"/>
         <service name="Cart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.scheme script="currency-converter.scm"/>
+        <implementation.scheme script="currency-converter.scm"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
         <implementation.cpp path="../../components/cache" library="libdatacache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <reference name="l1reader" target="Memcache"/>
         <reference name="l1writer" target="Memcache"/>
@@ -73,7 +72,7 @@
     <component name="Memcache">
         <implementation.cpp path="../../components/cache" library="libmemcache"/>
         <service name="Memcache">
-            <t:binding.atom uri="memcache"/>
+            <binding.atom uri="memcache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>     
@@ -83,7 +82,7 @@
         <property name="conninfo">host=localhost port=5432 dbname=db</property>
         <property name="table">store</property>
         <service name="Sqldb">
-            <t:binding.atom uri="sqldb"/>
+            <binding.atom uri="sqldb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite b/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
index 01553025d9..58e5832bcf 100644
--- a/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
+++ b/sca-cpp/trunk/samples/store-vhost/domains/jane/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,29 +32,29 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite b/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
index 01553025d9..58e5832bcf 100644
--- a/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
+++ b/sca-cpp/trunk/samples/store-vhost/domains/joe/store.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://store"
   name="store">
         
     <component name="Store">
-        <t:implementation.python script="store.py"/>
+        <implementation.python script="store.py"/>
         <service name="Widget">
-            <t:binding.http uri="store"/>
+            <binding.http uri="store"/>
         </service>
         <reference name="catalog" target="Catalog"/>
         <reference name="shoppingCart" target="ShoppingCart/Cart"/>
@@ -33,29 +32,29 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python script="fruits-catalog.py"/> 
+        <implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
-            <t:binding.jsonrpc uri="catalog"/>
+            <binding.jsonrpc uri="catalog"/>
         </service>
         <reference name="currencyConverter" target="CurrencyConverter"/>
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python script="shopping-cart.py"/>
+        <implementation.python script="shopping-cart.py"/>
         <service name="ShoppingCart">
-            <t:binding.atom uri="shoppingCart"/>
+            <binding.atom uri="shoppingCart"/>
         </service>        
         <service name="Total">
-            <t:binding.jsonrpc uri="total"/>
+            <binding.jsonrpc uri="total"/>
         </service>        
         <reference name="cache" target="Cache"/>
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python script="currency-converter.py"/>
+        <implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
-            <t:binding.jsonrpc uri="currencyConverter"/>
+            <binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
diff --git a/sca-cpp/trunk/samples/store-vhost/shared/shared.composite b/sca-cpp/trunk/samples/store-vhost/shared/shared.composite
index 55a0c1f8d6..b94f8f43d6 100644
--- a/sca-cpp/trunk/samples/store-vhost/shared/shared.composite
+++ b/sca-cpp/trunk/samples/store-vhost/shared/shared.composite
@@ -18,14 +18,13 @@
  * under the License.    
 -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
   targetNamespace="http://shared"
   name="shared">
         
     <component name="Cache">
         <implementation.cpp path="../../../components/cache" library="libmemcache"/>
         <service name="Cache">
-            <t:binding.atom uri="cache"/>
+            <binding.atom uri="cache"/>
         </service>
         <property name="servers">localhost:11211</property>
     </component>