summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules')
-rw-r--r--sca-cpp/trunk/modules/java/domain-test.composite7
-rw-r--r--sca-cpp/trunk/modules/js/htdocs/scdl.js16
-rw-r--r--sca-cpp/trunk/modules/oauth/oauth.composite7
-rw-r--r--sca-cpp/trunk/modules/openid/openid.composite7
-rw-r--r--sca-cpp/trunk/modules/python/domain-test.composite11
-rw-r--r--sca-cpp/trunk/modules/scdl/Makefile.am2
-rw-r--r--sca-cpp/trunk/modules/scdl/scdl-test.cpp6
-rw-r--r--sca-cpp/trunk/modules/scdl/test.composite23
-rw-r--r--sca-cpp/trunk/modules/server/domain-test.composite17
-rw-r--r--sca-cpp/trunk/modules/wsgi/domain-test.composite11
10 files changed, 50 insertions, 57 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 22:33:23 +0000