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

39 files changed, 240 insertions, 275 deletions

diff --git a/sca-cpp/trunk/components/cache/cache.composite b/sca-cpp/trunk/components/cache/cache.composite
index 1f3302614d..2f22e424f9 100644
--- a/sca-cpp/trunk/components/cache/cache.composite
+++ b/sca-cpp/trunk/components/cache/cache.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://tuscany.apache.org/xmlns/sca/components"
   name="memcache">
         
     <component name="memcache">
         <implementation.cpp path="." library="libmemcache"/>
         <service name="memcache">
-            <t:binding.http uri="memcache"/>
+            <binding.http uri="memcache"/>
         </service>
         <property name="servers">localhost,localhost:11212,localhost:11213</property>
     </component>
@@ -33,7 +32,7 @@
     <component name="l2cache">
         <implementation.cpp path="." library="libmemcache"/>
         <service name="l2cache">
-            <t:binding.http uri="l2cache"/>
+            <binding.http uri="l2cache"/>
         </service>
         <property name="servers">localhost:11411,localhost:11412,localhost:11413</property>
     </component>
@@ -41,7 +40,7 @@
     <component name="datacache">
         <implementation.cpp path="." library="libdatacache"/>
         <service name="datacache">
-            <t:binding.http uri="datacache"/>
+            <binding.http uri="datacache"/>
         </service>
         <reference name="l1reader" target="memcache"/>
         <reference name="l1writer" target="memcache"/>
@@ -52,7 +51,7 @@
     <component name="memocache">
         <implementation.cpp path="." library="libmemocache"/>
         <service name="memocache">
-            <t:binding.http uri="memocache"/>
+            <binding.http uri="memocache"/>
         </service>
         <reference name="relay" target="adder"/>
         <reference name="cache" target="memcache"/>
@@ -61,7 +60,7 @@
     <component name="adder">
         <implementation.scheme script="adder-test.scm"/>
         <service name="adder">
-            <t:binding.http uri="adder"/>
+            <binding.http uri="adder"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/chat/chat.composite b/sca-cpp/trunk/components/chat/chat.composite
index 9eada5c372..3318ae6d8d 100644
--- a/sca-cpp/trunk/components/chat/chat.composite
+++ b/sca-cpp/trunk/components/chat/chat.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="chat">
         
@@ -27,7 +26,7 @@
         <property name="jid">sca1@localhost</property>
         <property name="password">sca1</property>
         <service name="print-sender">
-            <t:binding.http uri="print-sender"/>
+            <binding.http uri="print-sender"/>
         </service>
     </component>
 
@@ -36,15 +35,15 @@
         <property name="jid">sca2@localhost</property>
         <property name="password">sca2</property>
         <service name="print-chatter">
-            <t:binding.http uri="print-chatter"/>
+            <binding.http uri="print-chatter"/>
         </service>
         <reference name="relay" target="print"/>
     </component>
 
     <component name="print">
-        <t:implementation.scheme script="server-test.scm"/>
+        <implementation.scheme script="server-test.scm"/>
         <service name="print">
-            <t:binding.http uri="print"/>
+            <binding.http uri="print"/>
         </service>
         <reference name="report" target="print-chatter"/>
     </component>     
diff --git a/sca-cpp/trunk/components/filedb/filedb.composite b/sca-cpp/trunk/components/filedb/filedb.composite
index 05a2d50847..e6cc69b9db 100644
--- a/sca-cpp/trunk/components/filedb/filedb.composite
+++ b/sca-cpp/trunk/components/filedb/filedb.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="filedb">
         
@@ -27,7 +26,7 @@
         <property name="dbname">tmp/testdb</property>
         <property name="format">scheme</property>
         <service name="filedb">
-            <t:binding.http uri="filedb"/>
+            <binding.http uri="filedb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/http/http.composite b/sca-cpp/trunk/components/http/http.composite
index 53f574a0e0..43d9fb6413 100644
--- a/sca-cpp/trunk/components/http/http.composite
+++ b/sca-cpp/trunk/components/http/http.composite
@@ -18,22 +18,21 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="http">
         
     <component name="httpget">
         <implementation.cpp path="." library="libhttpget"/>
         <service name="httpget">
-            <t:binding.http uri="httpget"/>
+            <binding.http uri="httpget"/>
         </service>
         <reference name="url" target="url-test"/>
     </component>
 
     <component name="url-test">
-        <t:implementation.scheme script="url-test.scm"/>
+        <implementation.scheme script="url-test.scm"/>
         <service name="url-test">
