From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 7 Oct 2013 22:23:21 +0000
Subject: Official Tuscany 2.0.1 Release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/assembly/xml/Calculator.composite  |  59 ------
 .../sca/assembly/xml/CalculatorImpl.componentType  |  31 ---
 .../sca/assembly/xml/CalculatorURISpaces.composite |  59 ------
 .../sca/assembly/xml/Multiplicity.composite        |  32 ----
 .../sca/assembly/xml/NestedCalculator.composite    |  29 ---
 .../sca/assembly/xml/RMIBindingTest.composite      |  44 -----
 .../sca/assembly/xml/TestAllCalculator.composite   | 127 -------------
 .../sca/assembly/xml/TestAllDivide.composite       |  56 ------
 .../assembly/xml/TestAllPolicyCalculator.composite | 125 -------------
 .../sca/assembly/xml/another_test_definitions.xml  |  96 ----------
 .../tuscany/sca/assembly/xml/local.composite       |  27 ---
 .../tuscany/sca/assembly/xml/test_definitions.xml  | 206 --------------------
 .../sca/definitions/xml/test_definitions.xml       | 207 ---------------------
 .../tuscany/sca/policy/xml/Calculator.composite    |  49 -----
 .../tuscany/sca/policy/xml/test_definitions.xml    | 206 --------------------
 15 files changed, 1353 deletions(-)
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
 delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml

