Added Test_ASM_0024 Test_ASM_0025

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

7 files changed, 240 insertions, 0 deletions

diff --git a/java/sca/stest/sampleTest/src/main/java/test/Service1.java b/java/sca/stest/sampleTest/src/main/java/test/Service1.java
index add3fe360d..da6b3d6424 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/Service1.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/Service1.java
@@ -18,11 +18,15 @@
  */

 package test;

 

+// TODO: Need to change *ALL* annotations to org.oasisopen.xxxx

+import org.osoa.sca.annotations.Remotable;

+

 /**

  * A test service interface

  * @author MikeEdwards

  *

  */

+@Remotable

 public interface Service1 {

 	

 	/**

diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java
new file mode 100644
index 0000000000..c4045b696c
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java
@@ -0,0 +1,44 @@
+/*

+ * 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.    

+ */

+package test;

+

+import org.osoa.sca.annotations.*;

+

+/**

+ * Java component implementation for business interface Service1

+ * - no references

+ * - 3 properties

+ * @author MikeEdwards

+ *

+ */

+@Service(Service1.class)

+public class service1Impl5 implements Service1 {

+	

+	@Property

+	public String serviceName = "service1";

+	@Property

+	public String serviceData1;

+	@Property

+	public String serviceData2;

+

+	public String operation1(String input) {

+		return serviceName + " operation1 invoked" + serviceData1 + serviceData2;

+	}

+

+}

diff --git a/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite b/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
index f1fd4c2d01..b6f23cf979 100644
--- a/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
+++ b/java/sca/stest/sampleTest/src/main/resources/TestComposite1.composite
@@ -17,6 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
+<!-- A simple composite which provides a single service and no references -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://oasis/tests"
            xmlns:sample="http://oasis/tests"
diff --git a/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite b/java/sca/stest/sampleTest/src/main/resources/TestComposite12.composite
new file mode 100644
index 0000000000..0a734ee9f4
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/TestComposite12.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.    
+-->
+<!-- A simple composite which provides a single service and no references
+     plus a property with a complex type -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://oasis/tests"
+           xmlns:test="http://oasis/tests"
+           name="TestComposite12">

+           
+	<service name="Service1" promote="TestComponent1/Service1">
+		<interface.java interface="test.Service1"></interface.java>
+	</service>

+
+    <property name="serviceName" type="string"/>
+    
+    <property name="complexType" type="test:ComplexType1"/>

+ 
+    <component name="TestComponent1">
+		<implementation.java class="test.service1Impl5"/>
+        <service name="Service1">

+        	<interface.java interface="test.Service1"/>

+        </service>
+        <property name="serviceName" source="$serviceName"/>
+        <property name="serviceData1" source="$complexType/firstData"/>
+        <property name="serviceData2" source="$complexType/secondData"/>
+    </component>
+
+</composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
new file mode 100644
index 0000000000..31ec496e2e
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0024.composite
@@ -0,0 +1,60 @@
+<?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.    

+-->

+<!-- Tests that where a <component/> <reference/> has @target set to 

+     some service, that the reference can have no child <binding/> elements   -->

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

+           targetNamespace="http://oasis/tests"

+           xmlns:tns="http://oasis/tests"

+           xmlns:sample="http://oasis/tests"

+           name="TEST_ASM_0024">

+           

+    <component name="TestClient">

+		<implementation.composite name="tns:TestClient_0002"/>

+		<service name="TestInvocation">

+			<interface.java interface="test.TestInvocation"/>

+            <binding.ws/>

+		</service>

+        <reference name="reference1" target="TestComponent1/Service1" />

+        <property name="testName">ASM_0024</property>

+    </component>

+    

+    <component name="TestComponent1">

+		<implementation.composite name="tns:TestComposite4"/>

+        <service name="Service1">

+        	<interface.java interface="test.Service1"/>

+        </service>

+        <property name="serviceName">service1</property>

+        <reference name="Reference1" target="TestComponent2/Service1">

+        	<interface.java interface="test.Service1"/>

+        	<!-- A binding which contradicts the @target attribute -->

+        	<binding.ws/>

+        </reference>

+    </component>

+    

+    <component name="TestComponent2">

+		<implementation.composite name="tns:TestComposite1"/>

+        <service name="Service1">

+        	<interface.java interface="test.Service1"/>

+        	<binding.ws/>

+        </service>

+        <property name="serviceName">service2</property>

+    </component>    

+    

+</composite>

diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
new file mode 100644
index 0000000000..96ee58484a
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0025.composite
@@ -0,0 +1,54 @@
+<?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.    

+-->

+<!-- Tests that where a <component/> <property/> has its value set by means 

+     of a child <value/> element, that the type of the <value/> element matches 

+     the type declared for the <property/> element   -->

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

+           targetNamespace="http://oasis/tests"

+           xmlns:tns="http://oasis/tests"

+           xmlns:test="http://oasis/tests"

+           name="TEST_ASM_0025">

+           

+    <component name="TestClient">

+		<implementation.composite name="tns:TestClient_0002"/>

+		<service name="TestInvocation">

+			<interface.java interface="test.TestInvocation"/>

+            <binding.ws/>

+		</service>

+        <reference name="reference1" target="TestComponent1/Service1" />

+        <property name="testName">ASM_0025</property>

+    </component>

+    

+    <component name="TestComponent1">

+		<implementation.composite name="tns:TestComposite12"/>

+        <service name="Service1">

+        	<interface.java interface="test.Service1"/>

+        </service>

+        <property name="serviceName">service1</property>

+        <!-- Property with complex type with a value declared using a <value/> subelement -->

+        <property name="complexType" type="test:ComplexType1">

+            <value>

+            	<firstData>complex1</firstData>

+            	<secondData>complex2</secondData>

+            </value>

+        </property>

+    </component> 

+    

+</composite>

diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd b/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd
new file mode 100644
index 0000000000..b5de3a4c38
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_Types.xsd
@@ -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.    

+-->

+<!-- Schema for Schema types used by the SCA TestCases -->

+<schema xmlns="http://www.w3.org/2001/XMLSchema" 

+    targetNamespace="http://oasis/tests"

+    xmlns:test="http://oasis/tests"

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

+    elementFormDefault="qualified">

+

+    <complexType name="ComplexType1">

+	    <element name="firstData" type="string" />

+        <element name="secondData" type="string" />

+    </complexType>

+       

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