You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2007/02/19 23:52:06 UTC
svn commit: r509366 - in
/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws:
provider/ provider/soapmsg/ provider/soapmsg/META-INF/
provider/source/META-INF/ provider/sourcemsg/META-INF/
provider/stringmsg/META-INF/ security/ secur...
Author: scheu
Date: Mon Feb 19 14:52:05 2007
New Revision: 509366
URL: http://svn.apache.org/viewvc?view=rev&rev=509366
Log:
AXIS2-2220
Contributor:Rich Scheuerle
Recent changes broke the JAX-WS tests. I am updating the "provider" tests to include updates that (1) prevent
the WSDL overloading errors and (2) accurately describe the expected operations.
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/services.xml
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/META-INF/services.xml
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/META-INF/services.xml
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/META-INF/services.xml
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java Mon Feb 19 14:52:05 2007
@@ -55,31 +55,31 @@
private String reqMsgEnd = "</soap:Body></soap:Envelope>";
- private String XML_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ private String XML_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_REQUEST +
- "</invoke_str></ns2:invoke>";
- private String EMPTYBODY_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</invoke_str></ns2:invokeOp>";
+ private String EMPTYBODY_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_EMPTYBODY_REQUEST +
- "</invoke_str></ns2:invoke>";
- private String ATTACHMENT_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</invoke_str></ns2:invokeOp>";
+ private String ATTACHMENT_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_ATTACHMENT_REQUEST +
- "</invoke_str></ns2:invoke>";
- private String MTOM_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</invoke_str></ns2:invokeOp>";
+ private String MTOM_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_MTOM_REQUEST +
"</invoke_str>" +
SoapMessageProvider.MTOM_REF +
- "</ns2:invoke>";
- private String SWAREF_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</ns2:invokeOp>";
+ private String SWAREF_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_SWAREF_REQUEST +
"</invoke_str>" +
SoapMessageProvider.SWAREF_REF +
- "</ns2:invoke>";
- private String XML_FAULT_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</ns2:invokeOp>";
+ private String XML_FAULT_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_FAULT_REQUEST +
- "</invoke_str></ns2:invoke>";
- private String XML_WSE_INVOKE = "<ns2:invoke xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
+ "</invoke_str></ns2:invokeOp>";
+ private String XML_WSE_INVOKE = "<ns2:invokeOp xmlns:ns2=\"http://org.test.soapmessage\"><invoke_str>" +
SoapMessageProvider.XML_WSE_REQUEST +
- "</invoke_str></ns2:invoke>";
+ "</invoke_str></ns2:invokeOp>";
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java Mon Feb 19 14:52:05 2007
@@ -63,7 +63,7 @@
// Force soap action because we are passing junk over the wire
dispatch.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
- dispatch.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY,"invoke");
+ dispatch.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY,"test");
return dispatch;
@@ -97,7 +97,7 @@
Dispatch<Source> dispatch = getDispatch();
- String request = "<invoke>hello world</invoke>";
+ String request = "<test>hello world</test>";
Source requestSource = getSource(request);
Source responseSource = dispatch.invoke(requestSource);
String response = getString(responseSource);
@@ -219,7 +219,7 @@
Dispatch<Source> dispatch = getDispatch();
- String request = "<invoke>throwWebServiceException</invoke>";
+ String request = "<test>throwWebServiceException</test>";
try {
Source requestSource = getSource(request);
Source responseSource = dispatch.invoke(requestSource);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java Mon Feb 19 14:52:05 2007
@@ -23,7 +23,7 @@
public class StringMessageProviderTests extends ProviderTestCase {
String endpointUrl = "http://localhost:8080/axis2/services/StringMessageProviderService";
- String xmlString = "<invoke>test input</invoke>";
+ String xmlString = "<test>test input</test>";
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringMessageProviderService");
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/services.xml?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/services.xml Mon Feb 19 14:52:05 2007
@@ -4,7 +4,10 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
<parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.provider.soapmsg.SoapMessageProvider</parameter>
- <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <excludeOperations>
+ <operation>invoke</operation>
+ </excludeOperations>
+ <operation name="invokeOp" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
</service>
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java Mon Feb 19 14:52:05 2007
@@ -60,7 +60,7 @@
// These constants are referenced by the SoapMessageProviderTest and SoapMessageProvider
public static String RESPONSE_NAME = "ReturnType";
public static String RESPONSE_DATA_NAME = "return_str";
- public static String REQUEST_NAME = "invoke";
+ public static String REQUEST_NAME = "invokeOp";
public static String REQUEST_DATA_NAME = "invoke_str";
public static String XML_REQUEST = "xml request";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/META-INF/services.xml?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/META-INF/services.xml Mon Feb 19 14:52:05 2007
@@ -4,7 +4,13 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
<parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.provider.source.SourceProvider</parameter>
- <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <excludeOperations>
+ <operation>invoke</operation>
+ </excludeOperations>
+ <operation name="test" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <actionMapping/>
+ </operation>
+ <operation name="testOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
</service>
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/META-INF/services.xml?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/META-INF/services.xml Mon Feb 19 14:52:05 2007
@@ -4,7 +4,13 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
<parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.provider.sourcemsg.SourceMessageProvider</parameter>
- <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <excludeOperations>
+ <operation>invoke</operation>
+ </excludeOperations>
+ <operation name="test" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <actionMapping/>
+ </operation>
+ <operation name="testOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
</service>
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/META-INF/services.xml?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/META-INF/services.xml Mon Feb 19 14:52:05 2007
@@ -4,7 +4,10 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
<parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.provider.stringmsg.StringMessageProvider</parameter>
- <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <excludeOperations>
+ <operation>invoke</operation>
+ </excludeOperations>
+ <operation name="test" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
</service>
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/BasicAuthSecurityTests.java Mon Feb 19 14:52:05 2007
@@ -28,7 +28,7 @@
public class BasicAuthSecurityTests extends TestCase {
private String endpointUrl = "http://localhost:8080/axis2/services/BasicAuthSecurityService";
- private String xmlString = "<invoke>test input</invoke>";
+ private String xmlString = "<invokeOp>test input</invokeOp>";
private QName SERVICE_QNAME = new QName("http://ws.apache.org/axis2", "BasicAuthSecurityService");
private QName PORT_QNAME = new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml?view=diff&rev=509366&r1=509365&r2=509366
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml Mon Feb 19 14:52:05 2007
@@ -4,7 +4,10 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
</messageReceivers>
<parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.security.server.SecurityProvider</parameter>
- <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <excludeOperations>
+ <operation>invoke</operation>
+ </excludeOperations>
+ <operation name="invokeOp" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>
</service>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org