Author: edwardsmj
Date: Tue Jan 6 15:03:35 2009
New Revision: 732165
URL: http://svn.apache.org/viewvc?rev=732165&view=rev
Log: (empty)
Added:
tuscany/java/sca/stest/sampleTest/src/main/java/test/TestException.java
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/README.txt
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
tuscany/java/sca/stest/sampleTest/src/test/resources/
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
tuscany/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java
Tue Jan 6 15:03:35 2009
@@ -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 @@
* 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 );
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java
Tue Jan 6 15:03:35 2009
@@ -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 @@
* 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
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java
Tue Jan 6 15:03:35 2009
@@ -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 @@
* 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 );
Modified: tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/Service1.java Tue Jan
6 15:03:35 2009
@@ -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;
/**
Added: tuscany/java/sca/stest/sampleTest/src/main/java/test/TestException.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/TestException.java?rev=732165&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/TestException.java
(added)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/TestException.java Tue
Jan 6 15:03:35 2009
@@ -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 ); };
+
+}
Modified:
tuscany/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java
Tue Jan 6 15:03:35 2009
@@ -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 @@
* 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 ;
}
Modified: tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java Tue
Jan 6 15:03:35 2009
@@ -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.*;
Modified: tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl
(original)
+++ tuscany/java/sca/stest/sampleTest/src/main/resources/TestClient.wsdl Tue
Jan 6 15:03:35 2009
@@ -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>
Added:
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0006.composite?rev=732165&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
(added)
+++
tuscany/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0006.composite
Tue Jan 6 15:03:35 2009
@@ -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>
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java?rev=732165&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java
Tue Jan 6 15:03:35 2009
@@ -0,0 +1,45 @@
+/*
+ * 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 client;
+
+
+import test.ASM_0002_Client;
+import testClient.TestInvocation;
+
+/**
+ * Client for ASM_0006_TestCase, which 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/>
+ */
+public class ASM_0006_TestCase extends BaseJAXWSTestCase {
+
+
+ protected TestConfiguration getTestConfiguration() {
+ TestConfiguration config = new TestConfiguration();
+ config.testName = "ASM_0006";
+ config.input = "request";
+ config.output = "exception";
+ config.composite = "Test_ASM_0006.composite";
+ config.testServiceName = "TestClient";
+ config.testClass = ASM_0002_Client.class;
+ config.serviceInterface = TestInvocation.class;
+ return config;
+ }
+
+} // end class Test_ASM_0003
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
(original)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java
Tue Jan 6 15:03:35 2009
@@ -68,7 +68,7 @@
try {
String output = invokeTest( testConfiguration.getInput() );
assertEquals( testConfiguration.getExpectedOutput(), output );
- } catch (Exception e) {
+ } catch (Throwable e) {
e.printStackTrace();
System.out.println( "Exception received - detail: " +
e.getMessage() );
assertEquals( testConfiguration.getExpectedOutput(),
"exception" );
@@ -76,7 +76,7 @@
System.out.println("Test " + testConfiguration.getTestName() + "
completed successfully");
}
- public String invokeTest( String input ) throws MalformedURLException {
+ public String invokeTest( String input ) throws Exception {
//Web service invocation via JAXWS
QName serviceName = new QName("http://test/";, "TestInvocationService");
URL wsdlLocation =
this.getClass().getClassLoader().getResource("TestClient.wsdl");
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java
Tue Jan 6 15:03:35 2009
@@ -69,7 +69,7 @@
System.out.println("Test " + testConfiguration.getTestName() + "
completed successfully");
}
- public String invokeTest( String input ) {
+ public String invokeTest( String input ) throws Exception {
TestInvocation service = (TestInvocation) getService(
testConfiguration.getServiceInterface(),
testConfiguration.getTestServiceName() );
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java
(original)
+++ tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java
Tue Jan 6 15:03:35 2009
@@ -1,4 +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 testClient;
import javax.xml.bind.JAXBElement;
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
(original)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java
Tue Jan 6 15:03:35 2009
@@ -1,4 +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 testClient;
import javax.xml.bind.JAXBElement;
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
(original)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java
Tue Jan 6 15:03:35 2009
@@ -1,4 +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 testClient;
import javax.xml.bind.JAXBElement;
@@ -10,7 +27,7 @@
/**
* This object contains factory methods for each
* Java content interface and Java element interface
- * generated in the test package.
+ * generated in the testClient package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
@@ -24,17 +41,26 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _InvokeTestResponseReturn_QNAME = new QName("",
"return");
+ private final static QName _TestException_QNAME = new
QName("http://test/";, "TestException");
private final static QName _InvokeTestArg0_QNAME = new QName("", "arg0");
+ private final static QName _InvokeTestResponseReturn_QNAME = new QName("",
"return");
/**
- * Create a new ObjectFactory that can be used to create new instances of
schema derived classes for package: test
+ * Create a new ObjectFactory that can be used to create new instances of
schema derived classes for package: testClient
*
*/
public ObjectFactory() {
}
/**
+ * Create an instance of {...@link InvokeTest }
+ *
+ */
+ public InvokeTest createInvokeTest() {
+ return new InvokeTest();
+ }
+
+ /**
* Create an instance of {...@link InvokeTestResponse }
*
*/
@@ -43,20 +69,20 @@
}
/**
- * Create an instance of {...@link InvokeTest }
+ * Create an instance of {...@link TestException }
*
*/
- public InvokeTest createInvokeTest() {
- return new InvokeTest();
+ public TestException createTestException() {
+ return new TestException();
}
/**
- * Create an instance of {...@link JAXBElement }...@code <}...@link String
}...@code >}}
+ * Create an instance of {...@link JAXBElement }...@code <}...@link
TestException }...@code >}}
*
*/
- @XmlElementDecl(namespace = "", name = "return", scope =
InvokeTestResponse.class)
- public JAXBElement<String> createInvokeTestResponseReturn(String value) {
- return new JAXBElement<String>(_InvokeTestResponseReturn_QNAME,
String.class, InvokeTestResponse.class, value);
+ @XmlElementDecl(namespace = "http://test/";, name = "TestException")
+ public JAXBElement<TestException> createTestException(TestException value)
{
+ return new JAXBElement<TestException>(_TestException_QNAME,
TestException.class, null, value);
}
/**
@@ -68,4 +94,13 @@
return new JAXBElement<String>(_InvokeTestArg0_QNAME, String.class,
InvokeTest.class, value);
}
+ /**
+ * Create an instance of {...@link JAXBElement }...@code <}...@link String
}...@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "", name = "return", scope =
InvokeTestResponse.class)
+ public JAXBElement<String> createInvokeTestResponseReturn(String value) {
+ return new JAXBElement<String>(_InvokeTestResponseReturn_QNAME,
String.class, InvokeTestResponse.class, value);
+ }
+
}
Added: tuscany/java/sca/stest/sampleTest/src/test/java/testClient/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/README.txt?rev=732165&view=auto
==============================================================================
--- tuscany/java/sca/stest/sampleTest/src/test/java/testClient/README.txt
(added)
+++ tuscany/java/sca/stest/sampleTest/src/test/java/testClient/README.txt Tue
Jan 6 15:03:35 2009
@@ -0,0 +1,19 @@
+This README describes the JAX-WS client files for the SCA Assembly test
invocation interface.
+
+The test invocation interface is in the TestInvocation.java interface file.
+This is presented as a Web service by the SCA runtime, for invocation by a
general Web service client.
+The WSDL is captured in the file TestClient.wsdl in the resources directory
for the testcases.
+
+The JAX-WS client files for invoking the Web service contained in
TestClient.wsdl are contained in this
+package. They are generated from the WSDL using the wsimport tool (a standard
part of JDK 1.6.x):
+
+wsimport TestClient.wsdl -keep -p testClient
+
+"-keep" is used to ensure that the generated .java files are retained
(otherwise all that is created are
+the binary .class files).
+
+"-p testClient" is used to force the generated Java files to belong to the
package "testClient" - this package
+name is used to keep a clean separation between the client files and the test
service files
+
+
+Mike Edwards, 6th January 2009.
\ No newline at end of file
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java?rev=732165&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java
Tue Jan 6 15:03:35 2009
@@ -0,0 +1,77 @@
+/*
+ * 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 testClient;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TestException complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained
within this class.
+ *
+ * <pre>
+ * <complexType name="TestException">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";>
+ * <sequence>
+ * <element name="message"
type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+...@xmlaccessortype(XmlAccessType.FIELD)
+...@xmltype(name = "TestException", propOrder = {
+ "message"
+})
+public class TestException {
+
+ protected String message;
+
+ /**
+ * Gets the value of the message property.
+ *
+ * @return
+ * possible object is
+ * {...@link String }
+ *
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /**
+ * Sets the value of the message property.
+ *
+ * @param value
+ * allowed object is
+ * {...@link String }
+ *
+ */
+ public void setMessage(String value) {
+ this.message = value;
+ }
+
+}
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java?rev=732165&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java
Tue Jan 6 15:03:35 2009
@@ -0,0 +1,71 @@
+/*
+ * 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 testClient;
+
+import javax.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1 in JDK 6
+ * Generated source version: 2.1
+ *
+ */
+...@webfault(name = "TestException", targetNamespace = "http://test/";)
+public class TestException_Exception
+ extends Exception
+{
+
+ /**
+ * Java type that goes as soapenv:Fault detail element.
+ *
+ */
+ private TestException faultInfo;
+
+ /**
+ *
+ * @param message
+ * @param faultInfo
+ */
+ public TestException_Exception(String message, TestException faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @param message
+ * @param faultInfo
+ * @param cause
+ */
+ public TestException_Exception(String message, TestException faultInfo,
Throwable cause) {
+ super(message, cause);
+ this.faultInfo = faultInfo;
+ }
+
+ /**
+ *
+ * @return
+ * returns fault bean: testClient.TestException
+ */
+ public TestException getFaultInfo() {
+ return faultInfo;
+ }
+
+}
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java
(original)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java
Tue Jan 6 15:03:35 2009
@@ -1,4 +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 testClient;
import javax.jws.WebMethod;
@@ -28,6 +45,7 @@
* @param arg0
* @return
* returns java.lang.String
+ * @throws TestException_Exception
*/
@WebMethod
@WebResult(targetNamespace = "")
@@ -35,6 +53,8 @@
@ResponseWrapper(localName = "invokeTestResponse", targetNamespace =
"http://test/";, className = "testClient.InvokeTestResponse")
public String invokeTest(
@WebParam(name = "arg0", targetNamespace = "")
- String arg0);
+ String arg0)
+ throws TestException_Exception
+ ;
}
Added:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java?rev=732165&view=auto
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
(added)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java
Tue Jan 6 15:03:35 2009
@@ -0,0 +1,83 @@
+/*
+ * 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 testClient;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1 in JDK 6
+ * Generated source version: 2.1
+ *
+ */
+...@webserviceclient(name = "TestInvocationService", targetNamespace =
"http://test/";, wsdlLocation = "file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl")
+public class TestInvocationService
+ extends Service
+{
+
+ private final static URL TESTINVOCATIONSERVICE_WSDL_LOCATION;
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ TESTINVOCATIONSERVICE_WSDL_LOCATION = url;
+ }
+
+ public TestInvocationService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public TestInvocationService() {
+ super(TESTINVOCATIONSERVICE_WSDL_LOCATION, new QName("http://test/";,
"TestInvocationService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns TestInvocation
+ */
+ @WebEndpoint(name = "TestInvocationPort")
+ public TestInvocation getTestInvocationPort() {
+ return (TestInvocation)super.getPort(new QName("http://test/";,
"TestInvocationPort"), TestInvocation.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {...@link javax.xml.ws.WebServiceFeature} to configure on
the proxy. Supported features not in the <code>features</code> parameter will
have their default values.
+ * @return
+ * returns TestInvocation
+ */
+ @WebEndpoint(name = "TestInvocationPort")
+ public TestInvocation getTestInvocationPort(WebServiceFeature... features)
{
+ return (TestInvocation)super.getPort(new QName("http://test/";,
"TestInvocationPort"), TestInvocation.class, features);
+ }
+
+}
Modified:
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java?rev=732165&r1=732164&r2=732165&view=diff
==============================================================================
---
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java
(original)
+++
tuscany/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java
Tue Jan 6 15:03:35 2009
@@ -1,2 +1,20 @@
+/*
+ * 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.
+ */
@javax.xml.bind.annotation.XmlSchema(namespace = "http://test/";)
package testClient;
