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

9 files changed, 27 insertions, 36 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>