From 3c7739e39343f9b2f80f5e6d2ee17cbe640879d2 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 29 Jul 2008 15:17:29 +0000
Subject: Delete old rc3 tag

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@680733 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ClassNotFoundException/Calculator.composite    |  56 -----
 .../ClassNotFoundException/definitions.xml         |  78 -------
 .../Calculator.composite                           |  56 -----
 .../RequiredAttributeRolesMissing/definitions.xml  |  78 -------
 .../Calculator.composite                           |  56 -----
 .../AlwaysProvidedIntentNotFound/definitions.xml   |  63 ------
 .../Calculator.composite                           |  56 -----
 .../ErrorInPolicyIntentDefinition/definitions.xml  |  76 -------
 .../xml/IntentNotSpecified/Calculator.composite    |  56 -----
 .../policy/xml/IntentNotSpecified/definitions.xml  | 175 ---------------
 .../MayProvideIntentNotFound/Calculator.composite  |  56 -----
 .../xml/MayProvideIntentNotFound/definitions.xml   |  63 ------
 .../RequiredAttributeMissing/Calculator.composite  |  56 -----
 .../xml/RequiredAttributeMissing/definitions.xml   |  70 ------
 .../xml/UnableToMapPolicies/Calculator.composite   |  56 -----
 .../policy/xml/UnableToMapPolicies/definitions.xml | 241 ---------------------
 .../Calculator.composite                           |  56 -----
 .../definitions.xml                                |  68 ------
 18 files changed, 1416 deletions(-)
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
 delete mode 100644 tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml

(limited to 'tags/java/sca/1.3/itest/validation/src/main/resources/policy')

diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
deleted file mode 100644
index 53d1a581f0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ /dev/null
@@ -1,78 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow roles="r1 r2" />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
deleted file mode 100644
index ac45d95ce8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ /dev/null
@@ -1,78 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <!-- POLICY SETS -->
-    <policySet name="ps1" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <permitAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps2" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <allow/>
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps3" provides="authorization" appliesTo="sca:implementation">
-        <authorization>
-            <denyAll />
-        </authorization>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps4" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <runAs role="admin" />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps5" provides="securityIdentity" appliesTo="sca:implementation">
-        <securityIdentity>
-            <useCallerIdentity />
-        </securityIdentity>
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps6" provides="authorization" appliesTo="sca:implementation">
-        <permitAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps7" provides="authorization" appliesTo="sca:implementation">
-        <allow roles="r1 r2" />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps8" provides="authorization" appliesTo="sca:implementation">
-        <denyAll />
-    </policySet>
-
-    <!-- POLICY SETS -->
-    <policySet name="ps9" provides="securityIdentity" appliesTo="sca:implementation">
-        <runAs role="admin" />
-    </policySet>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
deleted file mode 100644
index 5cf6963a96..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +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://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- 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"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </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="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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
deleted file mode 100644
index d31c705fb5..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ /dev/null
@@ -1,76 +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://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- 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"/>
-                    
-<!-- qualified intents -->
- <intent name="confidentiality.transport" constrains="sca:binding"/>
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
deleted file mode 100644
index d214a7f40a..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/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_one" 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
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
deleted file mode 100644
index ede1786942..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ /dev/null
@@ -1,63 +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://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- 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"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </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>
- 
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
deleted file mode 100644
index fcb43c949b..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ /dev/null
@@ -1,70 +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://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:implementation.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-<bindingType alwaysProvides="test:confidentiality"
-                    mayProvide="test:integrity"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
deleted file mode 100644
index 6faca15da0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ /dev/null
@@ -1,241 +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://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:test="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:calc="http://calculator">
-    
-    <!-- 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"/>
-
-    <!-- PolicySets -->
-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
-        xmlns="http://www.osoa.org/xmlns/sca/1.0">
-        <tuscany:jdkLogger name="calculator">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
-    </policySet>
-    
-    <!-- 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://www.osoa.org/xmlns/sca/1.0"
- 	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>
- 
- 
- <!-- qualified intents -->
- <intent name="confidentiality.transport" />
- <intent name="confidentiality.message" />
- <intent name="confidentiality.message.whole" />
- <intent name="confidentiality.message.body" /> 
- 
- <!-- POLICY SETS -->
-  <policySet name="SecureReliablePolicy"
- 	provides="test:confidentiality.transport test:integrity"
- 	appliesTo="sca:binding.ws"
- 	xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 	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="SecurityPolicy" provides="test:confidentiality"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
-    <intentMap provides="test:confidentiality" default="message">
-        <qualifier name="message">
-            <intentMap provides="message" default="whole">
-                <qualifier name="body">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for body encryption --> 
-               		</wsp:PolicyAttachment>
-           		</qualifier>
-                <qualifier name="whole">
-                	<wsp:PolicyAttachment>
-                		<!-- policy attachment for whole message encryption --> 
-               		</wsp:PolicyAttachment>
-             	</qualifier>
-            </intentMap>
-        </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://www.osoa.org/xmlns/sca/1.0">
-    <policySetReference name="test:AuthenticationPolicies"/>
-    <policySetReference name="test:ConfidentialityPolicies"/>
-</policySet>
-
-<policySet name="AuthenticationPolicies"
-	provides="test:authentication"
-	appliesTo="binding.ws"
-	xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-    <intentMap provides="test:confidentiality"  default="transport">
-        <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://www.osoa.org/xmlns/sca/1.0"
- 	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>
- </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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.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 xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.warning.CalculatorServiceImpl">
-		</implementation.java>
-        <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.warning.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.warning.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.warning.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.warning.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
deleted file mode 100644
index 60f4de5cd3..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ /dev/null
@@ -1,68 +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://www.osoa.org/xmlns/sca/1.0"
-            targetNamespace="http://test"
-            xmlns:test="http://test"
-            xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-<!-- Extension Types Metadata -->
-<implementationType type="sca:interface.java" alwaysProvides="test:logging"
-                    mayProvide="test:tracing"/>
-
-<!-- simple intent -->
- <intent name="confidentiality" 
-             constrains="sca:binding">
-             <description>
-             Communitcation thro this binding must prevent
-             unauthorized users from reading the messages.
-             </description>
- </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
-- 
cgit v1.2.3