-            <t:binding.http uri="url-test"/>
+            <binding.http uri="url-test"/>
         </service>
     </component>
 
diff --git a/sca-cpp/trunk/components/log/log.composite b/sca-cpp/trunk/components/log/log.composite
index 3e13c410fa..97754b534c 100644
--- a/sca-cpp/trunk/components/log/log.composite
+++ b/sca-cpp/trunk/components/log/log.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="log">
         
@@ -26,14 +25,14 @@
         <implementation.cpp path="." library="liblog"/>
         <property name="category">default</property>
         <service name="log">
-            <t:binding.http uri="log"/>
+            <binding.http uri="log"/>
         </service>
     </component>     
 
     <component name="client">
         <implementation.scheme script="client-test.scm"/>
         <service name="client">
-            <t:binding.http uri="client"/>
+            <binding.http uri="client"/>
         </service>
         <reference name="adder" target="logger"/>
     </component>     
@@ -42,7 +41,7 @@
         <implementation.cpp path="." library="liblogger"/>
         <property name="category">default</property>
         <service name="logger">
-            <t:binding.http uri="logger"/>
+            <binding.http uri="logger"/>
         </service>
         <reference name="relay" target="adder"/>
     </component>     
@@ -50,7 +49,7 @@
     <component name="adder">
         <implementation.scheme script="adder-test.scm"/>
         <service name="adder">
-            <t:binding.http uri="adder"/>
+            <binding.http uri="adder"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb.composite b/sca-cpp/trunk/components/nosqldb/nosqldb.composite
index af2d3a18d7..15c030a72c 100644
--- a/sca-cpp/trunk/components/nosqldb/nosqldb.composite
+++ b/sca-cpp/trunk/components/nosqldb/nosqldb.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="nosqldb">
         
@@ -26,7 +25,7 @@
         <implementation.cpp path="." library="libnosqldb"/>
         <property name="dbname">tmp/test.cdb</property>
         <service name="nosqldb">
-            <t:binding.http uri="nosqldb"/>
+            <binding.http uri="nosqldb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/queue/queue.composite b/sca-cpp/trunk/components/queue/queue.composite
index e8fb1b1049..9b6939e4bc 100644
--- a/sca-cpp/trunk/components/queue/queue.composite
+++ b/sca-cpp/trunk/components/queue/queue.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="queue">
         
@@ -26,7 +25,7 @@
         <implementation.cpp path="." library="libqueue-sender"/>
         <property name="key">print</property>
         <service name="print-sender">
-            <t:binding.http uri="print-sender"/>
+            <binding.http uri="print-sender"/>
         </service>
     </component>
 
@@ -38,9 +37,9 @@
     </component>
 
     <component name="print">
-        <t:implementation.scheme script="server-test.scm"/>
+        <implementation.scheme script="server-test.scm"/>
         <service name="print">
-            <t:binding.http uri="print"/>
+            <binding.http uri="print"/>
         </service>
         <reference name="report" target="report-sender"/>
     </component>     
@@ -49,7 +48,7 @@
         <implementation.cpp path="." library="libqueue-sender"/>
         <property name="key">report</property>
         <service name="report-sender">
-            <t:binding.http uri="report-sender"/>
+            <binding.http uri="report-sender"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/sqldb/sqldb.composite b/sca-cpp/trunk/components/sqldb/sqldb.composite
index 1511e66024..19bafd8eca 100644
--- a/sca-cpp/trunk/components/sqldb/sqldb.composite
+++ b/sca-cpp/trunk/components/sqldb/sqldb.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="sqldb">
         
@@ -27,7 +26,7 @@
         <property name="conninfo">host=localhost port=5432 dbname=db</property>
         <property name="table">test</property>
         <service name="sqldb">
-            <t:binding.http uri="sqldb"/>
+            <binding.http uri="sqldb"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/components/webservice/webservice.composite b/sca-cpp/trunk/components/webservice/webservice.composite
index 0169f5eb3a..7b7c76b632 100644
--- a/sca-cpp/trunk/components/webservice/webservice.composite
+++ b/sca-cpp/trunk/components/webservice/webservice.composite
@@ -18,7 +18,6 @@
  * 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://tuscany.apache.org/xmlns/sca/components"
   name="webservice">
         
@@ -26,22 +25,22 @@
         <implementation.cpp path="." library="libwebservice-client"/>
         <property name="uri">http://localhost:9090/axis2/services/echo</property>
         <service name="webservice-client">
