You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/08/20 15:02:25 UTC
svn commit: r432965 - in /incubator/tuscany/java: sca/ sca/plugin/ testing/
testing/sca/ testing/sca/interop/ testing/sca/interop/clients/
testing/sca/interop/clients/webserviceInteropDoc/
testing/sca/interop/clients/webserviceInteropDoc/src/main/resou...
Author: rineholt
Date: Sun Aug 20 06:02:21 2006
New Revision: 432965
URL: http://svn.apache.org/viewvc?rev=432965&view=rev
Log:
restore sca plugin
restore old interop test
convert web.xml scdl artifacts
convert to SCATest fraework.
compiles, not running
Added:
incubator/tuscany/java/testing/
incubator/tuscany/java/testing/sca/
incubator/tuscany/java/testing/sca/interop/
- copied from r424728, incubator/tuscany/branches/java-post-M1/testing/interop/
incubator/tuscany/java/testing/sca/interop/clients/
- copied from r432835, incubator/tuscany/branches/java-post-M1/testing/interop/clients/
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/
incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl
incubator/tuscany/java/testing/sca/interop/pom.xml
- copied, changed from r432835, incubator/tuscany/branches/java-post-M1/testing/interop/pom.xml
incubator/tuscany/java/testing/sca/interop/services/
- copied from r432835, incubator/tuscany/branches/java-post-M1/testing/interop/services/
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/default.scdl
incubator/tuscany/java/testing/sca/pom.xml
Modified:
incubator/tuscany/java/sca/plugin/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/testing/sca/interop/clients/pom.xml
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/pom.xml
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/pom.xml
incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/java/interop/ClientTestCase.java
incubator/tuscany/java/testing/sca/interop/services/pom.xml
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/pom.xml
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/resources/sca.module
incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/sca/plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugin/pom.xml?rev=432965&r1=432964&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/sca/plugin/pom.xml (original)
+++ incubator/tuscany/java/sca/plugin/pom.xml Sun Aug 20 06:02:21 2006
@@ -20,8 +20,8 @@
<project>
<parent>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>SNAPSHOT</version>
+ <artifactId>sca</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sca-plugin</artifactId>
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?rev=432965&r1=432964&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Sun Aug 20 06:02:21 2006
@@ -43,6 +43,7 @@
<module>runtime/webapp</module>
<module>runtime/webapp-host</module>
<module>commands/launcher</module>
+ <module>plugin</module>
</modules>
<dependencyManagement>
Modified: incubator/tuscany/java/testing/sca/interop/clients/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/pom.xml Sun Aug 20 06:02:21 2006
@@ -17,15 +17,14 @@
<project>
<parent>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-testing-interop</artifactId>
- <version>incubating-M1</version>
+ <artifactId>tuscany-testing-sca-interop</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-interop-clients</artifactId>
<packaging>pom</packaging>
<name>Tuscany Interop Testing - Clients</name>
- <version>incubating-M1</version>
<modules>
<module>webserviceInteropDoc</module>
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/pom.xml Sun Aug 20 06:02:21 2006
@@ -18,14 +18,13 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-interop-clients</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>interop-client-webserviceInteropDoc</artifactId>
<packaging>jar</packaging>
<name>Tuscany Interop Testing - Clients - InteropDoc</name>
- <version>incubating-M1</version>
<properties>
<ws.type>axis2</ws.type>
@@ -33,28 +32,34 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>core</artifactId>
<version>${pom.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.containers</groupId>
- <artifactId>tuscany-container-java</artifactId>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
<version>${pom.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.bindings</groupId>
- <artifactId>tuscany-binding-${ws.type}</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>test</artifactId>
+ <version>${sca.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Added: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl?rev=432965&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl Sun Aug 20 06:02:21 2006
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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"
+ name="interop.client">
+<!--
+ <import.sdo factory="org.soapinterop.SoapinteropFactory"/>
+ <import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/>
+ -->
+ <import.sdo location="wsdl/helloworld.wsdl"/>
+
+ <component name="LoopbackInteropDocServiceComponent">
+ <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
+ </component>
+
+ <reference name="RemoteInteropDocService">
+ <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+ <implementation.java class="org.soapinterop.DocTestPortType"/>
+ <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>
+ </reference>
+
+ <reference name="LocalHostInteropDocService">
+ <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+ <implementation.java class="org.soapinterop.DocTestPortType"/>
+
+ <interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/>
+ <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
+ location="wsdl/interopdoc.wsdl"
+ />
+ </reference>
+
+</composite>
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java Sun Aug 20 06:02:21 2006
@@ -18,10 +18,9 @@
import java.rmi.RemoteException;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.osoa.sca.CurrentModuleContext;
+import org.apache.tuscany.test.SCATestCase;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
import org.soapinterop.ArrayOfSimpleDocument;
import org.soapinterop.ChildDocument;
import org.soapinterop.ComplexDocument;
@@ -32,118 +31,108 @@
import commonj.sdo.helper.DataFactory;
-public class InteropDocClientTestCase extends TestCase {
+public class InteropDocClientTestCase extends SCATestCase {
- private TuscanyRuntime tuscany;
private DataFactory dataFactory;
+
private DocTestPortType interopDoc;
- private ClassLoader oldCL;
-
+
+ private ClassLoader oldCL;
+
public void testSingleTag() throws RemoteException {
// Create the input
- SingleTag input=(SingleTag)dataFactory.create(SingleTag.class);
-
+ SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
+
// Invoke the service
- SingleTag output=interopDoc.SingleTag(input);
-
+ SingleTag output = interopDoc.SingleTag(input);
+
// Test the results
assertNotNull(output);
-
+
}
-
+
public void testSimpleDocument() throws RemoteException {
// Create the input
- SimpleDocument1 input=(SimpleDocument1)dataFactory.create(SimpleDocument1.class);
+ SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
input.setValue("123");
-
+
// Invoke the service
- SimpleDocument1 output=interopDoc.SimpleDocument(input);
-
+ SimpleDocument1 output = interopDoc.SimpleDocument(input);
+
// Test the results
assertNotNull(output);
assertEquals("123", output.getValue());
-
+
}
-
+
public void testComplexDocument() throws RemoteException {
// Create the input
- ComplexDocument input = (ComplexDocument)dataFactory.create(ComplexDocument.class);
+ ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
input.setAnAttribute("789");
- ChildDocument childDocument = (ChildDocument)dataFactory.create(ChildDocument.class);
- SimpleDocument simpleDocument = (SimpleDocument)dataFactory.create(SimpleDocument.class);;
- SimpleDocument1 simpleDocument1 = (SimpleDocument1)dataFactory.create(SimpleDocument1.class);;
+ ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
+ SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
+ ;
+ SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
+ ;
simpleDocument.setSimpleDocument(simpleDocument1);
simpleDocument1.setValue("456");
- ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument)dataFactory.create(ArrayOfSimpleDocument.class);;
+ ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
+ ;
arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
input.setChild(childDocument);
-
+
// Invoke the service
- ComplexDocument output=interopDoc.ComplexDocument(input);
-
+ ComplexDocument output = interopDoc.ComplexDocument(input);
+
// Test the results
assertNotNull(output);
assertEquals("789", output.getAnAttribute());
assertNotNull(output.getChild());
assertNotNull(output.getChild().getChildSimpleDoc());
-
- //FIXME Add more tests of the output document
-
+
+ // FIXME Add more tests of the output document
+
}
-
+
protected void setUp() throws Exception {
+ addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding", getClass().getClassLoader().getResource(
+ "META-INF/tuscany/binding.axis2.scdl"));
+ addExtension("org.apache.tuscany.databinding.sdo", getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
super.setUp();
-
- // Required to allow the SDO runtime to use the correct classloader
- oldCL=Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
- // Obtain Tuscany runtime
- tuscany = new TuscanyRuntime("interopclient", null);
-
- // Start the runtime
- tuscany.start();
// Get the SDO DataFactory
- dataFactory=DataFactory.INSTANCE;
-
+ dataFactory = DataFactory.INSTANCE;
+
// Locate the service to test
- interopDoc=locateInteropDocService();
-
+ interopDoc = locateInteropDocService();
+
}
-
+
/**
* Locate the interop service to test
+ *
* @return
*/
protected DocTestPortType locateInteropDocService() {
String interopLocation = System.getProperty("interopLocation");
-
+
// Valid service names are:
- // RemoteInteropDocService: the live interop Web Service
+ // RemoteInteropDocService: the live interop Web Service
// LocalHostInteropDocService: the interop Web Service hosted by Tuscany on localhost
// LoopbackInteropDocServiceComponent: a dummy loopback service component
-
+
// To specify the service name run mvn -DinteropDocServiceName="RemoteInteropDocService"
-
+
if (interopLocation == null)
- interopLocation = "Remote";
-
- return (DocTestPortType)CurrentModuleContext.getContext().locateService(interopLocation + "InteropDocService");
- }
-
- protected void tearDown() throws Exception {
-
- // Stop the runtime
- tuscany.stop();
-
- Thread.currentThread().setContextClassLoader(oldCL);
-
- super.tearDown();
+ interopLocation = "Remote";
+
+ CompositeContext compositeContext = CurrentCompositeContext.getContext();
+
+ return (DocTestPortType) compositeContext.locateService(DocTestPortType.class, interopLocation + "InteropDocService");
}
}
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/pom.xml Sun Aug 20 06:02:21 2006
@@ -18,14 +18,13 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-interop-clients</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>interop-client-webserviceSOAPRound2</artifactId>
<packaging>jar</packaging>
<name>Tuscany Interop Testing - Clients - SOAP Builders Round 2 Interop Test</name>
- <version>incubating-M1</version>
<properties>
<ws.type>axis2</ws.type>
@@ -33,29 +32,34 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>core</artifactId>
<version>${pom.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.containers</groupId>
- <artifactId>tuscany-container-java</artifactId>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
<version>${pom.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.bindings</groupId>
- <artifactId>tuscany-binding-${ws.type}</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.databinding</groupId>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>test</artifactId>
+ <version>${sca.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Added: incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl?rev=432965&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl Sun Aug 20 06:02:21 2006
@@ -0,0 +1,40 @@
+<?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"
+ name="InteropClient">
+
+<!--
+ <import.sdo factory="org.soapinterop.xsd.XsdFactory"/>
+ <import.wsdl wsdlLocation="wsdl/interoptestdoclit.wsdl"/>
+-->
+ <import.sdo location="wsdl/interoptestdoclit.wsdl"/>
+
+ <reference name="RemoteInteropDocService">
+<!--
+ <interface.wsdl interface="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.interface(WSDLInteropTestDocLitPortType)"/>
+ <binding.ws port="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"/>
+-->
+
+ <interface.java interface="org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType"/>
+ <binding.ws endpoint="http://soapinterop.org/WSDLInteropTestDocLit#wsdl.endpoint(WSDLInteropTestDocLitService/WSDLInteropTestDocLitPort)"
+ location="wsdl/interoptestdoclit.wsdl" />
+ </reference>
+
+</composite>
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java Sun Aug 20 06:02:21 2006
@@ -20,10 +20,9 @@
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.osoa.sca.CurrentModuleContext;
+import org.apache.tuscany.test.SCATestCase;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType;
import org.soapinterop.xsd.ArrayOfstring_literal;
import org.soapinterop.xsd.SOAPStruct;
@@ -32,54 +31,50 @@
import commonj.sdo.helper.DataFactory;
/**
- * This test case is part of the tuscany interop tests. This is a reduced version
- * of the SOAPBuilders InteropTest test, document/literal mode. This version has
- * operations such as echoString, echoArrayOfString and echoStruct.
+ * This test case is part of the tuscany interop tests. This is a reduced version of the SOAPBuilders InteropTest test, document/literal mode. This
+ * version has operations such as echoString, echoArrayOfString and echoStruct.
*
- * <p>The WSDL for the external service used in this test case can be
- * downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
- * This is part of the WSDL interop test from Microsoft and more details aobout this
- * test case are found at http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
+ * <p>
+ * The WSDL for the external service used in this test case can be downloaded from http://www.mssoapinterop.org/stkV3/wsdl/InteropTestDocLit.wsdl.
+ * This is part of the WSDL interop test from Microsoft and more details aobout this test case are found at
+ * http://www.mssoapinterop.org/stkV3/wsdl/WSDLInterop-0118.htm
*/
-public class InteropTestDocLitTestCase extends TestCase {
+public class InteropTestDocLitTestCase extends SCATestCase {
+
+ private WSDLInteropTestDocLitPortType doc = null;
+
+ private DataFactory dataFactory;
- private TuscanyRuntime tuscany = null;
- private WSDLInteropTestDocLitPortType doc = null;
- private DataFactory dataFactory;
- private ClassLoader oldCL;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // Required to allow the SDO runtime to use the correct classloader
- oldCL=Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
- // Obtain Tuscany runtime
- tuscany = new TuscanyRuntime("interopclient", null);
-
- // Start the runtime
- tuscany.start();
+
+ protected void setUp() throws Exception {
+
+ addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding", getClass().getClassLoader().getResource(
+ "META-INF/tuscany/binding.axis2.scdl"));
+ addExtension("org.apache.tuscany.databinding.sdo", getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
+ super.setUp();
// Get the SDO DataFactory
- dataFactory=DataFactory.INSTANCE;
-
+ dataFactory = DataFactory.INSTANCE;
+
// Locate the service to test
doc = locateInteropDocService();
- }
+ }
- /**
+ /**
* Locate the interop service to test
+ *
* @return
*/
- protected WSDLInteropTestDocLitPortType locateInteropDocService() {
- Object o = CurrentModuleContext.getContext().locateService("RemoteInteropDocService");
- Class[] ifaces = o.getClass().getInterfaces();
- return (WSDLInteropTestDocLitPortType) o;
+ protected WSDLInteropTestDocLitPortType locateInteropDocService() {
+
+ CompositeContext compositeContext = CurrentCompositeContext.getContext();
+ return compositeContext.locateService(WSDLInteropTestDocLitPortType.class, "RemoteInteropDocService");
+
}
-
+
/**
* test echo void
+ *
* @throws RemoteException
*/
public void testEchoVoid() throws RemoteException {
@@ -88,57 +83,50 @@
}
/**
- * test echo string
- * @throws RemoteException
- */
- public void testEchoString() throws RemoteException {
+ * test echo string
+ *
+ * @throws RemoteException
+ */
+ public void testEchoString() throws RemoteException {
String input = "a test string";
- String output = doc.echoString(input);
- assertEquals(input, output);
- }
-
+ String output = doc.echoString(input);
+ assertEquals(input, output);
+ }
+
/**
* test echo string
+ *
* @throws RemoteException
*/
public void testEchoStringArray() throws RemoteException {
- ArrayOfstring_literal input=(ArrayOfstring_literal)dataFactory.create(ArrayOfstring_literal.class);
- List inStrings = Arrays.asList(new String[] {"petra", "sue"});
+ ArrayOfstring_literal input = (ArrayOfstring_literal) dataFactory.create(ArrayOfstring_literal.class);
+ List inStrings = Arrays.asList(new String[] { "petra", "sue" });
input.set(XsdPackage.ARRAY_OFSTRING_LITERAL__STRING, inStrings);
ArrayOfstring_literal output = doc.echoStringArray(input);
-
- List outStrings = output.getString();
+
+ List outStrings = output.getString();
assertNotNull(outStrings);
assertEquals(2, outStrings.size());
assertEquals("petra", outStrings.get(0));
assertEquals("sue", outStrings.get(1));
}
-
- /**
- * test echo struct
- * @throws RemoteException
- */
- public void testEchoStruct() throws RemoteException {
- SOAPStruct input=(SOAPStruct)dataFactory.create(SOAPStruct.class);
- input.setVarInt(200);
- input.setVarFloat(.002f);
- input.setVarString("Hello");
- SOAPStruct output = doc.echoStruct(input);
+
+ /**
+ * test echo struct
+ *
+ * @throws RemoteException
+ */
+ public void testEchoStruct() throws RemoteException {
+ SOAPStruct input = (SOAPStruct) dataFactory.create(SOAPStruct.class);
+ input.setVarInt(200);
+ input.setVarFloat(.002f);
+ input.setVarString("Hello");
+ SOAPStruct output = doc.echoStruct(input);
assertEquals(input.getVarInt(), output.getVarInt());
assertEquals(input.getVarFloat(), output.getVarFloat());
assertEquals(input.getVarString(), output.getVarString());
- }
-
-
- protected void tearDown() throws Exception {
- // Stop the runtime
- tuscany.stop();
-
- Thread.currentThread().setContextClassLoader(oldCL);
-
- super.tearDown();
- }
+ }
}
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/pom.xml Sun Aug 20 06:02:21 2006
@@ -18,14 +18,13 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-interop-clients</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>interop-client-webserviceXSQ</artifactId>
<packaging>jar</packaging>
<name>Tuscany Interop Testing - Clients - webserviceXSQ</name>
- <version>incubating-M1</version>
<properties>
<ws.type>axis2</ws.type>
@@ -34,26 +33,32 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>core</artifactId>
<version>${pom.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.bindings</groupId>
- <artifactId>tuscany-binding-${ws.type}</artifactId>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
<version>${pom.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
+ <artifactId>databinding-sdo</artifactId>
+ <version>${sca.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>test</artifactId>
+ <version>${sca.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/java/interop/ClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/java/interop/ClientTestCase.java?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/java/interop/ClientTestCase.java (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/java/interop/ClientTestCase.java Sun Aug 20 06:02:21 2006
@@ -19,32 +19,52 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.apache.tuscany.core.config.ConfigurationException;
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
+import org.apache.tuscany.test.SCATestCase;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
/**
* This client program shows how to create an SCA runtime, start it, locate a simple HelloWorld service component and invoke it.
*/
-public class ClientTestCase extends TestCase {
-
- public void testGetQuote() throws ConfigurationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
- IllegalAccessException, InvocationTargetException {
-
- TuscanyRuntime tuscany = new TuscanyRuntime("getQuote", null);
- tuscany.start();
- ModuleContext moduleContext = CurrentModuleContext.getContext();
+public class ClientTestCase extends SCATestCase {
+ private Object serviceProxy;
+ //old tc
+ // public void testGetQuote() throws ConfigurationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
+ // IllegalAccessException, InvocationTargetException {
+ //
+ // TuscanyRuntime tuscany = new TuscanyRuntime("getQuote", null);
+ // tuscany.start();
+ // ModuleContext moduleContext = CurrentModuleContext.getContext();
+ //
+ // Object serviceProxy = moduleContext.locateService("webserviceXSQ");
+ // Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] { String.class });
+ //
+ // String sqResponse = (String) m.invoke(serviceProxy, "IBM");
+ //
+ // assertTrue(sqResponse.startsWith("<StockQuotes><Stock><Symbol>IBM</Symbol>"));
+ //
+ // tuscany.stop();
+ // }
- Object serviceProxy = moduleContext.locateService("webserviceXSQ");
+ public void testGetQuote() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException, SecurityException,
+ NoSuchMethodException {
Method m = serviceProxy.getClass().getMethod("GetQuote", new Class[] { String.class });
String sqResponse = (String) m.invoke(serviceProxy, "IBM");
assertTrue(sqResponse.startsWith("<StockQuotes><Stock><Symbol>IBM</Symbol>"));
- tuscany.stop();
}
+
+ @Override
+ protected void setUp() throws Exception {
+
+ addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding", getClass().getClassLoader().getResource(
+ "META-INF/tuscany/binding.axis2.scdl"));
+ addExtension("org.apache.tuscany.databinding.sdo", getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
+ super.setUp();
+ CompositeContext compositeContext = CurrentCompositeContext.getContext();
+ serviceProxy = compositeContext.locateService(Object.class, "webserviceXSQ");
+ }
+
}
Added: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl?rev=432965&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl Sun Aug 20 06:02:21 2006
@@ -0,0 +1,38 @@
+<?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"
+ name="webserviceXSQ">
+<!--
+ <import.sdo wsdlLocation="wsdl/sq.wsdl"/>
+ <import.wsdl wsdlLocation="wsdl/sq.wsdl"/>
+-->
+ <import.sdo location="wsdl/sq.wsd"/>
+
+ <reference name="webserviceXSQ">
+<!--
+ <interface.wsdl interface="http://www.webserviceX.NET/#wsdl.interface(StockQuoteSoap)"/>
+ <binding.ws port="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"/>
+-->
+ <interface.wsdl interface="http://www.webserviceX.NET/#wsdl.interface(StockQuoteSoap)"/>
+ <binding.ws endpoint="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"
+ location="wsdl/sq.wsdl" />
+ </reference>
+
+</composite>
Copied: incubator/tuscany/java/testing/sca/interop/pom.xml (from r432835, incubator/tuscany/branches/java-post-M1/testing/interop/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/pom.xml?p2=incubator/tuscany/java/testing/sca/interop/pom.xml&p1=incubator/tuscany/branches/java-post-M1/testing/interop/pom.xml&r1=432835&r2=432965&rev=432965&view=diff
==============================================================================
--- incubator/tuscany/branches/java-post-M1/testing/interop/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/pom.xml Sun Aug 20 06:02:21 2006
@@ -16,16 +16,15 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-project</artifactId>
- <version>incubating-M1</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-testing-sca</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-testing-interop</artifactId>
+ <artifactId>tuscany-testing-sca-interop</artifactId>
<packaging>pom</packaging>
- <name>Tuscany Interop Testing</name>
- <version>incubating-M1</version>
+ <name>Tuscany SCA Interop Testing</name>
<modules>
<module>clients</module>
Modified: incubator/tuscany/java/testing/sca/interop/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/services/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/services/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/services/pom.xml Sun Aug 20 06:02:21 2006
@@ -17,15 +17,14 @@
<project>
<parent>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-testing-interop</artifactId>
- <version>incubating-M1</version>
+ <artifactId>tuscany-testing-sca-interop</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-testing-interop-services</artifactId>
+ <artifactId>tuscany-interop-services</artifactId>
<packaging>pom</packaging>
<name>Tuscany Interop Testing - Services</name>
- <version>incubating-M1</version>
<modules>
<module>webserviceInteropDoc</module>
Modified: incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/pom.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/pom.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/pom.xml Sun Aug 20 06:02:21 2006
@@ -17,41 +17,83 @@
<project>
<parent>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-testing-interop-services</artifactId>
- <version>incubating-M1</version>
+ <artifactId>tuscany-interop-services</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>interop-service-webserviceInteropDoc</artifactId>
<packaging>war</packaging>
<name>Tuscany Interop Testing - Services - InteropDoc</name>
- <version>incubating-M1</version>
<dependencies>
+
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
+ <artifactId>sca-api-r0.95</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
-
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
+ <artifactId>core</artifactId>
<version>${pom.version}</version>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.containers</groupId>
- <artifactId>tuscany-container-java</artifactId>
+ <groupId>org.apache.tuscany.bindings</groupId>
+ <artifactId>axis2</artifactId>
<version>${pom.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.bindings</groupId>
- <artifactId>tuscany-binding-axis2</artifactId>
+ <groupId>org.apache.tuscany.runtime</groupId>
+ <artifactId>webapp</artifactId>
<version>${pom.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.runtime</groupId>
+ <artifactId>webapp-host</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r0.95</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/resources/sca.module
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/resources/sca.module?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/resources/sca.module (original)
+++ incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/resources/sca.module Sun Aug 20 06:02:21 2006
@@ -14,20 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="interop.server">
- <import.sdo factory="org.soapinterop.SoapinteropFactory"/>
+ <import.sdo location="wsdl/interopdoc.wsdl"/>
<import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/>
- <entryPoint name="InteropDocService">
+ <service name="InteropDocService">
<interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/>
<binding.ws port="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"/>
<reference>InteropDocServiceComponent/DocTestPortType</reference>
- </entryPoint>
+ </service>
<component name="InteropDocServiceComponent">
<implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
</component>
-</module>
+</composite>
Added: incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/default.scdl?rev=432965&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/META-INF/sca/default.scdl Sun Aug 20 06:02:21 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed 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"
+ name="interop.server">
+
+ <import.sdo location="wsdl/interopdoc.wsdl"/>
+ <!-- import.wsdl wsdlLocation="wsdl/interopdoc.wsdl"/ -->
+
+ <service name="InteropDocService">
+ <!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
+ <interface.java interface="org.soapinterop.DocTestPortType"/>
+
+ <binding.ws endpoint="http://soapinterop.org/#wsdl.endpoint(interopDocSvc/interopDocPort)"
+ conformanceURIs="http://ws-i.org/profiles/basic/1.1"
+ location="wsdl/interopdoc.wsdl"
+ />
+
+ <reference>InteropDocServiceComponent/DocTestPortType</reference>
+ </service>
+
+ <component name="InteropDocServiceComponent">
+ <implementation.java class="org.apache.tuscany.test.interop.server.InteropDocServiceComponentImpl"/>
+ </component>
+
+</composite>
Modified: incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/WEB-INF/web.xml?rev=432965&r1=432835&r2=432965&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/testing/sca/interop/services/webserviceInteropDoc/src/main/webapp/WEB-INF/web.xml Sun Aug 20 06:02:21 2006
@@ -19,5 +19,29 @@
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<display-name>Tuscany Interop Test Server</display-name>
+ <context-param>
+ <param-name>systemScdlPath</param-name>
+ <param-value>/META-INF/sca/webapp.system.scdl</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>applicationScdlPath</param-name>
+ <param-value>/META-INF/sca/default.scdl</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <display-name>Tuscany Servlet</display-name>
+ <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
</web-app>
Added: incubator/tuscany/java/testing/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/pom.xml?rev=432965&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/pom.xml (added)
+++ incubator/tuscany/java/testing/sca/pom.xml Sun Aug 20 06:02:21 2006
@@ -0,0 +1,35 @@
+<?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.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>sca</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tuscany-testing-sca</artifactId>
+ <packaging>pom</packaging>
+ <name>Tuscany SCA tests </name>
+ <modules>
+ <module>interop</module>
+ </modules>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org