You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2007/03/29 13:30:53 UTC
svn commit: r523673 - in /webservices/axis2/trunk/java/modules:
java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Author: deepal
Date: Thu Mar 29 04:30:51 2007
New Revision: 523673
URL: http://svn.apache.org/viewvc?view=rev&rev=523673
Log:
fixing AXIS2-2414 and half fix for 2415
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?view=diff&rev=523673&r1=523672&r2=523673
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java Thu Mar 29 04:30:51 2007
@@ -372,14 +372,12 @@
null);
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
- addExtensionElement(fac, input, soap, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, input, soap, SOAP_BODY, SOAP_USE, use);
operation.addChild(input);
if (!jmethod.getReturnType().isVoidType()) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
- addExtensionElement(fac, output, soap, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, output, soap, SOAP_BODY, SOAP_USE, use);
operation.addChild(output);
}
@@ -387,8 +385,7 @@
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
fault.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + "Fault", null);
- addExtensionElement(fac, fault, soap, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, fault, soap, SOAP_BODY, SOAP_USE, use);
operation.addChild(fault);
}
}
@@ -422,22 +419,19 @@
null);
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
- addExtensionElement(fac, input, soap12, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, input, soap12, SOAP_BODY, SOAP_USE, use);
operation.addChild(input);
if (!jmethod.getReturnType().isVoidType()) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
- addExtensionElement(fac, output, soap12, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, output, soap12, SOAP_BODY, SOAP_USE, use);
operation.addChild(output);
}
if (jmethod.getExceptionTypes().length > 0) {
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
fault.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName() + "Fault", null);
- addExtensionElement(fac, fault, soap12, SOAP_BODY, SOAP_USE, use,
- "namespace", targetNamespace);
+ addExtensionElement(fac, fault, soap12, SOAP_BODY, SOAP_USE, use);
operation.addChild(fault);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=523673&r1=523672&r2=523673
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Mar 29 04:30:51 2007
@@ -60,6 +60,7 @@
public class ServiceBuilder extends DescriptionBuilder {
private static final Log log = LogFactory.getLog(ServiceBuilder.class);
private AxisService service;
+ private HashMap wsdlServiceMap = new HashMap();
public ServiceBuilder(ConfigurationContext configCtx, AxisService service) {
this.service = service;
@@ -79,6 +80,27 @@
public AxisService populateService(OMElement service_element) throws DeploymentException {
try {
// Processing service level parameters
+ OMAttribute serviceNameatt = service_element.getAttribute(new QName(ATTRIBUTE_NAME));
+
+ // If the service name is explicitly specified in the services.xml
+ // then use that as the service name
+ if (serviceNameatt != null) {
+ if (!"".equals(serviceNameatt.getAttributeValue().trim())) {
+ AxisService wsdlService = (AxisService) wsdlServiceMap.get(serviceNameatt.getAttributeValue());
+ if(wsdlService!=null){
+ service = wsdlService;
+ service.setWsdlFound(true);
+ service.setCustomWsdl(true);
+ }
+ service.setName(serviceNameatt.getAttributeValue());
+ //To be on the safe side
+ if (service.getServiceDescription() == null) {
+ service.setServiceDescription(serviceNameatt.getAttributeValue());
+ }
+ }
+ }
+
+
Iterator itr = service_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, service, service.getParent());
@@ -97,7 +119,7 @@
service.setServiceDescription(descriptionElement.getText());
}
} else {
- OMAttribute serviceNameatt =
+ serviceNameatt =
service_element.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt != null) {
@@ -106,19 +128,6 @@
}
}
}
- OMAttribute serviceNameatt = service_element.getAttribute(new QName(ATTRIBUTE_NAME));
-
- // If the service name is explicitly specified in the services.xml
- // then use that as the service name
- if (serviceNameatt != null) {
- if (!"".equals(serviceNameatt.getAttributeValue().trim())) {
- service.setName(serviceNameatt.getAttributeValue());
- //To be on the safe side
- if (service.getServiceDescription() == null) {
- service.setServiceDescription(serviceNameatt.getAttributeValue());
- }
- }
- }
if (service.getParameter("ServiceClass") == null) {
log.info("The Service " + service.getName() + " does not specify a Service Class");
@@ -787,5 +796,9 @@
}
+ }
+
+ public void setWsdlServiceMap(HashMap wsdlServiceMap) {
+ this.wsdlServiceMap = wsdlServiceMap;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=523673&r1=523672&r2=523673
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu Mar 29 04:30:51 2007
@@ -94,6 +94,7 @@
axisService.setClassLoader(currentFile.getClassLoader());
ServiceBuilder serviceBuilder = new ServiceBuilder(configCtx, axisService);
+ serviceBuilder.setWsdlServiceMap(wsdlServices);
AxisService service = serviceBuilder.populateService(rootElement);
ArrayList serviceList = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org