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();
}
