From f4e3e383071b6947d56794d9af5e9e6438aa3235 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 Sep 2008 00:17:09 +0000
Subject: Temporarily renamed sca-android branch to pull a recent revision of
 trunk into sca-android.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695316 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/assembly/xml/Calculator.composite  |  53 -------
 .../xml/CalculatorComponent.constrainingType       |  34 ----
 .../sca/assembly/xml/CalculatorImpl.componentType  |  31 ----
 .../sca/assembly/xml/JavaScriptReference.composite |  37 -----
 .../sca/assembly/xml/RMIBindingTest.composite      |  43 -----
 .../sca/assembly/xml/TestAllCalculator.composite   | 128 ---------------
 .../sca/assembly/xml/TestAllDivide.composite       |  56 -------
 .../assembly/xml/TestAllPolicyCalculator.composite | 129 ---------------
 .../sca/assembly/xml/another_test_definitions.xml  |  97 ------------
 .../tuscany/sca/assembly/xml/test_definitions.xml  | 175 ---------------------
 10 files changed, 783 deletions(-)
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
 delete mode 100644 branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml

(limited to 'branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany')

diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
deleted file mode 100644
index 4546fddb2d..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ /dev/null
@@ -1,53 +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"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <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/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
deleted file mode 100644
index 072fe8fde1..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="CalculatorComponent">
-
-  <service name="CalculatorService">
-        <interface.java class="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java class="calculator.DivideService" />
-  </reference>  
-
-</constrainingType>              
-       
\ No newline at end of file
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
deleted file mode 100644
index 2dbecdabb7..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
-  <service name="CalculatorService">
-        <interface.java class="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java class="calculator.DivideService" />
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
deleted file mode 100644
index a313dd1e6d..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ /dev/null
@@ -1,37 +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"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="JavaScriptReference">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>
-    </component>
-
-    <component name="ReferenceComponent">
-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/references/reference.js"/>
-        <reference name="ref" target="TargetComponent" />
-    </component>
-
-    <component name="TargetComponent">
-        <implementation.java class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>
-    </component>
-
-</composite>
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
deleted file mode 100644
index 2da2b56e8e..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ /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.    
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="HelloWorldRmiComposite">
-
-	<service name="HelloWorldRmiService" promote="HelloWorldServiceComponent">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <tuscany:binding.rmi host="localhost" port="8099" serviceName="HelloWorldRemoteService"   />
-    </service>
-      
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-    </component>   
-  
-   <component name="HelloWorldRmiServiceComponent">
-        <implementation.java class="helloworld.HelloWorldRmiImpl"/>
-        <reference name="extService"></reference>
-    </component>        
-           
-  	<reference name="HelloWorldRmiReference" promote="HelloWorldRmiServiceComponent/extService">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <tuscany:binding.rmi host="localhost" port="8099" serviceName="HelloWorldRemoteService"   />
-    </reference>
-
-</composite>
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
deleted file mode 100644
index 5091ff700b..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ /dev/null
@@ -1,128 +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 autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" policySets="sns:SecureReliablePolicy"
-    requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 "
-    xmlns:ext="http://extension"
-    xmlns:cns="http://test" xmlns:sns="http://test">
-
-    <include name="tns:TestAllDivide"/>
-    <ext:testExtension/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService" requires="cns:confidentiality"
-        policySets="sns:SecureReliablePolicy">
-        <ext:testExtension/>
-        <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        <operation name="add" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-
-        <binding.ws name="CalculatorWS" policySets="sns:SecureReliablePolicy" port="" requires="cns:confidentiality" uri="http://calc/ws">
-            <operation name="add" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
-                <operation name="addCallback" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-            </binding.ws>
-        </callback>
-    </service>
-
-    <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
-        policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-        <ext:testExtension/>
-        <service name="CalculatorService" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        </service>
-
-        <reference name="addService" target="AddServiceComponent/AddService" autowire="false" multiplicity="1..1"
-            policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" wiredByImpl="false">
-            <ext:testExtension/>
-            <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback" />
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" />
-        <reference name="divideService" target="DivideServiceComponent" />
-
-        <property name="round" type="xsd:boolean" many="false">true</property>
-
-        <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-        </service>
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-
-    <component name="NestedCompositeComponent">
-        <service name="CalculatorService">
-            <interface.java interface="calculator.CalculatorService" />
-        </service>
-        <implementation.composite name="tns:Calculator" />
-    </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>
-
-    <reference name="MultiplyService" promote="CalculatorServiceComponent/multiplyService" policySets="sns:SecureReliablePolicy"
-        requires="cns:confidentiality">
-        <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback" />
-        <operation name="multiply" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-
-        <binding.ws name="MultiplyWS" port="" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" uri="http://calc/ws">
-            <operation name="multiply" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-            <binding.ws name="MultiplyCallbackWS" port="" uri="http://calc/callback/ws" policySets="sns:SecureReliablePolicy"
-                requires="cns:confidentiality">
-                <operation name="multiplyCallback" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />
-            </binding.ws>
-        </callback>
-    </reference> 
-
-    <property name="prop1" xmlns:foo="http://foo" many="true" type="foo:MyComplexType">
-    	<ext:testExtension/>
-   	    <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </MyComplexPropertyValue1>
-        <MyComplexPropertyValue2 xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </MyComplexPropertyValue2>
-    </property>
-    
-    <property name="prop2" xmlns:foo="http://foo" mustSupply="true" element="MyComplexPropertyValue1"/>
-
-</composite>
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
deleted file mode 100644
index 0e7a48c698..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ /dev/null
@@ -1,56 +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 autowire="false"
-	constrainingType="tns:Calculator"
-	local="true"
-	name="TestAllDivide"
-	policySets="" requires=""
-	targetNamespace="http://calc"
-	xmlns:tns="http://calc"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
-	
-  <include name="tns:CompleteDivide"/>
-  
-  <service name="DivideService" policySets="" promote="CalculatorDivideComponent/DivideService" requires="">
-    <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
-    <operation name="divide" policySets="" requires=""/>
-
-    <binding.ws name="CalculatorWS" policySets="" port="" requires="" uri="http://calc/ws">
-      <operation name="divide" policySets="" requires=""/>
-    </binding.ws>
-
-    <callback policySets="" requires="">
-      <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
-        <operation name="divideCallback" policySets="" requires=""/>
-      </binding.ws>
-    </callback>
-  </service>
-  
-   <component name="CalculatorDivideComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent" policySets="" requires="">
-   		<service name="DivideService" policySets="" requires="">
-   			<interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
-   		</service>
-		<implementation.java class="calculator.DivideImpl" policySets="" requires=""/>
-   </component>
-
-</composite>
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
deleted file mode 100644
index 7bc7ccdb83..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ /dev/null
@@ -1,129 +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 autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" 
-    requires="cns:tuscanyIntent_1" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 "
-    xmlns:ext="http://extension"
-    xmlns:cns="http://test" xmlns:sns="http://test">
-
-    <include name="tns:TestAllDivide"/>
-    <ext:testExtension/>
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService" requires="cns:tuscanyIntent_2 cns:tuscanyIntent_1">
-        <ext:testExtension/>
-        <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-        <operation name="add" requires="cns:tuscanyIntent_6"/>
-
-        <binding.ws name="CalculatorWS" port="" requires="cns:tuscanyIntent_3" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback requires="cns:tuscanyIntent_4">
-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="cns:tuscanyIntent_5" uri="http://calc/callback/ws">
-            </binding.ws>
-        </callback>
-    </service>
-
-    <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
-        requires="cns:tuscanyIntent_2 cns:tuscanyIntent_3">
-        <ext:testExtension/>
-        <service name="CalculatorService" requires="cns:tuscanyIntent_3">
-            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-            <operation name="add" requires="cns:tuscanyIntent_6 cns:tuscanyIntent_7"/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="cns:tuscanyIntent_4" uri="http://calc/callback/ws">
-            </binding.ws>
-            <callback>
-           	</callback>
-        </service>
-
-        <reference name="addService" target="AddServiceComponent/AddService" autowire="false" multiplicity="1..1"
-            requires="cns:tuscanyIntent_3 cns:tuscanyIntent_2.qualified" wiredByImpl="false">
-            <ext:testExtension/>
-            <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback" />
-            <operation name="add" requires="cns:tuscanyIntent_8 cns:tuscanyIntent_9"/>
-            <binding.ws name="addServiceWSRef" policySets="" port="" requires="cns:tuscanyIntent_4" uri="http://calc/callback/ws">
-            </binding.ws>
-        </reference>
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" />
-        <reference name="divideService" target="DivideServiceComponent" />
-
-        <property name="round" type="xsd:boolean" many="false">true</property>
-
-        <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="cns:tuscanyIntent_4" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <service name="AddService">
-            <interface.java interface="calculator.AddService" />
-        </service>
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-
-    <component name="NestedCompositeComponent">
-        <service name="CalculatorService">
-            <interface.java interface="calculator.CalculatorService" />
-        </service>
-        <implementation.composite name="tns:Calculator" />
-    </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>
-
-    <reference name="MultiplyService" promote="CalculatorServiceComponent/multiplyService" 
-        requires="cns:tuscanyIntent_2">
-        <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback" />
-        <operation name="multiply" requires="cns:tuscanyIntent_6"/>
-
-        <binding.ws name="MultiplyWS" port="" requires="cns:tuscanyIntent_3" uri="http://calc/ws">
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:tuscanyIntent_3">
-            <binding.ws name="MultiplyCallbackWS" port="" uri="http://calc/callback/ws" 
-                requires="cns:tuscanyIntent_4">
-            </binding.ws>
-        </callback>
-    </reference>
-
-    <property name="prop1" xmlns:foo="http://foo">
-    	<ext:testExtension/>
-   	    <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </MyComplexPropertyValue1>
-        <MyComplexPropertyValue2 xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </MyComplexPropertyValue2>
-    </property>
-
-</composite>
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
deleted file mode 100644
index bcc8c54dc8..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
- 			targetNamespace="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- simple intent -->
- <sca:intent name="tuscanyIntent_1" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_2" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_3" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_4" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
-<sca:intent name="tuscanyIntent_5" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_6" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_7" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_8" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_9" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_10" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
- </sca:intent>
-  <!-- qualified intents -->
- <sca:intent name="tuscanyIntent_1.qualified" />
- <sca:intent name="tuscanyIntent_2.qualified" />
-</sca:definitions>
\ No newline at end of file
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
deleted file mode 100644
index b79cb6b7b7..0000000000
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://test"
- 			targetNamespace="http://test"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
- <!-- qualified intents -->
- <sca:intent name="confidentiality.transport" />
- <sca:intent name="confidentiality.message" />
- <sca:intent name="confidentiality.message.whole" />
- <sca:intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <sca:policySet name="SecureReliablePolicy"
- 	provides="confidentiality.transport integrity"
- 	appliesTo="//sca:binding.ws | //sca:binding.sca"
- 	xmlns="http://test"
- 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- 		<wsp:PolicyAttachment>
- 			<!-- policy expression and policy subject for
-				 "basic authentication" -->
-		</wsp:PolicyAttachment>
-     	<wsp:PolicyAttachment>
-		 	<!-- policy expression and policy subject for
-		 		"reliability" -->
-		</wsp:PolicyAttachment>
- </sca:policySet>
- 
- <sca:policySet name="SecureMessagingPolicies"
-	 provides="confidentiality"
-	 appliesTo="//sca:binding.ws"
-	 xmlns="http://test"
- 	 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-     <sca:intentMap provides="confidentiality" default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message" alternative" -->
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="SecurityPolicy" provides="confidentiality"
-	xmlns="http://test"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <sca:intentMap provides="confidentiality" default="message">
-        <sca:qualifier name="message">
-            <sca:intentMap provides="message" default="whole">
-                <sca:qualifier name="body">
-                	<wsp:Policy>
-                		<!-- policy attachment for body encryption --> 
-               		</wsp:Policy>
-           		</sca:qualifier>
-                <sca:qualifier name="whole">
-                	<wsp:Policy>
-                		<!-- policy attachment for whole message encryption --> 
-               		</wsp:Policy>
-             	</sca:qualifier>
-            </sca:intentMap>
-        </sca:qualifier>
-        <sca:qualifier name="transport">
-        	<wsp:Policy>
-        		<!-- policy attachment for transport encryption --> 
-       		</wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="BasicAuthMsgProtSecurity"
-     provides="authentication confidentiality"
-     appliesTo="//sca:binding.ws"
- 		xmlns="http://test">
-    <sca:policySetReference name="AuthenticationPolicies"/>
-    <sca:policySetReference name="ConfidentialityPolicies"/>
-</sca:policySet>
-
-<sca:policySet name="AuthenticationPolicies"
-	provides="authentication"
-	appliesTo="//sca:binding.ws"
-	xmlns="http://test"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <wsp:PolicyAttachment>
-        <!-- policy expression and policy subject for "basic
-        authentication" -->
-    </wsp:PolicyAttachment>
-</sca:policySet>
-
-<sca:policySet name="ConfidentialityPolicies"
- provides="confidentiality"
- bindings="binding.ws"
- xmlns="http://test"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <sca:intentMap provides="confidentiality"  default="transport">
-        <sca:qualifier name="transport">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "transport"
-                alternative -->
-            </wsp:Policy>
-            <wsp:Policy>...</wsp:Policy>
-        </sca:qualifier>
-        <sca:qualifier name="message">
-            <wsp:Policy>
-                <!-- policy expression and policy subject for "message"
-                alternative" -->...
-            </wsp:Policy>
-        </sca:qualifier>
-    </sca:intentMap>
-</sca:policySet>
-
-<!-- profile intent -->
- <sca:intent name="reliableMessageProtection" 
- 			 constrains="sca:binding"
- 			 requires="messageProtection">
- 			 <sca:description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="messageProtection" 
- 			 constrains="sca:binding"
- 			 requires="confidentiality integrity">
- 			 <sca:description>
- 			 	Protect messages from unauthorized reading or modification
- 			 </sca:description>
- </sca:intent>
-
-<!-- simple intent -->
- <sca:intent name="confidentiality" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized users from reading the messages.
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="integrity" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Communitcation thro this binding must prevent
- 			 unauthorized modification of the messages.
- 			 </sca:description>
- </sca:intent>
- 
- <sca:intent name="authentication" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Communitcation thro this binding required
- 			 Authentication.
- 			 </sca:description>
- </sca:intent>
- 
-</sca:definitions>
\ No newline at end of file
-- 
cgit v1.2.3