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/25 03:29:53 UTC
svn commit: r434588 - in /incubator/tuscany/java/testing/sca/interop/clients:
webserviceInteropDoc/src/main/resources/META-INF/sca/
webserviceInteropDoc/src/test/java/org/apache/tuscany/test/interop/client/
webserviceInteropDoc/src/test/resources/META-...
Author: rineholt
Date: Thu Aug 24 18:29:52 2006
New Revision: 434588
URL: http://svn.apache.org/viewvc?rev=434588&view=rev
Log:
Managed to get webserviceInteropDoc webserviceSOAPRound2 to work
webserviceXSQ is still failing since interface.wsdl support seems to be missing.
Added:
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/test.scdl
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/test.scdl
- copied, changed from r434358, incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl
Removed:
incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl
Modified:
incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl
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/src/main/resources/META-INF/sca/default.scdl
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/src/test/java/interop/ClientTestCase.java
Modified: 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=434588&r1=434587&r2=434588&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/sca/default.scdl Thu Aug 24 18:29:52 2006
@@ -23,7 +23,7 @@
<!-- import.sdo location="wsdl/interopdoc.wsdl" -->
<import.sdo factory="org.soapinterop.SoapinteropFactory"/>
- <component name="LoopbackInteropDocServiceComponent">
+ <component name="LoopbackInteropDocService">
<implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
</component>
@@ -38,7 +38,7 @@
<!-- interface.wsdl interface="http://soapinterop.org/#wsdl.interface(DocTestPortType)"/ -->
<interface.java interface="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>
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=434588&r1=434587&r2=434588&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 Thu Aug 24 18:29:52 2006
@@ -99,6 +99,8 @@
}
protected void setUp() throws Exception {
+
+ setApplicationSCDL("META-INF/tuscany/test.scdl");
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"));
@@ -125,7 +127,7 @@
// 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"
+ // To specify the service name run mvn -interopLocation="Remote"
if (interopLocation == null)
interopLocation = "Remote";
Added: incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/test.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/test.scdl?rev=434588&view=auto
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/test.scdl (added)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceInteropDoc/src/test/resources/META-INF/tuscany/test.scdl Thu Aug 24 18:29:52 2006
@@ -0,0 +1,46 @@
+<?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/interopdoc.wsdl" -->
+ <import.sdo factory="org.soapinterop.SoapinteropFactory"/>
+
+ <component name="LoopbackInteropDocService">
+ <implementation.java class="org.apache.tuscany.test.interop.client.LoopbackInteropDocServiceComponentImpl"/>
+ </component>
+
+ <reference name="RemoteInteropDocService">
+ <!-- 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)" location="wsdl/interopdoc.wsdl"/>
+ </reference>
+
+ <reference name="LocalHostInteropDocService">
+ <!-- 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)"
+ location="wsdl/interopdoc.wsdl"/>
+ </reference>
+
+</composite>
Modified: 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=434588&r1=434587&r2=434588&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/sca/default.scdl Thu Aug 24 18:29:52 2006
@@ -20,11 +20,8 @@
<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"/>
+ <import.sdo factory="org.soapinterop.xsd.XsdFactory"/>
<reference name="RemoteInteropDocService">
<!--
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=434588&r1=434587&r2=434588&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 Thu Aug 24 18:29:52 2006
@@ -47,7 +47,7 @@
protected void setUp() throws Exception {
-
+ setApplicationSCDL("META-INF/sca/test.scdl");
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"));
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=434588&r1=434587&r2=434588&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 Thu Aug 24 18:29:52 2006
@@ -58,7 +58,7 @@
@Override
protected void setUp() throws Exception {
-
+ setApplicationSCDL("META-INF/sca/test.scdl");
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"));
Copied: incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/test.scdl (from r434358, 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/test.scdl?p2=incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/test.scdl&p1=incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl&r1=434358&r2=434588&rev=434588&view=diff
==============================================================================
--- incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/testing/sca/interop/clients/webserviceXSQ/src/test/resources/META-INF/sca/test.scdl Thu Aug 24 18:29:52 2006
@@ -23,7 +23,7 @@
<import.sdo wsdlLocation="wsdl/sq.wsdl"/>
<import.wsdl wsdlLocation="wsdl/sq.wsdl"/>
-->
- <import.sdo location="wsdl/sq.wsd"/>
+ <import.sdo location="wsdl/sq.wsdl"/>
<reference name="webserviceXSQ">
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org