From 66b717ff298aeaa02af8b3e37ab67f9442919f60 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 13 Sep 2008 20:48:01 +0000
Subject: Moved calculator-android sample to the samples directory.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695028 13f79535-47bb-0310-9956-ffa450edef68
---
 .../res/raw/calculator_composite                   |  49 ---
 .../modules/calculator-android/res/raw/sca.xsd     |  22 --
 .../modules/calculator-android/res/raw/sca_all.xsd |  32 --
 .../calculator-android/res/raw/sca_binding_ejb.xsd |  43 ---
 .../calculator-android/res/raw/sca_binding_jms.xsd | 135 --------
 .../calculator-android/res/raw/sca_binding_sca.xsd |  23 --
 .../res/raw/sca_binding_webservice.xsd             |  26 --
 .../calculator-android/res/raw/sca_core.xsd        | 350 ---------------------
 .../calculator-android/res/raw/sca_definitions.xsd |  25 --
 .../res/raw/sca_implementation_bpel.xsd            |  43 ---
 .../res/raw/sca_implementation_composite_xsd       |  23 --
 .../res/raw/sca_implementation_cpp.xsd             |  53 ----
 .../res/raw/sca_implementation_ejb.xsd             |  25 --
 .../res/raw/sca_implementation_java.xsd            |  24 --
 .../res/raw/sca_implementation_spring.xsd          |  24 --
 .../res/raw/sca_interface_cpp.xsd                  |  40 ---
 .../res/raw/sca_interface_java.xsd                 |  23 --
 .../res/raw/sca_interface_wsdl.xsd                 |  23 --
 .../calculator-android/res/raw/sca_policy.xsd      |  76 -----
 .../calculator-android/res/raw/tuscany_sca.xsd     |  45 ---
 .../res/raw/tuscany_sca_binding_atom.xsd           |  40 ---
 .../res/raw/tuscany_sca_binding_dwr.xsd            |  40 ---
 .../res/raw/tuscany_sca_binding_http.xsd           |  40 ---
 .../res/raw/tuscany_sca_binding_jsonrpc.xsd        |  40 ---
 .../res/raw/tuscany_sca_binding_notification.xsd   |  42 ---
 .../res/raw/tuscany_sca_binding_rmi.xsd            |  43 ---
 .../res/raw/tuscany_sca_binding_rss.xsd            |  40 ---
 .../res/raw/tuscany_sca_implementation_node.xsd    |  42 ---
 .../tuscany_sca_implementation_notification.xsd    |  42 ---
 .../res/raw/tuscany_sca_implementation_osgi.xsd    |  43 ---
 .../raw/tuscany_sca_implementation_resource.xsd    |  42 ---
 .../res/raw/tuscany_sca_implementation_script.xsd  |  43 ---
 .../res/raw/tuscany_sca_implementation_widget.xsd  |  42 ---
 .../res/raw/tuscany_sca_implementation_xquery.xsd  |  42 ---
 34 files changed, 1685 deletions(-)
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/calculator_composite
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
 delete mode 100644 branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd

(limited to 'branches/sca-android/modules/calculator-android/res/raw')

