Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 287 insertions, 0 deletions

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite b/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite
new file mode 100644
index 0000000000..534e1a29af
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite
@@ -0,0 +1,44 @@
+<?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="CalculatorA">

+

+    <component name="CalculatorServiceComponentA">

+		<implementation.java class="calculator.CalculatorServiceImpl"/>

+        <service name="CalculatorService">

+            <binding.sca/>

+        </service>		

+        <reference name="addService" target="AddServiceComponentB" />     

+        <reference name="subtractService" target="SubtractServiceComponentC" />

+        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     

+        <reference name="divideService" target="DivideServiceComponentA" />

+    </component>  

+

+    <component name="MultiplyServiceComponentA">

+        <implementation.java class="calculator.MultiplyServiceImpl" />

+    </component>    

+    

+    <component name="DivideServiceComponentA">

+        <implementation.java class="calculator.DivideServiceImpl" />

+    </component>

+

+</composite>

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..1b1c0291e2
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	      targetNamespace="http://sample"

+              xmlns:sample="http://sample">

+   <deployable composite="sample:CalculatorA"/>

+</contribution>
\ No newline at end of file
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
new file mode 100644
index 0000000000..bdb89803d1
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
@@ -0,0 +1,45 @@
+<?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="CalculatorB">

+           

+    <component name="CalculatorServiceComponentB">

+		<implementation.java class="calculator.CalculatorServiceImpl"/>

+        <reference name="addService" target="AddServiceComponentB" />     

+        <reference name="subtractService" target="SubtractServiceComponentC" />

+        <reference name="multiplyService" target="MultiplyServiceComponentB"/>     

+        <reference name="divideService" target="DivideServiceComponentB" />

+    </component>

+

+    <component name="MultiplyServiceComponentB">

+        <implementation.java class="calculator.MultiplyServiceImpl" />

+    </component>   

+    

+    <component name="DivideServiceComponentB">

+        <implementation.java class="calculator.DivideServiceImpl" />

+    </component>

+    

+    <component name="AddServiceComponentB">

+        <implementation.java class="calculator.AddServiceImpl" />

+    </component>

+    

+</composite>

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
new file mode 100644
index 0000000000..c5af8dd3cc
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
@@ -0,0 +1,32 @@
+<?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="CalculatorC">

+

+    <component name="SubtractServiceComponentC">

+        <implementation.java class="calculator.SubtractServiceImpl" />

+        <service name="SubtractService">

+            <binding.sca/>

+        </service>

+    </component>

+

+</composite>

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite
new file mode 100644
index 0000000000..df00387b23
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite
@@ -0,0 +1,36 @@
+<?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://dependent"

+           xmlns:dependent="http://dependent"

+           name="CalculatorB">

+               

+    <component name="AddServiceComponentB">

+        <implementation.java class="calculator.AddServiceImpl" />

+        <service name="AddService">

+            <binding.ws uri="http://localhost:8085/AddServiceComponentB"/>

+        </service>

+    </component>

+    

+    <component name="SubtractServiceComponentB">

+        <implementation.java class="calculator.SubtractServiceImpl" />

+    </component>    

+    

+</composite>

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8264a8243f
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	      targetNamespace="http://dependent"

+              xmlns:sample="http://dependent">

+   <export namespace="http://dependent"/>

+</contribution>
\ No newline at end of file
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
new file mode 100644
index 0000000000..92d069c6c9
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
@@ -0,0 +1,57 @@
+<?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://primary"

+           xmlns:primary="http://primary"

+           xmlns:dependent="http://dependent"

+           name="CalculatorA">

+           

+    <include name="dependent:CalculatorB"/>

+

+    <component name="CalculatorServiceComponentA">

+		<implementation.java class="calculator.CalculatorServiceImpl"/>

+        <service name="CalculatorService">

+            <binding.sca/>

+        </service>		

+        <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">

+          <binding.sca/>

+          <binding.ws/>

+        </reference>

+        <reference name="subtractService" target="SubtractServiceComponentB" />

+        <reference name="multiplyService" target="MultiplyServiceComponentA" />     

+        <reference name="divideService" target="DivideServiceComponentA" />

+    </component>  

+

+    <component name="AddServiceComponentA">

+        <implementation.java class="calculator.AddServiceImpl" />

+        <service name="AddService">

+            <binding.sca/>

+        </service>

+    </component>

+    

+    <component name="MultiplyServiceComponentA">

+        <implementation.java class="calculator.MultiplyServiceImpl" />

+    </component>    

+    

+    <component name="DivideServiceComponentA">

+        <implementation.java class="calculator.DivideServiceImpl" />

+    </component>

+

+</composite>

diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..e53c14a651
--- /dev/null
+++ b/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	      targetNamespace="http://primary"

+              xmlns:sample="http://primary">

+   <deployable composite="sample:CalculatorA"/>

+   <import namespace="http://dependent"/>

+</contribution>
\ No newline at end of file