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 wo...@apache.org on 2008/02/28 23:00:35 UTC
svn commit: r632128 - in /webservices/axis2/trunk/java/modules:
jaxws/test/org/apache/axis2/jaxws/anytype/tests/
jaxws/test/org/apache/axis2/jaxws/dispatch/
jaxws/test/org/apache/axis2/jaxws/injection/
jaxws/test/org/apache/axis2/jaxws/nonanonymous/com...
Author: woodroy
Date: Thu Feb 28 14:00:13 2008
New Revision: 632128
URL: http://svn.apache.org/viewvc?rev=632128&view=rev
Log:
Fix problem with 'createAxisServiceName' to allow multiple ports per service
Additionally fix all the jaxws/tests that fail as a result of this fix
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java
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/SourceMessageProviderTests.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/StringProviderTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java
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/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java Thu Feb 28 14:00:13 2008
@@ -18,19 +18,26 @@
*/
package org.apache.axis2.jaxws.anytype.tests;
+import javax.xml.ws.BindingProvider;
+
import junit.framework.TestCase;
import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType;
import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessageService;
import org.apache.axis2.jaxws.TestLogger;
public class AnyTypeTests extends TestCase {
-
+
+ String axisEndpoint = "http://localhost:6060/axis2/services/AnyTypeMessageService.AnyTypeMessagePortTypeImplPort";
+
public void testAnyTypeElementinWrappedWSDL(){
TestLogger.logger.debug("------------------------------");
TestLogger.logger.debug("Test : " + getName());
try{
AnyTypeMessageService service = new AnyTypeMessageService();
AnyTypeMessagePortType portType = service.getAnyTypePort();
+ BindingProvider p = (BindingProvider) portType;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String req = new String("Request as String");
Object response = portType.echoMessage(req);
assertTrue(response instanceof String);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAP12Dispatch.java Thu Feb 28 14:00:13 2008
@@ -47,7 +47,7 @@
"http://org/apache/axis2/jaxws/test/SOAP12", "SOAP12Service");
private static final QName QNAME_PORT = new QName(
"http://org/apache/axis2/jaxws/test/SOAP12", "SOAP12Port");
- private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/SOAP12ProviderService";
+ private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/SOAP12ProviderService.SOAP12ProviderPort";
private static final String sampleRequest =
"<test:echoString xmlns:test=\"http://org/apache/axis2/jaxws/test/SOAP12\">" +
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java Thu Feb 28 14:00:13 2008
@@ -33,7 +33,7 @@
import org.apache.axis2.jaxws.TestLogger;
public class SOAPMessageDispatch extends TestCase {
- private String url = "http://localhost:6060/axis2/services/ProxyDocLitWrappedService";
+ private String url = "http://localhost:6060/axis2/services/ProxyDocLitWrappedService.DocLitWrappedProxyImplPort";
private QName serviceName = new QName(
"http://org.apache.axis2.proxy.doclitwrapped", "ProxyDocLitWrappedService");
private QName portName = new QName("http://org.apache.axis2.proxy.doclitwrapped",
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java Thu Feb 28 14:00:13 2008
@@ -18,6 +18,7 @@
*/
package org.apache.axis2.jaxws.injection;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.WebServiceContext;
import junit.framework.TestCase;
@@ -29,7 +30,7 @@
import org.apache.axis2.jaxws.TestLogger;
public class ResourceInjectionTests extends TestCase {
-
+ String axisEndpoint = "http://localhost:6060/axis2/services/ResourceInjectionService.ResourceInjectionPortTypeImplPort";
private Object resource = new WebServiceContextImpl();
public ResourceInjectionTests() {
@@ -129,6 +130,9 @@
try{
ResourceInjectionService service = new ResourceInjectionService();
ResourceInjectionPortType proxy = service.getResourceInjectionPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String response = proxy.echo("echo Request");
TestLogger.logger.debug("Response String = " + response);
TestLogger.logger.debug("------------------------------");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/nonanonymous/complextype/NonAnonymousComplexTypeTests.java Thu Feb 28 14:00:13 2008
@@ -22,15 +22,20 @@
*/
package org.apache.axis2.jaxws.nonanonymous.complextype;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.WebServiceException;
import junit.framework.TestCase;
import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessagePortType;
import org.apache.axis2.jaxws.nonanonymous.complextype.sei.EchoMessageService;
+import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType;
+import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersService;
import org.apache.axis2.jaxws.TestLogger;
public class NonAnonymousComplexTypeTests extends TestCase {
+ String axisEndpoint = "http://localhost:6060/axis2/services/EchoMessageService.EchoMessageImplPort";
+
/**
*
*/
@@ -52,6 +57,9 @@
try {
String msg = "Hello Server";
EchoMessagePortType myPort = (new EchoMessageService()).getEchoMessagePort();
+ BindingProvider p = (BindingProvider) myPort;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String response = myPort.echoMessage(msg);
TestLogger.logger.debug(response);
TestLogger.logger.debug("------------------------------");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java Thu Feb 28 14:00:13 2008
@@ -29,6 +29,7 @@
import java.util.Set;
import javax.wsdl.WSDLException;
+import javax.xml.ws.BindingProvider;
import junit.framework.TestCase;
import org.apache.axis2.jaxws.polymorphic.shape.sei.PolymorphicShapePortType;
@@ -43,12 +44,16 @@
import org.test.shape.threed.ThreeDSquare;
public class PolymorphicTests extends TestCase {
+ String axisEndpoint = "http://localhost:6060/axis2/services/PolymorphicShapeService.PolymorphicShapePort";
public void testFormalAndActualTypeInDifferentPackages(){
TestLogger.logger.debug("------------------------------");
TestLogger.logger.debug("Test : " + getName());
PolymorphicShapeService service = new PolymorphicShapeService();
PolymorphicShapePortType port = service.getPolymorphicShapePort();
+ BindingProvider p = (BindingProvider) port;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
Shape shapeType;
TestLogger.logger.debug("Sending Request to draw Square");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java Thu Feb 28 14:00:13 2008
@@ -61,7 +61,7 @@
*/
public class JAXBProviderTests extends ProviderTestCase {
- String endpointUrl = "http://localhost:6060/axis2/services/JAXBProviderService";
+ String endpointUrl = "http://localhost:6060/axis2/services/JAXBProviderService.JAXBProviderPort";
private QName serviceName = new QName("http://ws.apache.org/axis2", "JAXBProviderService");
DataSource stringDS, imageDS;
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java Thu Feb 28 14:00:13 2008
@@ -34,7 +34,7 @@
new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0");
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringProviderService");
- String endpointUrl = "http://localhost:6060/axis2/services/StringProviderService";
+ String endpointUrl = "http://localhost:6060/axis2/services/StringProviderService.StringProviderPort";
private static final String sampleSoapEnvelopeHeader =
"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java Thu Feb 28 14:00:13 2008
@@ -34,7 +34,7 @@
public static final QName portName =
new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0");
public static final String endpointUrl =
- "http://localhost:6060/axis2/services/SoapMessageMUProviderService";
+ "http://localhost:6060/axis2/services/SoapMessageMUProviderService.SimpleProviderServiceSOAP11port0";
public static final String bindingID = SOAPBinding.SOAP11HTTP_BINDING;
public static final Service.Mode mode = Service.Mode.MESSAGE;
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?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- 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 Thu Feb 28 14:00:13 2008
@@ -34,6 +34,7 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.Binding;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
@@ -49,7 +50,7 @@
*/
public class SoapMessageProviderTests extends ProviderTestCase {
- private String endpointUrl = "http://localhost:6060/axis2/services/SoapMessageProviderService";
+ private String endpointUrl = "http://localhost:6060/axis2/services/SoapMessageProviderService.SoapMessageProviderPort";
private QName serviceName = new QName("http://ws.apache.org/axis2", "SoapMessageProviderService");
private String reqMsgStart = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@@ -108,7 +109,7 @@
try{
// Create the dispatch
Dispatch<SOAPMessage> dispatch = createDispatch();
-
+
// Create the SOAPMessage
String msg = reqMsgStart + XML_INVOKE + reqMsgEnd;
MessageFactory factory = MessageFactory.newInstance();
@@ -420,9 +421,12 @@
* @throws Exception
*/
private Dispatch<SOAPMessage> createDispatch() throws Exception {
+
+
Service svc = Service.create(serviceName);
svc.addPort(portName,null, endpointUrl);
- Dispatch<SOAPMessage> dispatch = svc.createDispatch(portName, SOAPMessage.class, Service.Mode.MESSAGE);
+ Dispatch<SOAPMessage> dispatch =
+ svc.createDispatch(portName, SOAPMessage.class, Service.Mode.MESSAGE);
return dispatch;
}
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java Thu Feb 28 14:00:13 2008
@@ -32,7 +32,7 @@
public class SourceMessageProviderTests extends ProviderTestCase {
- private String endpointUrl = "http://localhost:6060/axis2/services/SourceMessageProviderService";
+ private String endpointUrl = "http://localhost:6060/axis2/services/SourceMessageProviderService.SourceMessageProviderPort";
private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceMessageProviderService");
private String xmlDir = "xml";
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?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- 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 Thu Feb 28 14:00:13 2008
@@ -41,7 +41,7 @@
public class SourceProviderTests extends ProviderTestCase {
- private String endpointUrl = "http://localhost:6060/axis2/services/SourceProviderService";
+ private String endpointUrl = "http://localhost:6060/axis2/services/SourceProviderService.SourceProviderPort";
private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceProviderService");
private String xmlDir = "xml";
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?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- 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 Thu Feb 28 14:00:13 2008
@@ -26,7 +26,7 @@
public class StringMessageProviderTests extends ProviderTestCase {
- String endpointUrl = "http://localhost:6060/axis2/services/StringMessageProviderService";
+ String endpointUrl = "http://localhost:6060/axis2/services/StringMessageProviderService.StringMessageProviderPort";
String xmlString = "<test>test input</test>";
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringMessageProviderService");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/StringProviderTests.java Thu Feb 28 14:00:13 2008
@@ -29,7 +29,7 @@
public class StringProviderTests extends ProviderTestCase {
- String endpointUrl = "http://localhost:6060/axis2/services/StringProviderService";
+ String endpointUrl = "http://localhost:6060/axis2/services/StringProviderService.StringProviderPort";
String xmlString = "<invoke>test input</invoke>";
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringProviderService");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Thu Feb 28 14:00:13 2008
@@ -40,7 +40,7 @@
private QName serviceName = new QName(
"http://org.apache.axis2.jaxws.proxy.gorilla_dlw", "GorillaService");
- private String axisEndpoint = "http://localhost:6060/axis2/services/GorillaService";
+ private String axisEndpoint = "http://localhost:6060/axis2/services/GorillaService.GorillaProxyImplPort";
private QName portName = new QName("http://org.apache.axis2.jaxws.proxy.rpclit",
"GorillaPort");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java Thu Feb 28 14:00:13 2008
@@ -42,7 +42,7 @@
public class ProxyNonWrappedTests extends TestCase {
QName serviceName = new QName("http://doclitnonwrapped.proxy.test.org", "ProxyDocLitUnwrappedService");
- private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitUnwrappedService";
+ private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitUnwrappedService.DocLitnonWrappedImplPort";
private QName portName = new QName("http://org.apache.axis2.proxy.doclitwrapped", "ProxyDocLitWrappedPort");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test-resources/wsdl/ProxyDocLitnonWrapped.wsdl";
public ProxyNonWrappedTests() {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Thu Feb 28 14:00:13 2008
@@ -37,7 +37,7 @@
public class ProxyTests extends TestCase {
private QName serviceName = new QName(
"http://doclitwrapped.proxy.test.org", "ProxyDocLitWrappedService");
- private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitWrappedService";
+ private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitWrappedService.DocLitWrappedProxyImplPort";
private QName portName = new QName("http://doclitwrapped.proxy.test.org",
"ProxyDocLitWrappedPort");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java Thu Feb 28 14:00:13 2008
@@ -43,7 +43,7 @@
private QName serviceName = new QName(
"http://org/apache/axis2/jaxws/proxy/rpclitswa", "RPCLitSWAService");
- private String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitSWAService";
+ private String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitSWAService.RPCLitSWA";
private QName portName = new QName("http://org/apache/axis2/jaxws/proxy/rpclitswa",
"RPCLitSWA");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java Thu Feb 28 14:00:13 2008
@@ -46,7 +46,7 @@
private QName serviceName = new QName(
"http://org.apache.axis2.jaxws.proxy.rpclit", "RPCLitService");
- private String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitService";
+ private String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitService.RPCLitImplPort";
private QName portName = new QName("http://org.apache.axis2.jaxws.proxy.rpclit",
"RPCLit");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java Thu Feb 28 14:00:13 2008
@@ -19,6 +19,7 @@
package org.apache.axis2.jaxws.proxy;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.WebServiceException;
import junit.framework.TestCase;
@@ -35,7 +36,9 @@
private static final String SEND_SOAP11_RESPONSE = "RESPONSE-SOAP11";
private static final String SEND_SOAP12_RESPONSE = "RESPONSE-SOAP12";
-
+ String axisEndpoint = "http://localhost:6060/axis2/services/SOAP12EchoService.EchoPort";
+
+
public SOAP12ProxyTests(String name) {
super(name);
}
@@ -51,7 +54,9 @@
// should have a proper SOAP 1.2 binding configured
SOAP12EchoService service = new SOAP12EchoService();
Echo proxy = service.getPort(new QName("http://jaxws.axis2.apache.org/proxy/soap12", "EchoPort"), Echo.class);
-
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
// invoke the remote operation. send a key that tells the
// service send back a SOAP 1.2 response.
String response = proxy.echo(SEND_SOAP12_RESPONSE);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java Thu Feb 28 14:00:13 2008
@@ -20,6 +20,7 @@
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Holder;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
@@ -31,12 +32,19 @@
public class RPCLitEnumTests extends TestCase {
- public void testEnumSimpleType(){
+
+ String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitEnumService.PortTypeImplPort";
+
+ public void testEnumSimpleType(){
TestLogger.logger.debug("------------------------------");
TestLogger.logger.debug("Test : " + getName());
try{
Service service = new Service();
PortType portType = service.getPort();
+
+ BindingProvider p = (BindingProvider) portType;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
Holder<ElementString> pString = new Holder<ElementString>(ElementString.A);
portType.echoString(pString);
ElementString es = pString.value;
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java Thu Feb 28 14:00:13 2008
@@ -20,6 +20,8 @@
import java.util.Arrays;
+import javax.xml.ws.BindingProvider;
+
import junit.framework.TestCase;
import org.apache.axis2.jaxws.rpclit.stringarray.sei.Echo;
@@ -28,13 +30,19 @@
public class RPCLitStringArrayTests extends TestCase {
- public void testStringArrayType() {
+
+ String axisEndpoint = "http://localhost:6060/axis2/services/RPCLitStringArrayService.EchoImplPort";
+
+ public void testStringArrayType() {
System.out.println("------------------------------");
System.out.println("Test : " + getName());
try {
RPCLitStringArrayService service = new RPCLitStringArrayService();
Echo portType = service.getEchoPort();
+ BindingProvider p = (BindingProvider) portType;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String[] strArray= {"str1", "str2", "str3"};
StringArray array = new StringArray();
array.getItem().addAll(Arrays.asList(strArray));
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java Thu Feb 28 14:00:13 2008
@@ -64,7 +64,7 @@
*/
public class AddNumbersHandlerTests extends TestCase {
- String axisEndpoint = "http://localhost:6060/axis2/services/AddNumbersHandlerService";
+ String axisEndpoint = "http://localhost:6060/axis2/services/AddNumbersHandlerService.AddNumbersHandlerPortTypeImplPort";
File requestFile = null;
public void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java Thu Feb 28 14:00:13 2008
@@ -30,7 +30,7 @@
public class AddNumbersTests extends TestCase {
- String axisEndpoint = "http://localhost:6060/axis2/services/AddNumbersService";
+ String axisEndpoint = "http://localhost:6060/axis2/services/AddNumbersService.AddNumbersPortTypeImplPort";
public void testAddNumbers() throws Exception {
TestLogger.logger.debug("----------------------------------");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java Thu Feb 28 14:00:13 2008
@@ -45,7 +45,7 @@
NAMESPACE, "AddressBookService");
private static final QName QNAME_PORT = new QName(
NAMESPACE, "AddressBook");
- private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/AddressBookService";
+ private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/AddressBookService.AddressBookImplPort";
/**
* Test the endpoint by invoking it with a JAX-WS Dispatch.
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java Thu Feb 28 14:00:13 2008
@@ -31,7 +31,9 @@
import org.apache.log4j.BasicConfigurator;
public class BareTests extends TestCase {
-
+
+ String axisEndpoint = "http://localhost:6060/axis2/services/BareDocLitService.DocLitBarePortTypeImplPort";
+
public void testTwoWaySync(){
TestLogger.logger.debug("------------------------------");
TestLogger.logger.debug("Test : " + getName());
@@ -45,6 +47,8 @@
BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
p.getRequestContext().put(
BindingProvider.SOAPACTION_URI_PROPERTY, "twoWaySimple");
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String response = proxy.twoWaySimple(10);
TestLogger.logger.debug("Sync Response =" + response);
TestLogger.logger.debug("------------------------------");
@@ -62,6 +66,9 @@
BareDocLitService service = new BareDocLitService();
DocLitBarePortType proxy = service.getBareDocLitPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String response = proxy.twoWaySimple(10);
TestLogger.logger.debug("Sync Response =" + response);
TestLogger.logger.debug("------------------------------");
@@ -79,12 +86,14 @@
BareDocLitService service = new BareDocLitService();
DocLitBarePortType proxy = service.getBareDocLitPort();
- BindingProvider p = (BindingProvider) proxy;
-
- p.getRequestContext().put(
- BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
- p.getRequestContext().put(
- BindingProvider.SOAPACTION_URI_PROPERTY, "oneWayEmpty");
+ BindingProvider p = (BindingProvider) proxy;
+
+ p.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY,
+ Boolean.TRUE);
+ p.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY,
+ "oneWayEmpty");
+ p.getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
proxy.oneWayEmpty();
TestLogger.logger.debug("------------------------------");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java Thu Feb 28 14:00:13 2008
@@ -41,7 +41,7 @@
NAMESPACE, "GreeterService");
private static final QName QNAME_PORT = new QName(
NAMESPACE, "GreeterPort");
- private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/GreeterService";
+ private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/GreeterService.GreeterImplPort";
private Greeter getProxy(String action) {
Service service = Service.create(QNAME_SERVICE);
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java Thu Feb 28 14:00:13 2008
@@ -45,7 +45,7 @@
public class FaultsServiceTests extends TestCase {
- String axisEndpoint = "http://localhost:6060/axis2/services/FaultsService";
+ String axisEndpoint = "http://localhost:6060/axis2/services/FaultsService.FaultsPort";
/**
* Utility method to get the proxy
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultyWebServiceTests.java Thu Feb 28 14:00:13 2008
@@ -49,7 +49,7 @@
import org.test.faults.FaultyWebServiceResponse;
public class FaultyWebServiceTests extends TestCase {
- String axisEndpoint = "http://localhost:6060/axis2/services/FaultyWebServiceService";
+ String axisEndpoint = "http://localhost:6060/axis2/services/FaultyWebServiceService.FaultyWebServicePortTypeImplPort";
public void testFaultyWebService(){
FaultyWebServiceFault_Exception exception = null;
try{
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java Thu Feb 28 14:00:13 2008
@@ -46,7 +46,7 @@
private static final QName QNAME_SERVICE = new QName("urn://mtom.test.org", "MtomSampleService");
private static final QName QNAME_PORT = new QName("urn://mtom.test.org", "MtomSample");
- private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/MtomSampleService";
+ private static final String URL_ENDPOINT = "http://localhost:6060/axis2/services/MtomSampleService.MtomSampleServicePort";
private static final String IMAGE_DIR = System.getProperty("basedir",".")+"/"+"test-resources"+File.separator+"image";
/*
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/ParallelAsyncTests.java Thu Feb 28 14:00:13 2008
@@ -50,7 +50,7 @@
public class ParallelAsyncTests extends TestCase {
private static final String DOCLITWR_ASYNC_ENDPOINT =
- "http://localhost:6060/axis2/services/AsyncService";
+ "http://localhost:6060/axis2/services/AsyncService.DocLitWrappedPortImplPort";
// used for logging
private String myClassName = "ParallelAsyncTests";
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WSGenTests.java Thu Feb 28 14:00:13 2008
@@ -27,7 +27,7 @@
public class WSGenTests extends TestCase {
- String axisEndpoint = "http://localhost:6060/axis2/services/WSGenService";
+ String axisEndpoint = "http://localhost:6060/axis2/services/WSGenService.WSGenPort";
public void testWSGen() {
try{
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/WrapTests.java Thu Feb 28 14:00:13 2008
@@ -22,6 +22,7 @@
*/
package org.apache.axis2.jaxws.sample;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Holder;
import junit.framework.TestCase;
@@ -35,6 +36,8 @@
public class WrapTests extends TestCase {
+ String axisEndpoint = "http://localhost:6060/axis2/services/DocLitWrapService.DocLitWrapImplPort";
+
/**
*
*/
@@ -58,6 +61,9 @@
String reqString = "Test twoWay Sync";
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
+
String response = proxy.twoWay(reqString);
TestLogger.logger.debug("Sync Response =" + response);
TestLogger.logger.debug("------------------------------");
@@ -74,6 +80,8 @@
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
proxy.oneWayVoid();
TestLogger.logger.debug("------------------------------");
@@ -93,6 +101,8 @@
Holder<Integer> intHolder = new Holder<Integer>(holderInteger);
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
proxy.twoWayHolder(strHolder, intHolder);
TestLogger.logger.debug("Holder Response String =" + strHolder.value);;
TestLogger.logger.debug("Holder Response Integer =" + intHolder.value);
@@ -116,6 +126,8 @@
Holder<HeaderPart0> holder = new Holder<HeaderPart0>(hp0);
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
HeaderResponse hr = proxy.header(header, holder, hp1);
hp0=holder.value;
TestLogger.logger.debug("Holder Response String =" + hp0.getHeaderType());
@@ -137,6 +149,8 @@
Holder<Integer> intHolder = new Holder<Integer>(holderInteger);
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
proxy.twoWayHolder(strHolder, intHolder);
TestLogger.logger.debug("Holder Response String =" + strHolder.value);;
TestLogger.logger.debug("Holder Response Integer =" + intHolder.value);
@@ -160,6 +174,8 @@
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
String response = proxy.echoStringWSGEN1(request);
assertTrue(response.equals(request));
TestLogger.logger.debug("------------------------------");
@@ -183,6 +199,8 @@
DocLitWrapService service = new DocLitWrapService();
DocLitWrap proxy = service.getDocLitWrapPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
String response = proxy.echoStringWSGEN2(request);
assertTrue(response.equals(request));
TestLogger.logger.debug("------------------------------");
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?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- 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 Thu Feb 28 14:00:13 2008
@@ -30,7 +30,7 @@
public class BasicAuthSecurityTests extends TestCase {
- private String endpointUrl = "http://localhost:6060/axis2/services/BasicAuthSecurityService";
+ private String endpointUrl = "http://localhost:6060/axis2/services/BasicAuthSecurityService.SimpleProviderServiceSOAP11port0";
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/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java Thu Feb 28 14:00:13 2008
@@ -38,7 +38,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageDataSourceProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageDataSourceProvider.XMessageDataSourceProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XMessageDataSourceProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XMessageDataSourceProviderPort");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java Thu Feb 28 14:00:13 2008
@@ -46,7 +46,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XPayloadSourceProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XPayloadSourceProvider.XPayloadSourceProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XPayloadSourceProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XPayloadSourceProviderPort");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java Thu Feb 28 14:00:13 2008
@@ -40,7 +40,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageSourceProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageSourceProvider.XMessageSourceProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XMessageSourceProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XMessageSourceProviderPort");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java Thu Feb 28 14:00:13 2008
@@ -40,7 +40,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XPayloadSourceProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageSourceProvider.XMessageSourceProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XPayloadSourceProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XPayloadSourceProviderPort");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java Thu Feb 28 14:00:13 2008
@@ -30,7 +30,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageStringProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XMessageStringProvider.XMessageStringProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XMessageStringProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XMessageStringProviderPort");
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java Thu Feb 28 14:00:13 2008
@@ -30,7 +30,7 @@
public String HOSTPORT = "http://localhost:6060";
- private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XPayloadStringProvider";
+ private String ENDPOINT_URL = HOSTPORT + "/axis2/services/XPayloadStringProvider.XPayloadStringProviderPort";
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2", "XPayloadStringProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2", "XPayloadStringProviderPort");
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=632128&r1=632127&r2=632128&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Thu Feb 28 14:00:13 2008
@@ -1041,8 +1041,7 @@
portName = "NoPortNameSpecified";
}
-
- return getServiceDescription().getServiceQName().getLocalPart();
+ return getServiceDescription().getServiceQName().getLocalPart() + "." + portName;
}
public boolean isWSDLFullySpecified() {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org