diff --git a/branches/sca-android/modules/calculator-android/res/raw/calculator_composite b/branches/sca-android/modules/calculator-android/res/raw/calculator_composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/calculator_composite
+++ /dev/null
@@ -1,49 +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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca.xsd
deleted file mode 100644
index e108342693..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <include schemaLocation="sca_interface_java.xsd"/>
-    <include schemaLocation="sca_interface_wsdl.xsd"/>
-
-    <include schemaLocation="sca_implementation_java.xsd"/>
-    <include schemaLocation="sca_implementation_composite.xsd"/>
-
-    <include schemaLocation="sca_binding_webservice.xsd"/>
-    <include schemaLocation="sca_binding_jms.xsd"/>
-    <include schemaLocation="sca_binding_sca.xsd"/>
-    
-    <include schemaLocation="sca_definitions.xsd"/>
-    <include schemaLocation="sca_policy.xsd"/>
-    
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd
deleted file mode 100644
index 6e3b848a53..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_all.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca.xsd"/>
-
-    <include schemaLocation="sca_binding_ejb.xsd"/>
-
-    <include schemaLocation="sca_implementation_bpel.xsd"/>
-    <include schemaLocation="sca_implementation_spring.xsd"/>
-    <include schemaLocation="sca_implementation_ejb.xsd"/>
-
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd
deleted file mode 100644
index 0e7e40432c..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_ejb.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-   <include schemaLocation="sca_core.xsd"/>
-
-   <element name="binding.ejb" type="sca:EJBSessionBeanBinding" 
-            substitutionGroup="sca:binding" />
-
-    <simpleType name="BeanType">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="stateful"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="VersionValue">
-        <restriction base="string">
-            <enumeration value="EJB2"/>
-            <enumeration value="EJB3"/>
-        </restriction>
-    </simpleType>
-
-
-     <complexType name="EJBSessionBeanBinding">
-	 <complexContent>
-	  <extension base="sca:Binding">
-         <sequence>
-            <any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="homeInterface" type="NCName" use="optional"/>
-         <attribute name="ejb-link-name" type="NCName" use="optional"/>
-         <attribute name="session-type" type="sca:BeanType" use="optional" default="stateless"/>
-         <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB2"/>
-         <anyAttribute namespace="##any" processContents="lax"/>
-	  </extension>
-	 </complexContent>
-     </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd
deleted file mode 100644
index 868a9d64e0..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_jms.xsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca_core.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="destination" type="sca:Destination" minOccurs="0"/>
-   	         <element name="connectionFactory" type="sca:ConnectionFactory"  
-                        minOccurs="0"/>
- 	         <element name="activationSpec" type="sca:ActivationSpec" 
-                        minOccurs="0"/>
-  	         <element name="response" type="sca:Response" minOccurs="0"/>
-               <element name="headers" type="sca:Headers" minOccurs="0"/>
-    	         <element name="resourceAdapter" type="sca:ResourceAdapter" 
-                        minOccurs="0"/>
-               <element name="operationProperties" type="sca:OperationProperties" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-    	      <attribute name="correlationScheme"
-                       default="RequestMsgIDToCorrelID">
-    	         <simpleType>
-                  <restriction base="string">
-                     <enumeration value="RequestMsgIDToCorrelID"/>
-                     <enumeration value="RequestCorrelIDToCorrelID"/>
-                     <enumeration value="None"/>
-                  </restriction>
-               </simpleType>
-            </attribute>
-
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-            <anyAttribute/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="CreateResource">
-      <restriction base="string">
-         <enumeration value="always"/>
-         <enumeration value="never"/>
-         <enumeration value="ifnotexist"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="Destination">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ConnectionFactory">
-    	<sequence>          <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-    	</sequence>
-    	<attribute name="name" type="anyURI" use="required"/>
-    	<attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ActivationSpec">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:CreateResource"
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="Response">
-      <sequence>
-         <element name="destination" type="sca:Destination" minOccurs="0"/>
-         <element name="connectionFactory" type="sca:ConnectionFactory" 
-                  minOccurs="0"/>
-         <element name="activationSpec" type="sca:ActivationSpec" minOccurs="0"/>
-      </sequence>
-   </complexType>
-
-   <complexType name="Headers">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="JMSType" type="string"/>
-      <attribute name="JMSCorrelationID" type="string"/>
-      <attribute name="JMSDeliveryMode" type="string"/>
-      <attribute name="JMSTimeToLive" type="int"/>
-      <attribute name="JMSPriority" type="string"/>
-   </complexType>
-
-   <complexType name="ResourceAdapter">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="OperationProperties">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:Headers"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd
deleted file mode 100644
index 8005cda8a6..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_sca.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.sca" type="sca:SCABinding" 
-    	substitutionGroup="sca:binding"/>
-    <complexType name="SCABinding">
-        <complexContent>
-            <extension base="sca:Binding">
-		    	<sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-		    	</sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd
deleted file mode 100644
index 92446c0338..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_binding_webservice.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2004/12/addressing"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd
deleted file mode 100644
index 20e0a6901c..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_core.xsd
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <element name="componentType" type="sca:ComponentType"/>
-    <complexType name="ComponentType">
-    	<sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-            	<element name="service" type="sca:ComponentService" />
-            	<element name="reference" type="sca:ComponentReference"/>
-            	<element name="property" type="sca:Property"/>
-        	</choice>
-        	<!-- 
-        	<any namespace="##other" processContents="lax" minOccurs="0" 
-        		maxOccurs="unbounded"/>
-        	-->
-        </sequence>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <element name="composite" type="sca:Composite"/>
-    <complexType name="Composite">
-         <sequence>
-             <choice minOccurs="0" maxOccurs="unbounded">
-	             <element name="include" type="sca:Include"/>
-                 <element name="service" type="sca:Service"/>
-                 <element name="property" type="sca:Property"/>
-                 <element name="component" type="sca:Component"/>
-                 <element name="reference" type="sca:Reference"/>
-                 <element name="wire" type="sca:Wire"/>
-                 <any namespace="##other" processContents="lax"/>
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI" use="optional"/>
-        <attribute name="local" type="boolean" use="optional" default="false"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Service">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="promote" type="anyURI" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="interface" type="sca:Interface" abstract="true" />
-    <complexType name="Interface" abstract="true"/>
-
-    <complexType name="Reference">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax" />
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-    	<attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
-    	<attribute name="multiplicity" type="sca:Multiplicity"
-    		use="optional" default="1..1" />
-    	<attribute name="promote" type="sca:listOfAnyURIs" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <complexType name="SCAPropertyBase" mixed="true">
-    	<!-- mixed="true" to handle simple type -->
-    	<sequence>
-    		<any namespace="##any" processContents="lax" minOccurs="0"
-    			maxOccurs="1" />
-    		<!-- NOT an extension point; This xsd:any exists to accept
-    			 the element-based or complex type property
-    			 i.e. no element-based extension point under "sca:property" -->
-    	</sequence>
-    </complexType>
-
-    <!-- complex type for sca:property declaration --> 
-    <complexType name="Property" mixed="true">
-       <complexContent>
-	       <extension base="sca:SCAPropertyBase">  
-	          <!-- extension defines the place to hold default value --> 
-	          <attribute name="name" type="NCName" use="required"/>
-	          <attribute name="type" type="QName" use="optional"/> 
-	          <attribute name="element" type="QName" use="optional"/>
-	          <attribute name="many" type="boolean" default="false" 
-	          	use="optional"/>
-	          <attribute name="noDefault" type="boolean" default="false" 
-	          	use="optional"/>
-	          <anyAttribute namespace="##any" processContents="lax"/>
-	          <!-- an extension point ; attribute-based only --> 
-	       </extension>
-       </complexContent> 
-    </complexType>
-    
-    <complexType name="PropertyValue" mixed="true">
-       <complexContent>
-          <extension base="sca:SCAPropertyBase">
-             <attribute name="name" type="NCName" use="required"/>
-	         <attribute name="type" type="QName" use="optional"/> 
-	         <attribute name="element" type="QName" use="optional"/> 
-	         <attribute name="many" type="boolean" default="false" 
-	         	use="optional"/>            
-             <attribute name="source" type="string" use="optional"/>
-             <attribute name="file" type="anyURI" use="optional"/> 
-             <anyAttribute namespace="##any" processContents="lax"/>
-             <!-- an extension point ; attribute-based only --> 
-          </extension> 
-       </complexContent> 
-    </complexType>
-
-    <element name="binding" type="sca:Binding" abstract="true"/>
-    <complexType name="Binding" abstract="true">
-    	<sequence>
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    	</sequence>
-        <attribute name="uri" type="anyURI" use="optional"/>
-        <attribute name="name" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-    
-    <element name="bindingType" type="sca:BindingType"/>
-    <complexType name="BindingType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <element name="callback" type="sca:Callback"/>
-    <complexType name="Callback">
-    	<choice minOccurs="0" maxOccurs="unbounded">
-        	<element ref="sca:binding"/>
-        	<any namespace="##other" processContents="lax"/>
-        </choice>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>  
-      
-    <complexType name="Component">
-        <sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-             <choice minOccurs="0" maxOccurs="unbounded">
-             	<element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:PropertyValue" />
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentService">
-        <sequence>
-        	 <element ref="sca:interface" minOccurs="0" maxOccurs="1"/>
-        	 <element name="operation" type="sca:Operation" minOccurs="0" 
-  					maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-             <element ref="sca:callback" minOccurs="0" maxOccurs="1"/>
-             <!--
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="requires" type="sca:listOfQNames" 
-        	use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" 
-        	use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentReference">
-		<sequence>
-			<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-			<element name="operation" type="sca:Operation" minOccurs="0" 
-				maxOccurs="unbounded" />
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element ref="sca:binding" />
-				<any namespace="##other" processContents="lax" />
-			</choice>
-			<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-			<!--
-			<any namespace="##other" processContents="lax" minOccurs="0" 
-				maxOccurs="unbounded" />
-			-->
-		</sequence>
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" 
-			use="optional" default="1..1" />
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-   		<attribute name="policySets" type="sca:listOfQNames" 
-   			use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="implementation" type="sca:Implementation"
-    	abstract="true" />
-    <complexType name="Implementation" abstract="true">
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-
-    <element name="implementationType" type="sca:ImplementationType"/>
-    <complexType name="ImplementationType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Wire">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" 
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="source" type="anyURI" use="required"/>
-        <attribute name="target" type="anyURI" use="required"/>
-        <anyAttribute namespace="##any" processContents="lax"/>     
-    </complexType>
-    
-    <element name="include" type="sca:Include"/>
-    <complexType name="Include">
-		<attribute name="name" type="QName"/>
-		<anyAttribute namespace="##any" processContents="lax"/>   
-	</complexType>
-    
-    <complexType name="Operation">
-    	<attribute name="name" type="NCName" use="required"/>
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>  	
-    </complexType>
-    
-    <element name="constrainingType" type="sca:ConstrainingType"/>
-    <complexType name="ConstrainingType">
-        <sequence>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-                <element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:Property" />
-            </choice>
-            <any namespace="##other" processContents="lax" minOccurs="0"
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-
-    <simpleType name="Multiplicity">
-        <restriction base="string">
-            <enumeration value="0..1"/>
-            <enumeration value="1..1"/>
-            <enumeration value="0..n"/>
-            <enumeration value="1..n"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="OverrideOptions">
-        <restriction base="string">
-            <enumeration value="no"/>
-            <enumeration value="may"/>
-            <enumeration value="must"/>
-        </restriction>
-    </simpleType>
-    
-    <!-- Global attribute definition for @requires to permit use of intents
-         within WSDL documents -->
-    <attribute name="requires" type="sca:listOfQNames"/>
-    
-    <!-- Global attribute defintion for @endsConversation to mark operations 
-         as ending a conversation -->
-    <attribute name="endsConversation" type="boolean" default="false"/>
-    
-    <simpleType name="listOfQNames">
-    	<list itemType="QName"/>
-    </simpleType>
-    
-    <simpleType name="listOfAnyURIs">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd
deleted file mode 100644
index 4676d34eeb..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_definitions.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-    <include schemaLocation="sca_policy.xsd"/>
-
-    <element name="definitions">
-       <complexType>
-          <choice minOccurs="0" maxOccurs="unbounded">
-             <element ref="sca:intent"/>
-             <element ref="sca:policySet"/>
-             <element ref="sca:binding"/>
-             <element ref="sca:bindingType"/>
-             <element ref="sca:implementationType"/>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          </choice>
-          <attribute name="targetNamespace" type="anyURI" use="optional"/>
-       </complexType>
-    </element>
-   
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd
deleted file mode 100644
index 80141a57af..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_bpel.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<xsd:schema xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified">
-
-	<xsd:include schemaLocation="sca_core.xsd" />
-
-	<xsd:element name="implementation.bpel" type="BpelImplementation"
-		substitutionGroup="implementation" />
-
-	<xsd:complexType name="BpelImplementation">
-		<xsd:complexContent>
-			<xsd:extension base="Implementation">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="process" type="xsd:QName" use="required" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="interface.partnerLinkType" type="BpelPartnerLinkType"
-		substitutionGroup="interface" />
-
-	<xsd:complexType name="BpelPartnerLinkType">
-		<xsd:complexContent>
-			<xsd:extension base="Interface">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="type" type="xsd:QName" use="required" />
-				<xsd:attribute name="serviceRole" type="xsd:NCName" use="optional" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd
deleted file mode 100644
index 2486653235..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_composite_xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-    
-    <include schemaLocation="sca_core.xsd"/>
-    <element name="implementation.composite" type="sca:SCAImplementation"
-        substitutionGroup="sca:implementation"/>
-    <complexType name="SCAImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                        maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="QName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd
deleted file mode 100644
index 1d157d9504..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_cpp.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.cpp" type="sca:CPPImplementation" substitutionGroup="sca:implementation" />
-    <complexType name="CPPImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <element name="method" type="sca:CPPImplementationMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="library" type="NCName" use="required"/>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="path" type="NCName" use="optional"/>
-                <attribute name="class" type="Name" use="optional"/>
-                <attribute name="scope" type="sca:CPPImplementationScope" use="optional"/>
-                <attribute name="eagerInit" type="boolean" use="optional"/>
-                <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-                <attribute name="conversationMaxAge" type="string" use="optional"/>
-                <attribute name="conversationMaxIdle" type="string" use="optional"/>
-                <attribute name="conversationSinglePrincipal" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <simpleType name="CPPImplementationScope">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="composite"/>
-            <enumeration value="request"/>
-            <enumeration value="converstion"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="CPPImplementationMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
-
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd
deleted file mode 100644
index 850b854fd5..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_ejb.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.ejb" type="sca:EJBImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="EJBImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <!--  we might want to make this refer to the JEE ejb-link type -->
-                <attribute name="ejb-link" type="token" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd
deleted file mode 100644
index 792ad407b3..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_java.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.java" type="sca:JavaImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="JavaImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="class" type="NCName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd
deleted file mode 100644
index a9ef307bed..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_implementation_spring.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.spring" type="sca:SpringImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="SpringImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd
deleted file mode 100644
index 9cae7e3685..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_cpp.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sca="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="interface.cpp" type="sca:CPPInterface" substitutionGroup="sca:interface"/>
-
-    <complexType name="CPPInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <element name="method" type="sca:CPPMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="class" type="Name" use="required"/>
-                <attribute name="callbackHeader" type="NCName" use="optional"/>
-                <attribute name="callbackClass" type="Name" use="optional"/>
-                <attribute name="remotable" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CPPMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="oneWay" type="boolean" use="optional"/>
-            <attribute name="endConversation" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd
deleted file mode 100644
index 3f9eb25440..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_java.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
-    <complexType name="JavaInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="NCName" use="required"/>
-                <attribute name="callbackInterface" type="NCName" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd
deleted file mode 100644
index c161d98f88..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_interface_wsdl.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca_core.xsd"/>
-
-    <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
-    <complexType name="WSDLPortType">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="anyURI" use="required"/>
-                <attribute name="callbackInterface" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd b/branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd
deleted file mode 100644
index 1ae1c9dfdc..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/sca_policy.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-        elementFormDefault="qualified">
-        
-    <include schemaLocation="sca_core.xsd"/>
-		
-	<element name="intent" type="sca:Intent"/>	
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" maxOccurs="1" />
-			<any namespace="##other" processContents="lax"
-				minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-        <attribute name="name" type="QName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-		
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-			<element name="policySetReference" type="sca:PolicySetReference"/>
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="QName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames" use="optional"/>
-		<attribute name="appliesTo" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<attribute name="default" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<element name="allow" type="sca:Allow"/>
-	<complexType name="Allow">
-		<attribute name="roles" type="string" use="required"/>
-	</complexType>
-
-	<element name="permitAll" type="sca:PermitAll"/>
-	<complexType name="PermitAll"/>
-
-	<element name="denyAll" type="sca:DenyAll"/>
-	<complexType name="DenyAll"/>
-
-	<element name="runAs" type="sca:RunAs"/>
-	<complexType name="RunAs">
-		<attribute name="role" type="string" use="required"/>
-	</complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd
deleted file mode 100644
index 33b7c5099b..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca.xsd
+++ /dev/null
@@ -1,45 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
-    
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_all.xsd"/>
-
-    <include schemaLocation="tuscany_sca_binding_atom.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_dwr.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_http.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_jsonrpc.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_notification.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_rmi.xsd"/>
-    <include schemaLocation="tuscany_sca_binding_rss.xsd"/>
-    
-    <!__
-    <include schemaLocation="tuscany_sca_implementation_das.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_data.xsd"/>
-    __>
-    <include schemaLocation="tuscany_sca_implementation_node.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_notification.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_osgi.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_resource.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_script.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_widget.xsd"/>
-    <include schemaLocation="tuscany_sca_implementation_xquery.xsd"/>
-    
-</schema>
\ No newline at end of file
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
deleted file mode 100644
index 1423a7ee87..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_atom.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.atom" type="t:AtomBinding"/>
-    
-    <complexType name="AtomBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
deleted file mode 100644
index 98b17bbb8b..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_dwr.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd
deleted file mode 100644
index 4d709353d0..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_http.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
deleted file mode 100644
index e03d6feb02..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_jsonrpc.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
deleted file mode 100644
index d1b23e8826..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_notification.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.notification" type="t:NotificationBinding"/>
-    
-    <complexType name="NotificationBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="ntm" type="anyURI" use="optional"/>
-                <attribute name="notificationType" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
deleted file mode 100644
index 7815e390e4..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rmi.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="host" type="anyURI" use="optional"/>
-			 <attribute name="port" type="int" use="optional"/>
-			 <attribute name="serviceName" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
deleted file mode 100644
index 8fd10cc781..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_binding_rss.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="binding.rss" type="t:RSSBinding"/>
-    
-    <complexType name="RSSBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
deleted file mode 100644
index 1943c98d70..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_node.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
deleted file mode 100644
index 1c4c6d7aeb..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_notification.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.notification" type="t:NotificationImplementation"/>
-    	
-    <complexType name="NotificationImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="NCName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
deleted file mode 100644
index 9fedc2bb84..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_osgi.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.osgi" type="t:OSGiImplementation"/>
-    	
-    <!-- TODO Declare the proper attributes and elements -->
-    <complexType name="OSGiImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##any" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
deleted file mode 100644
index e37b2c47ee..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_resource.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.resource" type="t:ResourceImplementation"/>
-    	
-    <complexType name="ResourceImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
deleted file mode 100644
index a13643d148..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_script.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.script" type="t:ScriptImplementation"/>
-    	
-    <complexType name="ScriptImplementation">
-        <complexContent mixed="true">
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="script" type="anyURI" use="optional"/>
-                <attribute name="language" type="NCName" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
deleted file mode 100644
index 1afb30c106..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_widget.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.widget" type="t:WidgetImplementation"/>
-    	
-    <complexType name="WidgetImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd b/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd
deleted file mode 100644
index 875f0da1dc..0000000000
--- a/branches/sca-android/modules/calculator-android/res/raw/tuscany_sca_implementation_xquery.xsd
+++ /dev/null
@@ -1,42 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca_core.xsd"/>
-
-    <element name="implementation.xquery" type="t:XQueryImplementation"/>
-    	
-    <complexType name="XQueryImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
-- 
cgit v1.2.3