summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/test
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/test')
-rw-r--r--sca-cpp/trunk/test/store-python/currency.composite32
-rw-r--r--sca-cpp/trunk/test/store-python/store.composite11
-rw-r--r--sca-cpp/trunk/test/store-scheme/currency.composite32
-rw-r--r--sca-cpp/trunk/test/store-scheme/store.composite11
4 files changed, 10 insertions, 76 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>
diff --git a/sca-cpp/trunk/test/store-scheme/currency.composite b/sca-cpp/trunk/test/store-scheme/currency.composite
deleted file mode 100644
index eaea331dbe..0000000000
--- a/sca-cpp/trunk/test/store-scheme/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.scheme script="currency-converter.scm"/>
- <service name="CurrencyConverter">
- <binding.http uri="currency-converter"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-cpp/trunk/test/store-scheme/store.composite b/sca-cpp/trunk/test/store-scheme/store.composite
index cc00ae2d65..64ceaa2a24 100644
--- a/sca-cpp/trunk/test/store-scheme/store.composite
+++ b/sca-cpp/trunk/test/store-scheme/store.composite
@@ -23,8 +23,7 @@
name="store">
<component name="Store">
- <!-- <t:implementation.widget location="store.html"/> -->
- <t:implementation.scheme uri="store.scm"/>
+ <t:implementation.scheme script="store.scm"/>
<service name="Widget">
<t:binding.http uri="store"/>
</service>
@@ -34,7 +33,7 @@
</component>
<component name="Catalog">
- <t:implementation.scheme uri="fruits-catalog.scm"/>
+ <t:implementation.scheme script="fruits-catalog.scm"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="catalog"/>
@@ -43,7 +42,7 @@
</component>
<component name="ShoppingCart">
- <t:implementation.scheme uri="shopping-cart.scm"/>
+ <t:implementation.scheme script="shopping-cart.scm"/>
<service name="ShoppingCart">
<t:binding.atom uri="shoppingCart"/>
</service>
@@ -54,14 +53,14 @@
</component>
<component name="CurrencyConverter">
- <t:implementation.scheme uri="currency-converter.scm"/>
+ <t:implementation.scheme script="currency-converter.scm"/>
<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>