-            <t:binding.jsonrpc uri="echo-client"/>
+            <binding.jsonrpc uri="echo-client"/>
         </service>
     </component>     
 
     <component name="webservice-listener">
         <implementation.cpp path="." library="libwebservice-listener"/>
         <service name="webservice-listener">
-            <t:binding.http uri="echo-listener"/>
+            <binding.http uri="echo-listener"/>
         </service>
         <reference name="relay" target="echo"/>
     </component>
 
     <component name="echo">
-        <t:implementation.scheme script="server-test.scm"/>
+        <implementation.scheme script="server-test.scm"/>
         <service name="echo">
-            <t:binding.jsonrpc uri="echo"/>
+            <binding.jsonrpc uri="echo"/>
         </service>
     </component>     
 
diff --git a/sca-cpp/trunk/kernel/xml-test.cpp b/sca-cpp/trunk/kernel/xml-test.cpp
index a06e7a540c..7149d1bc41 100644
--- a/sca-cpp/trunk/kernel/xml-test.cpp
+++ b/sca-cpp/trunk/kernel/xml-test.cpp
@@ -35,7 +35,7 @@ namespace tuscany {
 
 const string currencyXML =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.1\" targetNamespace=\"http://services\" name=\"currency\">\n"
+"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://services\" name=\"currency\">\n"
 " <component name=\"CurrencyConverterWebService\">\n"
 "  <implementation.java class=\"services.CurrencyConverterImpl\"/>\n"
 "  <service name=\"CurrencyConverter\">\n"
diff --git a/sca-cpp/trunk/modules/java/domain-test.composite b/sca-cpp/trunk/modules/java/domain-test.composite
index 190f2ff5bb..a4c696c38d 100644
--- a/sca-cpp/trunk/modules/java/domain-test.composite
+++ b/sca-cpp/trunk/modules/java/domain-test.composite
@@ -18,24 +18,23 @@
  * 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://domain/test"
   name="domain-test">
         
     <component name="java-test">
         <implementation.java class="test.ServerImpl"/>
         <service name="test">
-            <t:binding.http uri="java"/>
+            <binding.http uri="java"/>
         </service>
     </component>     
 
     <component name="client-test">
         <implementation.java class="test.ClientImpl"/>
         <service name="client">
-            <t:binding.http uri="client"/>
+            <binding.http uri="client"/>
         </service>
         <reference name="ref" target="java-test">
-            <t:binding.http/>
+            <binding.http/>
         </reference>
     </component>
 
diff --git a/sca-cpp/trunk/modules/js/htdocs/scdl.js b/sca-cpp/trunk/modules/js/htdocs/scdl.js
index 417bb37dfc..50dab53e7c 100644
--- a/sca-cpp/trunk/modules/js/htdocs/scdl.js
+++ b/sca-cpp/trunk/modules/js/htdocs/scdl.js
@@ -86,35 +86,35 @@ scdl.documentation = function(l) {
  * Returns the title of a component or componentType.
  */
 scdl.title = function(l) {
-    return namedAttributeValue("'t:title", l);
+    return namedAttributeValue("'title", l);
 };
 
 /**
  * Returns the display style of a component, componentType, reference or property.
  */
 scdl.style = function(l) {
-    return namedAttributeValue("'t:style", l);
+    return namedAttributeValue("'style", l);
 };
 
 /**
  * Returns the color of a component or componentType.
  */
 scdl.color = function(l) {
-    return namedAttributeValue("'t:color", l);
+    return namedAttributeValue("'color", l);
 };
 
 /**
  * Returns the x position of a component.
  */
 scdl.x = function(l) {
-    return namedAttributeValue("'t:x", l);
+    return namedAttributeValue("'x", l);
 };
 
 /**
  * Returns the y position of a component.
  */
 scdl.y = function(l) {
-    return namedAttributeValue("'t:y", l);
+    return namedAttributeValue("'y", l);
 };
 
 /**
@@ -149,21 +149,21 @@ scdl.uri = function(l) {
  * Returns the align attribute of a service or reference.
  */
 scdl.align = function(l) {
-    return namedAttributeValue("'t:align", l);
+    return namedAttributeValue("'align", l);
 };
 
 /**
  * Returns the visible attribute of a service or reference.
  */
 scdl.visible = function(l) {
-    return namedAttributeValue("'t:visible", l);
+    return namedAttributeValue("'visible", l);
 };
 
 /**
  * Returns the clonable attribute of a reference.
  */
 scdl.clonable = function(l) {
-    return namedAttributeValue("'t:clonable", l);
+    return namedAttributeValue("'clonable", l);
 };
 
 /**
diff --git a/sca-cpp/trunk/modules/oauth/oauth.composite b/sca-cpp/trunk/modules/oauth/oauth.composite
index c2025493c8..1c30de7925 100644
--- a/sca-cpp/trunk/modules/oauth/oauth.composite
+++ b/sca-cpp/trunk/modules/oauth/oauth.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://tuscany.apache.org/xmlns/sca/components"
   name="oauth">
         
     <component name="Protected">
-        <t:implementation.widget location="protected/index.html"/>
+        <implementation.widget location="protected/index.html"/>
         <reference name="userInfo" target="UserInfo"/>
     </component>     
 
     <component name="UserInfo">
-        <t:implementation.scheme script="user-info.scm"/>
+        <implementation.scheme script="user-info.scm"/>
         <service name="info">
-            <t:binding.jsonrpc uri="info"/>
+            <binding.jsonrpc uri="info"/>
         </service>
         <property name="user">?</property>
         <property name="email">?</property>
diff --git a/sca-cpp/trunk/modules/openid/openid.composite b/sca-cpp/trunk/modules/openid/openid.composite
index 08bb74b7c7..693167319a 100644
--- a/sca-cpp/trunk/modules/openid/openid.composite
+++ b/sca-cpp/trunk/modules/openid/openid.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://tuscany.apache.org/xmlns/sca/components"
   name="openid">
         
     <component name="Protected">
-        <t:implementation.widget location="protected/index.html"/>
+        <implementation.widget location="protected/index.html"/>
         <reference name="userInfo" target="UserInfo"/>
     </component>     
 
     <component name="UserInfo">
-        <t:implementation.scheme script="user-info.scm"/>
+        <implementation.scheme script="user-info.scm"/>
         <service name="info">
-            <t:binding.jsonrpc uri="info"/>
+            <binding.jsonrpc uri="info"/>
         </service>
         <property name="user">anonymous</property>
         <property name="email">anonymous@example.com</property>
diff --git a/sca-cpp/trunk/modules/python/domain-test.composite b/sca-cpp/trunk/modules/python/domain-test.composite
index c8e92b286e..b96ef8c003 100644
--- a/sca-cpp/trunk/modules/python/domain-test.composite
+++ b/sca-cpp/trunk/modules/python/domain-test.composite
@@ -18,24 +18,23 @@
  * 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://domain/test"
   name="domain-test">
         
     <component name="python-test">
-        <t:implementation.python script="server-test.py"/>
+        <implementation.python script="server-test.py"/>
         <service name="test">
-            <t:binding.http uri="python"/>
+            <binding.http uri="python"/>
         </service>
     </component>     
 
     <component name="client-test">
-        <t:implementation.python script="client-test.py"/>
+        <implementation.python script="client-test.py"/>
         <service name="client">
-            <t:binding.http uri="client"/>
+            <binding.http uri="client"/>
         </service>
         <reference name="ref" target="python-test">
-            <t:binding.http/>
+            <binding.http/>
         </reference>
     </component>
 
diff --git a/sca-cpp/trunk/modules/scdl/Makefile.am b/sca-cpp/trunk/modules/scdl/Makefile.am
index 09cbd35ec0..54a9b46e4f 100644
--- a/sca-cpp/trunk/modules/scdl/Makefile.am
+++ b/sca-cpp/trunk/modules/scdl/Makefile.am
@@ -24,4 +24,4 @@ scdl_test_LDFLAGS = -lxml2
 EXTRA_DIST = test.composite
 
 noinst_PROGRAMS = scdl-test
-TESTS = scdl-test validate-test
+TESTS = scdl-test
diff --git a/sca-cpp/trunk/modules/scdl/scdl-test.cpp b/sca-cpp/trunk/modules/scdl/scdl-test.cpp
index 09a3dcd5dd..94baf930a9 100644
--- a/sca-cpp/trunk/modules/scdl/scdl-test.cpp
+++ b/sca-cpp/trunk/modules/scdl/scdl-test.cpp
@@ -47,7 +47,7 @@ bool testComponents() {
     const value store = car(c);
     assert(name(store) == string("Store"));
     const value impl = implementation(store);
-    assert(implementationType(impl) == "t:implementation.scheme");
+    assert(implementationType(impl) == "implementation.scheme");
     assert(attributeValue("script", impl) == string("store.scm"));
 
     const value catalog = named(string("Catalog"), c);
@@ -70,7 +70,7 @@ bool testServices() {
     assert(length(bindings(widget)) == 1);
     const value binding = car(bindings(widget));
     assert(uri(binding) == string("/store"));
-    assert(bindingType(binding) == "t:binding.http");
+    assert(bindingType(binding) == "binding.http");
     return true;
 }
 
@@ -87,7 +87,7 @@ bool testReferences() {
     assert(length(bindings(catalog)) == 1);
     const value binding = car(bindings(catalog));
     assert(uri(binding) == value());
-    assert(bindingType(binding) == "t:binding.jsonrpc");
+    assert(bindingType(binding) == "binding.jsonrpc");
 
     const list<value> t = mkbtree(sort(referenceToTargetAssoc(references(store))));
     assert(assoctree<value>("shoppingCart", t) == mklist<value>(string("shoppingCart"), string("ShoppingCart/Cart")));
diff --git a/sca-cpp/trunk/modules/scdl/test.composite b/sca-cpp/trunk/modules/scdl/test.composite
index f6fdba7f5f..5d8c5d3b88 100644
--- a/sca-cpp/trunk/modules/scdl/test.composite
+++ b/sca-cpp/trunk/modules/scdl/test.composite
@@ -18,47 +18,46 @@
  * 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">
-             <t:binding.jsonrpc/>
+             <binding.jsonrpc/>
          </reference>
          <reference name="shoppingCart" target="ShoppingCart/Cart">
-             <t:binding.atom/>
+             <binding.atom/>
          </reference>
          <reference name="shoppingTotal" target="ShoppingCart/Total">
-             <t:binding.jsonrpc/>
+             <binding.jsonrpc/>
          </reference>
     </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/>
+            <binding.jsonrpc/>
         </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/>
+            <binding.jsonrpc/>
         </service>        
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.scheme script="currency-converter.scm"/>
+        <implementation.scheme script="currency-converter.scm"/>
     </component>     
 
 </composite>
diff --git a/sca-cpp/trunk/modules/server/domain-test.composite b/sca-cpp/trunk/modules/server/domain-test.composite
index 56bfb700f0..b003dd15cd 100644
--- a/sca-cpp/trunk/modules/server/domain-test.composite
+++ b/sca-cpp/trunk/modules/server/domain-test.composite
@@ -18,21 +18,20 @@
  * 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://domain/test"
   name="domain-test">
         
     <component name="scheme-test">
-        <t:implementation.scheme script="server-test.scm"/>
+        <implementation.scheme script="server-test.scm"/>
         <service name="test">
-            <t:binding.http uri="test"/>
+            <binding.http uri="test"/>
         </service>
     </component>     
 
     <component name="property-test">
-        <t:implementation.scheme script="property-test.scm"/>
+        <implementation.scheme script="property-test.scm"/>
         <service name="properties">
-            <t:binding.http uri="properties"/>
+            <binding.http uri="properties"/>
         </service>
         <property name="host"></property>
         <property name="path"></property>
@@ -42,17 +41,17 @@
     <component name="cpp-test">
         <implementation.cpp path="." library="libimpl-test"/>
         <service name="cpp">
-            <t:binding.http uri="cpp"/>
+            <binding.http uri="cpp"/>
         </service>
     </component>
 
     <component name="client-test">
-        <t:implementation.scheme script="client-test.scm"/>
+        <implementation.scheme script="client-test.scm"/>
         <service name="client">
-            <t:binding.http uri="client"/>
+            <binding.http uri="client"/>
         </service>
         <reference name="ref" target="scheme-test">
-            <t:binding.http/>
+            <binding.http/>
         </reference>
     </component>
 
diff --git a/sca-cpp/trunk/modules/wsgi/domain-test.composite b/sca-cpp/trunk/modules/wsgi/domain-test.composite
index 9c44ebf5d8..6786286c63 100644
--- a/sca-cpp/trunk/modules/wsgi/domain-test.composite
+++ b/sca-cpp/trunk/modules/wsgi/domain-test.composite
@@ -18,24 +18,23 @@
  * 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://domain/test"
   name="domain-test">
         
     <component name="wsgi-test">
-        <t:implementation.python script="server-test.py"/>
+        <implementation.python script="server-test.py"/>
         <service name="test">
-            <t:binding.http uri="wsgi"/>
+            <binding.http uri="wsgi"/>
         </service>
     </component>     
 
     <component name="client-test">
-        <t:implementation.python script="client-test.py"/>
+        <implementation.python script="client-test.py"/>
         <service name="client">
-            <t:binding.http uri="client"/>
+            <binding.http uri="client"/>
         </service>
         <reference name="ref" target="wsgi-test">
-            <t:binding.http/>
+            <binding.http/>
         </reference>
     </component>
 
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>