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

9 files changed, 258 insertions, 17 deletions

diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
index 060d82ab9e..806e88ae52 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
@@ -1,3 +1,21 @@
+/*

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

@@ -18,7 +36,7 @@ public class ASM_0001_Client implements TestInvocation {
 	 * This method is offered as a service and is 

 	 * invoked by the test client to run the test

 	 */

-	public String invokeTest( String input ) {

+	public String invokeTest( String input ) throws TestException {

 		String response = null;

 		

 		response = runTest( input );

diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
index 54e05aef74..4ad8a375b3 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
@@ -1,3 +1,21 @@
+/*

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

@@ -24,11 +42,14 @@ public class ASM_0002_Client implements TestInvocation {
 	 * This method is offered as a service and is 

 	 * invoked by the test client to run the test

 	 */

-	public String invokeTest( String input ) {

+	public String invokeTest( String input ) throws TestException {

 		String response = null;

 		

-		response = runTest( input );

-		

+		try {

+			response = runTest( input );

+		} catch( Exception e ) {

+			throw new TestException("Test service got an exception during execution: " );

+		} // end try

 		return response;

 	} // end method invokeTest

 	

diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
index dc60c0fcde..a76d3e1523 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
@@ -1,3 +1,21 @@
+/*

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

@@ -26,7 +44,7 @@ public class ASM_0003_Client implements TestInvocation {
 	 * This method is offered as a service and is 

 	 * invoked by the test client to run the test

 	 */

-	public String invokeTest( String input ) {

+	public String invokeTest( String input ) throws TestException {

 		String response = null;

 		

 		response = runTest( input );

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 303a4f1cdd..add3fe360d 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/Service1.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/Service1.java
@@ -1,3 +1,21 @@
+/*

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

 

 /**

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

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

+

+/*

+ * Exception thrown by SCA Test services

+ */

+public class TestException extends Exception {

+

+	/**

+	 * Required serialVersionUID field

+	 */

+	private static final long serialVersionUID = -6978058912756564824L;

+	

+	public TestException() { super(); };

+	

+	public TestException( String msg ) { super( msg ); };

+	

+	public TestException( String msg, Throwable cause ) { super( msg, cause); };

+	

+	public TestException( Throwable cause ) { super( cause ); };

+

+}

diff --git a/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
index c546171b09..7db28301e4 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
@@ -1,3 +1,21 @@
+/*

+ * 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 javax.jws.WebService;

@@ -16,8 +34,9 @@ public interface TestInvocation {
 	 * Method for invoking testcase

 	 * @param input - input parameter(s) as a String

 	 * @return - output data as a String

+	 * @throws - a TestException is thrown in cases where the test service fails internally

 	 */

 	@WebMethod

-	public String invokeTest( String input );

+	public String invokeTest( String input ) throws TestException ;

 

 }

diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
index 98000e28f7..cfbe4a97bb 100644
--- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
+++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
@@ -1,3 +1,21 @@
+/*

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

diff --git a/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl b/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
index 41aa701ee9..f9475a016a 100644
--- a/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
+++ b/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
@@ -1,12 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<wsdl:definitions name="TestInvocationService" targetNamespace="http://test/"

-  xmlns:test="http://test/" 

-  xmlns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 

+<!--

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

+-->

+<!-- Produced from the TestInvocation,java interface by running a service

+     based on that interface in an SCA runtime using a Web services binding

+

+     Mike Edwards, 6th January 2008

+-->

+<wsdl:definitions name="TestInvocationService" 

+  targetNamespace="http://test/" 

+  xmlns:tns="http://test/" 

+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

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

+  xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 

   xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">

   <wsdl:types>

+    <xs:schema targetNamespace="http://test/" version="1.0" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      <xs:element name="TestException" type="tns:TestException"/>

+      <xs:complexType name="TestException">

+        <xs:sequence>

+          <xs:element minOccurs="0" name="message" type="xs:string"/>

+        </xs:sequence>

+      </xs:complexType>

+    </xs:schema>

     <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" 

-      targetNamespace="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">

+      targetNamespace="http://test/" 

+      xmlns:xs="http://www.w3.org/2001/XMLSchema">

       <xs:element name="invokeTest">

         <xs:complexType>

           <xs:sequence>

@@ -24,22 +58,28 @@
     </xs:schema>

   </wsdl:types>

   <wsdl:message name="invokeTest">

-    <wsdl:part name="invokeTest" element="test:invokeTest">

+    <wsdl:part name="invokeTest" element="tns:invokeTest">

     </wsdl:part>

   </wsdl:message>

   <wsdl:message name="invokeTestResponse">

-    <wsdl:part name="invokeTestResponse" element="test:invokeTestResponse">

+    <wsdl:part name="invokeTestResponse" element="tns:invokeTestResponse">

+    </wsdl:part>

+  </wsdl:message>

+  <wsdl:message name="TestException">

+    <wsdl:part name="TestException" element="tns:TestException">

     </wsdl:part>

   </wsdl:message>

   <wsdl:portType name="TestInvocation">

     <wsdl:operation name="invokeTest">

-      <wsdl:input message="test:invokeTest">

+      <wsdl:input message="tns:invokeTest">

     </wsdl:input>

-      <wsdl:output message="test:invokeTestResponse">

+      <wsdl:output message="tns:invokeTestResponse">

     </wsdl:output>

+      <wsdl:fault name="TestException" message="tns:TestException">

+    </wsdl:fault>

     </wsdl:operation>

   </wsdl:portType>

-  <wsdl:binding name="TestInvocationBinding" type="test:TestInvocation">

+  <wsdl:binding name="TestInvocationBinding" type="tns:TestInvocation">

     <SOAP:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

     <wsdl:operation name="invokeTest">

       <SOAP:operation soapAction=""/>

@@ -49,10 +89,13 @@
       <wsdl:output>

         <SOAP:body use="literal"/>

       </wsdl:output>

+      <wsdl:fault name="TestException">

+        <SOAP:fault name="TestException" use="literal"/>

+      </wsdl:fault>

     </wsdl:operation>

   </wsdl:binding>

   <wsdl:service name="TestInvocationService">

-    <wsdl:port name="TestInvocationPort" binding="test:TestInvocationBinding">

+    <wsdl:port name="TestInvocationPort" binding="tns:TestInvocationBinding">

       <SOAP:address location="http://localhost:8080/TestClient"/>

     </wsdl:port>

   </wsdl:service>

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

+-->

+<!-- Test checks that the @name attribute of a <service/>

+     element of a <component/> matches the @name attribute of a <service/> element of the

+     componentType of the <implementation/> used by the <component/>   -->

+<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_0006">

+           

+    <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/InvalidName" />

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

+    </component>

+

+    <component name="TestComponent1">

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

+        <service name="InvalidName">

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

+        </service>

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

+    </component>

+    

+</composite>