Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 45944 invoked from network); 22 May 2006 10:49:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 May 2006 10:49:50 -0000 Received: (qmail 79393 invoked by uid 500); 22 May 2006 10:49:49 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 79148 invoked by uid 500); 22 May 2006 10:49:48 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 79137 invoked by uid 500); 22 May 2006 10:49:48 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 79134 invoked by uid 99); 22 May 2006 10:49:48 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2006 03:49:48 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2006 03:49:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 521001A983A; Mon, 22 May 2006 03:49:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r408637 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/description/AxisService2OM.java integration/test/org/apache/axis2/engine/WSDLClientTest.java Date: Mon, 22 May 2006 10:49:26 -0000 To: axis2-cvs@ws.apache.org From: deepal@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060522104927.521001A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: deepal Date: Mon May 22 03:49:26 2006 New Revision: 408637 URL: http://svn.apache.org/viewvc?rev=408637&view=rev Log: -append the transport protocol into auto gen port name Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=408637&r1=408636&r2=408637&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java Mon May 22 03:49:26 2006 @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.StringWriter; +import java.net.URL; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -369,10 +370,11 @@ throws Exception { for (int i = 0; i < url.length; i++) { String urlString = url[i]; + URL url = new URL(urlString); OMElement port = fac.createOMElement(PORT, wsdl); service.addChild(port); port.addAttribute(ATTRIBUTE_NAME, axisService.getName() - + SOAP11PORT + i, null); + + SOAP11PORT + "_" + url.getProtocol(), null); port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":" + axisService.getName() + BINDING_NAME_SUFFIX, null); addExtensionElement(fac, port, SOAP_ADDRESS, LOCATION, urlString, @@ -407,10 +409,11 @@ throws Exception { for (int i = 0; i < url.length; i++) { String urlString = url[i]; + URL url = new URL(urlString); OMElement port = fac.createOMElement(PORT, wsdl); service.addChild(port); port.addAttribute(ATTRIBUTE_NAME, axisService.getName() - + SOAP12PORT + i, null); + + SOAP12PORT + "_" + url.getProtocol(), null); port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":" + axisService.getName() + SOAP12BINDING_NAME_SUFFIX, null); addExtensionElement(fac, port, SOAP_ADDRESS, LOCATION, urlString, Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?rev=408637&r1=408636&r2=408637&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Mon May 22 03:49:26 2006 @@ -58,7 +58,7 @@ "/axis2/services/EchoXMLService?wsdl"); ServiceClient serviceClient = new ServiceClient(null, wsdlURL, new QName("http://ws.apache.org/axis2", "EchoXMLService"), - "EchoXMLServiceSOAP11port0"); + "EchoXMLServiceSOAP11port_http"); OMElement payload = TestingUtils.createDummyOMElement("http://engine.axis2.apache.org/xsd"); OMElement response = serviceClient.sendReceive( new QName("http://engine.axis2.apache.org/xsd", "echoOM"), payload); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org