diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-20 23:30:48 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-20 23:30:48 +0000 |
commit | ad93ebea59fa455d4fb0bc5771f7a9548790b171 (patch) | |
tree | f0eb1bbb04daff9fb87f38885672207d1e63066d /java/sca/modules/assembly-xml/src/test/resources | |
parent | c53bddb7cd7eb1f06a3a8a4f43e590b5cea28aa1 (diff) |
Remove constrainingType as it is now not part of the OASIS SCA specs
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@827835 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
4 files changed, 5 insertions, 40 deletions
diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType deleted file mode 100644 index 9a43d44377..0000000000 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<constrainingType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns:calc="http://calc" - targetNamespace="http://calc" - name="CalculatorComponent"> - - <service name="CalculatorService"> - <interface.java class="calculator.CalculatorService" /> - </service> - - <reference name="divideService" multiplicity="1..1"> - <interface.java class="calculator.DivideService" /> - </reference> - -</constrainingType> - diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite index 65e709f9b1..807e256fc5 100644 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite +++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite @@ -18,7 +18,7 @@ * under the License.
-->
-<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" policySets="sns:SecureReliablePolicy"
+<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/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -45,7 +45,7 @@ </callback>
</service>
- <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
+ <component name="CalculatorServiceComponent" autowire="false"
policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
<ext:testExtension/> <service name="CalculatorService" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">
diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite index 0336002ded..8ca71a0580 100644 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite +++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite @@ -18,7 +18,6 @@ * under the License. --> <composite autowire="false" - constrainingType="tns:Calculator" local="true" name="TestAllDivide" policySets="" requires="" @@ -47,7 +46,7 @@ </callback> </service> - <component name="CalculatorDivideComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent" policySets="" requires=""> + <component name="CalculatorDivideComponent" autowire="false" policySets="" requires=""> <service name="DivideService" policySets="" requires=""> <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/> </service> diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite index 661270d341..5c7e4435bb 100644 --- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite +++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite @@ -18,7 +18,7 @@ * under the License.
-->
-<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator"
+<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/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -44,7 +44,7 @@ </callback>
</service>
- <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorComponent"
+ <component name="CalculatorServiceComponent" autowire="false"
requires="cns:tuscanyIntent_2 cns:tuscanyIntent_3">
<ext:testExtension/> <service name="CalculatorService" requires="cns:tuscanyIntent_3">
|