Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 30508 invoked from network); 21 Dec 2005 05:40:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Dec 2005 05:40:09 -0000 Received: (qmail 11915 invoked by uid 500); 21 Dec 2005 05:40:03 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 11860 invoked by uid 500); 21 Dec 2005 05:40:03 -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 11849 invoked by uid 500); 21 Dec 2005 05:40:03 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 11845 invoked by uid 99); 21 Dec 2005 05:40:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2005 21:40:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 20 Dec 2005 21:40:02 -0800 Received: (qmail 30336 invoked by uid 65534); 21 Dec 2005 05:39:42 -0000 Message-ID: <20051221053942.30335.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358215 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/description/ core/src/org/apache/axis2/transport/http/ wsdl/src/org/apache/axis2/wsdl/writer/ Date: Wed, 21 Dec 2005 05:39:40 -0000 To: axis2-cvs@ws.apache.org From: deepal@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: deepal Date: Tue Dec 20 21:39:22 2005 New Revision: 358215 URL: http://svn.apache.org/viewcvs?rev=358215&view=rev Log: fixed some errors in WSDLwriter (soapaction) Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=358215&r1=358214&r2=358215&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Tue Dec 20 21:39:22 2005 @@ -320,9 +320,9 @@ } } - public void printWSDL(OutputStream out) throws AxisFault { + public void printWSDL(OutputStream out, String serviceURL) throws AxisFault { //todo : This is a tempory hack pls imporve me : Deepal - AxisService2WOM axisService2WOM = new AxisService2WOM(getSchema(), this, null, null); + AxisService2WOM axisService2WOM = new AxisService2WOM(getSchema(), this, null, null, serviceURL); try { WSDLDescription desc = axisService2WOM.generateWOM(); WOMWriter womWriter = WOMWriterFactory.createWriter(org.apache.wsdl.WSDLConstants.WSDL_1_1); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java?rev=358215&r1=358214&r2=358215&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java Tue Dec 20 21:39:22 2005 @@ -44,13 +44,15 @@ private XmlSchema schema; private AxisService axisService; + private String url; public AxisService2WOM(XmlSchema schema, AxisService service, String targentNamespece, - String targetNamespecheprefix) { + String targetNamespecheprefix, String serviceURL) { this.schema = schema; this.axisService = service; + url = serviceURL; if (targentNamespece != null && !targentNamespece.trim().equals("")) { SchemaGenerator.TARGET_NAMESPACE = targentNamespece; @@ -96,7 +98,7 @@ //generating axisService WSDLService service = generateService(wsdlComponentFactory, binding, - axisService.getName()); + axisService.getName(), url); womDescription.addService(service); return womDescription; } @@ -145,14 +147,14 @@ } private WSDLService generateService(WSDLComponentFactory wsdlComponentFactory, - WSDLBinding binding, String ServiceName) { + WSDLBinding binding, String ServiceName, String URL) { WSDLService service = wsdlComponentFactory.createService(); service.setName(new QName(ServiceName)); WSDLEndpoint endpoints = wsdlComponentFactory.createEndpoint(); endpoints.setBinding(binding); endpoints.setName(new QName(ServiceName + "PortType")); SOAPAddressImpl address = new SOAPAddressImpl(); - address.setLocationURI("http://127.0.0.1:8080:/axis2/services/" + ServiceName); + address.setLocationURI(URL); endpoints.addExtensibilityElement(address); service.setEndpoint(endpoints); return service; Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=358215&r1=358214&r2=358215&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Tue Dec 20 21:39:22 2005 @@ -469,7 +469,7 @@ if (serviceObj != null) { if (wsdl != null) { res.setContentType("text/xml"); - ((AxisService) serviceObj).printWSDL(out); + ((AxisService) serviceObj).printWSDL(out,filePart); // PrintWriter out_writer = new PrintWriter(out); Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=358215&r1=358214&r2=358215&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java Tue Dec 20 21:39:22 2005 @@ -618,7 +618,7 @@ protected void writeSOAPOpextensibilityElement(SOAPOperation soapop) throws IOException, XMLStreamException { writer.writeStartElement(soapNsPrefix, BINDING_OPERATION, WSDL1_1_SOAP_NAMESPACE_URI); writer.writeAttribute("name", soapop.getType().getLocalPart()); - writer.writeAttribute("soapaction", soapop.getSoapAction()); + writer.writeAttribute("soapAction", soapop.getSoapAction()); writer.writeAttribute("style", soapop.getStyle()); writer.writeEndElement(); }