(limited to 'sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany')

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
deleted file mode 100644
index be0c1eb737..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:x="http://x"
-	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"  multiplicity="0..1" 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>
-    
-    <x:unknownElement uknAttr="attribute1">
-		<y:subUnknownElement1 xmlns:y="http://y" uknAttr1="attribute2"/>
-		<x:subUnknownElement2 />
-	</x:unknownElement>
-		
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
deleted file mode 100644
index 83fa64cef4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/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://docs.oasis-open.org/ns/opencsa/sca/200912">
-
-  <service name="CalculatorService">
-        <interface.java interface="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java interface="calculator.DivideService" />
-  </reference>  
-
-</componentType>              
-       
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
deleted file mode 100644
index 287810b156..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:x="http://x"
-	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"  multiplicity="0..1" 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>
-    
-    <x:unknownElement uknAttr="attribute1">
-		<y:subUnknownElement1 xmlns:y="http://y" uknAttr1="attribute2"/>
-		<x:subUnknownElement2 />
-	</x:unknownElement>
-		
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
deleted file mode 100644
index 0d344ac937..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ /dev/null
@@ -1,32 +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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://temp" 
-           name="composite1"> 
-  <component name="data7"> 
-    <implementation.java class="temp.EchoImpl"/> 
-    <service name="Echo"> 
-      <interface.wsdl interface="http://echo.webservice#wsdl.interface(Echo)"/> 
-    </service> 
-    <reference multiplicity="0..n" name="reference" requires=""/> 
-  </component> 
-
-  <reference multiplicity="1..n" name="reference" promote="" requires=""/> 
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
deleted file mode 100644
index 5606e653bb..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:calc="http://calc"
-	targetNamespace="http://calc"
-	name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.composite xmlns:n="http://inner" name="n:InnerCalculator"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
deleted file mode 100644
index 9140403fc4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	       targetNamespace="http://helloWorldRMI"
-           name="HelloWorldRmiComposite">
-
-	<service name="HelloWorldRmiService" promote="HelloWorldServiceComponent">
-        <interface.java interface="helloworld.HelloWorldService"/>
-        <tuscany:binding.rmi uri="rmi://localhost:8099/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 uri="rmi://localhost:8099/HelloWorldRemoteService"   />
-    </reference>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
deleted file mode 100644
index 195dfcf106..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ /dev/null
@@ -1,127 +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" local="true" name="TestAllCalculator" policySets="sns:SecureReliablePolicy"
-    requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 "
-    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">
-        </binding.ws>
-
-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
-            </binding.ws>
-        </callback>
-    </service>
-
-    <component name="CalculatorServiceComponent" autowire="false" 
-        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" />
-
-        <binding.ws name="MultiplyWS" port="" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" uri="http://calc/ws">
-        </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">
-            </binding.ws>
-        </callback>
-    </reference> 
-
-    <property name="prop1" xmlns:foo="http://foo" many="true" type="foo:MyComplexType">
-   	    <value xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </value>
-        <value xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </value>
-    </property>
-    
-    <property name="prop2" xmlns:foo="http://foo" mustSupply="true" element="foo:MyComplexPropertyValue1">
-        <foo:MyComplexPropertyValue1>123</foo:MyComplexPropertyValue1>
-    </property>
-    <property name="prop3" xmlns:foo="http://foo" mustSupply="true" value="123"/>
-    <property name="prop4">123</property>
-    <property name="prop5"><value>123</value></property>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
deleted file mode 100644
index 42e6c1c3ec..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/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"
-	local="true"
-	name="TestAllDivide"
-	policySets="" requires=""
-	targetNamespace="http://calc"
-	xmlns:tns="http://calc"
-	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 ">
-	
-    <!-- 
-  <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" 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/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
deleted file mode 100644
index 424cec3e8a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ /dev/null
@@ -1,125 +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" local="true" name="TestAllCalculator" 
-    requires="cns:tuscanyIntent_1" targetNamespace="http://calc" xmlns:tns="http://calc"
-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 "
-    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" 
-        requires="cns:tuscanyIntent_2 cns:tuscanyIntent_3">
-        <ext:testExtension/>
-        <service name="CalculatorService" requires="cns:tuscanyIntent_3">
-            <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback" />
-            <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" />
-            <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" />
-
-        <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">
-        <value xsi:type="foo:MyComplexType" attr="bar">
-            <foo:a>AValue</foo:a>
-            <bar:b xmlns:bar="http://bar">InterestingURI</bar:b>
-        </value>
-        <value xsi:type="foo:MyComplexType" attr="zing">
-            <foo:a>BValue</foo:a>
-            <bar:b xmlns:bar="http://bar">BoringURI</bar:b>
-        </value>
-    </property>
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
deleted file mode 100644
index 489d6abed1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ /dev/null
@@ -1,96 +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://docs.oasis-open.org/ns/opencsa/sca/200912">
-
-<!-- simple intent -->
- <sca:intent name="tuscanyIntent_1" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
-             <sca:qualifier name="qualified" default="true"/>
- </sca:intent>
- 
- <sca:intent name="tuscanyIntent_2" 
- 			 constrains="sca:binding">
- 			 <sca:description>
- 			 Sample Intent
- 			 </sca:description>
-             <sca:qualifier name="qualified" default="true"/>
- </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>
-</sca:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
deleted file mode 100644
index 279f7d534e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	xmlns:calc="http://localcalc"
-	xmlns:test="http://testlocal"
-	targetNamespace="http://localcalc"
-	name="LocalCalculator"
-      local="true">
-
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
deleted file mode 100644
index 2cfbd6bcff..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ /dev/null
@@ -1,206 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-
-    <!-- Extension Types Metadata -->
-    <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
-    <bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality" mayProvide="test:integrity" />
-
-    <!-- Intents and Policysets to assume targetnamespace -->
-    <intent name="TestIntentOne" constrains="sca:binding">
-        <description>
-            Test Intent
-             </description>
-    </intent>
-
-    <intent name="TestIntentTwo" constrains="sca:binding" requires="test:TestIntentOne">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message" alternative" -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for body encryption -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for whole message encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for transport encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-        <policySetReference name="test:AuthenticationPolicies" />
-        <policySetReference name="test:ConfidentialityPolicies" />
-    </policySet>
-
-    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for "basic
-        authentication" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport"
-                alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message"
-                alternative" -->
-                    ...
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <sp:SecurityToken>
-                        <sp:TokenType>sp:X509v3</sp:TokenType>
-                    </sp:SecurityToken>
-                    <sp:UsernameToken />
-                    <sp:SignedParts />
-                    <sp:EncryptedParts>
-                        <sp:Body />
-                    </sp:EncryptedParts>
-                    <sp:TransportBinding>
-                        <sp:IncludeTimeStamp />
-                    </sp:TransportBinding>
-                </wsp:All>
-            </wsp:ExactlyOne>
-        </wsp:Policy>
-    </policySet>
-
-    <!-- profile intent -->
-    <intent name="reliableMessageProtection" constrains="sca:binding" requires="test:messageProtection">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <intent name="messageProtection" constrains="sca:binding" requires="test:confidentiality test:integrity">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <!-- simple intent -->
-    <intent name="confidentiality" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized users from reading the messages.
-        </description>
-        <qualifier name="transport" />
-        <qualifier name="message" default="true" />
-    </intent>
-
-    <intent name="integrity" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized modification of the messages.
-             </description>
-    </intent>
-
-    <intent name="authentication" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding required
-            Authentication.
-             </description>
-    </intent>
-
-    <intent name="logging" constrains="sca:implementation">
-        <description>
-            All messages to and from this implementation must be logged
-             </description>
-    </intent>
-
-    <intent name="tracing" constrains="sca:implementation.java">
-        <description>
-            Need to figure out some description for this 
-             </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
deleted file mode 100644
index dc7f5c422c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
+++ /dev/null
@@ -1,207 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-
-    <!-- Extension Types Metadata -->
-    <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
-    <bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality" mayProvide="test:integrity" />
-
-    <!-- Intents and Policysets to assume targetnamespace -->
-    <intent name="TestIntentOne" constrains="sca:binding">
-        <description>
-            Test Intent
-             </description>
-    </intent>
-
-    <intent name="TestIntentTwo" constrains="sca:binding" requires="test:TestIntentOne">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
-        attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message" alternative" -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for body encryption -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for whole message encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for transport encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-        <policySetReference name="test:AuthenticationPolicies" />
-        <policySetReference name="test:ConfidentialityPolicies" />
-    </policySet>
-
-    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for "basic
-        authentication" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport"
-                alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message"
-                alternative" -->
-                    ...
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <sp:SecurityToken>
-                        <sp:TokenType>sp:X509v3</sp:TokenType>
-                    </sp:SecurityToken>
-                    <sp:UsernameToken />
-                    <sp:SignedParts />
-                    <sp:EncryptedParts>
-                        <sp:Body />
-                    </sp:EncryptedParts>
-                    <sp:TransportBinding>
-                        <sp:IncludeTimeStamp />
-                    </sp:TransportBinding>
-                </wsp:All>
-            </wsp:ExactlyOne>
-        </wsp:Policy>
-    </policySet>
-
-    <!-- profile intent -->
-    <intent name="reliableMessageProtection" constrains="sca:binding" requires="test:messageProtection">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <intent name="messageProtection" constrains="sca:binding" requires="test:confidentiality test:integrity">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <!-- simple intent -->
-    <intent name="confidentiality" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized users from reading the messages.
-        </description>
-        <qualifier name="transport" />
-        <qualifier name="message" default="true" />
-    </intent>
-
-    <intent name="integrity" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized modification of the messages.
-             </description>
-    </intent>
-
-    <intent name="authentication" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding required
-            Authentication.
-             </description>
-    </intent>
-
-    <intent name="logging" constrains="sca:implementation">
-        <description>
-            All messages to and from this implementation must be logged
-             </description>
-    </intent>
-
-    <intent name="tracing" constrains="sca:implementation.java">
-        <description>
-            Need to figure out some description for this 
-             </description>
-    </intent>
-
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
deleted file mode 100644
index 0e7aad877e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent" requires="confidentiality">
-		<implementation.java class="calculator.CalculatorServiceImpl" xmlns:test="http://test" requiers="test:TestIntentOne"/>
-        <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/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
deleted file mode 100644
index aea941a78f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ /dev/null
@@ -1,206 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://test"
-    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-
-    <!-- Extension Types Metadata -->
-    <implementationType type="sca:implementation.java" alwaysProvides="test:logging" mayProvide="test:tracing" />
-    <bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality" mayProvide="test:integrity" />
-
-    <!-- Intents and Policysets to assume targetnamespace -->
-    <intent name="TestIntentOne" constrains="sca:binding">
-        <description>
-            Test Intent
-             </description>
-    </intent>
-
-    <intent name="TestIntentTwo" constrains="sca:binding" requires="test:TestIntentOne">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
-        attachTo = "//sca:component[@name='CalculatorServiceComponent']/sca:reference[@name='addService']"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 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>
-    </policySet>
-
-    <policySet name="SecureMessagingPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport" alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message" alternative" -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecurityPolicy" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                <!-- policy attachment for body encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy attachment for transport encryption -->
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="BasicAuthMsgProtSecurity" provides="test:authentication test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-        <policySetReference name="test:AuthenticationPolicies" />
-        <policySetReference name="test:ConfidentialityPolicies" />
-    </policySet>
-
-    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:PolicyAttachment>
-            <!-- policy expression and policy subject for "basic
-        authentication" -->
-        </wsp:PolicyAttachment>
-    </policySet>
-
-    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <intentMap provides="test:confidentiality">
-            <qualifier name="transport">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "transport"
-                alternative -->
-                </wsp:PolicyAttachment>
-                <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
-            </qualifier>
-            <qualifier name="message">
-                <wsp:PolicyAttachment>
-                    <!-- policy expression and policy subject for "message"
-                alternative" -->
-                    ...
-                </wsp:PolicyAttachment>
-            </qualifier>
-        </intentMap>
-    </policySet>
-
-    <policySet name="SecureWSPolicy" provides="test:confidentiality" appliesTo="sca:binding.ws"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"
-        xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-        <wsp:Policy>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <sp:SecurityToken>
-                        <sp:TokenType>sp:X509v3</sp:TokenType>
-                    </sp:SecurityToken>
-                    <sp:UsernameToken />
-                    <sp:SignedParts />
-                    <sp:EncryptedParts>
-                        <sp:Body />
-                    </sp:EncryptedParts>
-                    <sp:TransportBinding>
-                        <sp:IncludeTimeStamp />
-                    </sp:TransportBinding>
-                </wsp:All>
-            </wsp:ExactlyOne>
-        </wsp:Policy>
-    </policySet>
-
-    <!-- profile intent -->
-    <intent name="reliableMessageProtection" constrains="sca:binding" requires="test:messageProtection">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <intent name="messageProtection" constrains="sca:binding" requires="test:confidentiality test:integrity">
-        <description>
-            Protect messages from unauthorized reading or modification
-             </description>
-    </intent>
-
-    <!-- simple intent -->
-    <intent name="confidentiality" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized users from reading the messages.
-        </description>
-        <qualifier name="transport" />
-        <qualifier name="message" default="true" />
-    </intent>
-
-    <intent name="integrity" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding must prevent
-            unauthorized modification of the messages.
-             </description>
-    </intent>
-
-    <intent name="authentication" constrains="sca:binding">
-        <description>
-            Communitcation thro this binding required
-            Authentication.
-             </description>
-    </intent>
-
-    <intent name="logging" constrains="sca:implementation">
-        <description>
-            All messages to and from this implementation must be logged
-             </description>
-    </intent>
-
-    <intent name="tracing" constrains="sca:implementation.java">
-        <description>
-            Need to figure out some description for this 
-             </description>
-    </intent>
-
-   <externalAttachment policySets="test:TestPolicySetOne" attachTo="IntentRefs('test:testIntentOne')"/>
- 
-</definitions>
\ No newline at end of file
-- 
cgit v1.2.3