Cleaned up test composite files. Adjusted C++ implementation elements to match the spec. Minor refactoring/terminology cleanup in HTTPD modules, renamed readImplementation to evalImplementation and evalImplementation to applyImplementation.

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

2 files changed, 5 insertions, 38 deletions

diff --git a/sca-cpp/trunk/test/store-python/currency.composite b/sca-cpp/trunk/test/store-python/currency.composite
deleted file mode 100644
index 17066e9626..0000000000
--- a/sca-cpp/trunk/test/store-python/currency.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-  xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://services"    
-  name="currency">
-        
-    <component name="CurrencyConverterWebService">
-        <t:implementation.python script="currency-converter.py"/>
-        <service name="CurrencyConverter">
-            <binding.http uri="currency-converter"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/sca-cpp/trunk/test/store-python/store.composite b/sca-cpp/trunk/test/store-python/store.composite
index 8ea2dec373..abf43433d5 100644
--- a/sca-cpp/trunk/test/store-python/store.composite
+++ b/sca-cpp/trunk/test/store-python/store.composite
@@ -23,8 +23,7 @@
   name="store">
         
     <component name="Store">
-	    <!-- <t:implementation.widget location="store.html"/> -->
-        <t:implementation.python uri="store.py"/>
+        <t:implementation.python script="store.py"/>
         <service name="Widget">
             <t:binding.http uri="store"/>
         </service>
@@ -34,7 +33,7 @@
     </component>
     
     <component name="Catalog">
-        <t:implementation.python uri="fruits-catalog.py"/> 
+        <t:implementation.python script="fruits-catalog.py"/> 
         <property name="currencyCode">USD</property>
         <service name="Catalog">
             <t:binding.jsonrpc uri="catalog"/>
@@ -43,7 +42,7 @@
     </component> 
      
     <component name="ShoppingCart">
-        <t:implementation.python uri="shopping-cart.py"/>
+        <t:implementation.python script="shopping-cart.py"/>
         <service name="ShoppingCart">
             <t:binding.atom uri="shoppingCart"/>
         </service>        
@@ -54,14 +53,14 @@
     </component>
     
     <component name="CurrencyConverter">
-        <t:implementation.python uri="currency-converter.py"/>
+        <t:implementation.python script="currency-converter.py"/>
         <service name="CurrencyConverter">
             <t:binding.jsonrpc uri="currencyConverter"/>
         </service>        
     </component>     
 
     <component name="Cache">
-        <t:implementation.cpp uri="../../components/cache/.libs/libmcache"/>
+        <implementation.cpp path="../../components/cache/.libs" library="libmcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>