Author: keithc
Date: Wed May 23 01:20:33 2007
New Revision: 540876
URL: http://svn.apache.org/viewvc?view=rev&rev=540876
Log:
Serializing newly added documentation elements in ?wsdl
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
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=540876&r1=540875&r2=540876
==============================================================================
---
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
Wed May 23 01:20:33 2007
@@ -135,7 +135,7 @@
service_element.getAttribute(new
QName(ATTRIBUTE_NAME));
if (serviceNameatt != null) {
- if (!"".equals(serviceNameatt.getAttributeValue().trim()))
{
+ if (!"".equals(serviceNameatt.getAttributeValue().trim())
&& service.getServiceDescription() == null) {
service.setServiceDescription(serviceNameatt.getAttributeValue());
}
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
Wed May 23 01:20:33 2007
@@ -198,7 +198,7 @@
AxisBindingOperation axisBindingOperation = (AxisBindingOperation)
iterator.next();
bindingElement.addChild(axisBindingOperation.toWSDL20(wsdl, tns,
wsoap, whttp, type, nameSpaceMap));
}
- WSDLSerializationUtil.addWSDL2DocumentationElement(this,
bindingElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
bindingElement, omFactory, wsdl);
return bindingElement;
}
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
Wed May 23 01:20:33 2007
@@ -196,7 +196,7 @@
if (list != null && list.size() > 0) {
WSDLSerializationUtil.addSOAPModuleElements(omFactory, list,
wsoap, bindingMessageElement);
}
- WSDLSerializationUtil.addWSDL2DocumentationElement(this,
bindingMessageElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
bindingMessageElement, omFactory, wsdl);
return bindingMessageElement;
}
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Wed May 23 01:20:33 2007
@@ -159,10 +159,11 @@
bindingOpElement.addAttribute(omFactory.createOMAttribute(
WSDL2Constants.ATTRIBUTE_FAULT_SERIALIZATION, whttp,
property));
}
- property =
this.options.get(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED).toString();
- if (property != null) {
+ Boolean ignoreUncited =
+ (Boolean)
this.options.get(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED);
+ if (ignoreUncited != null) {
bindingOpElement.addAttribute(omFactory.createOMAttribute(
- WSDL2Constants.ATTRIBUTE_IGNORE_UNCITED, whttp,
property));
+ WSDL2Constants.ATTRIBUTE_IGNORE_UNCITED, whttp,
ignoreUncited.toString()));
}
property = (String)
this.options.get(WSDL2Constants.ATTR_WHTTP_METHOD);
if (property != null) {
@@ -211,7 +212,7 @@
bindingOpElement.addChild(faultMessage.toWSDL20(wsdl, tns,
wsoap, whttp, nameSpaceMap));
}
}
- WSDLSerializationUtil.addWSDL2DocumentationElement(this,
bindingOpElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
bindingOpElement, omFactory, wsdl);
return bindingOpElement;
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
Wed May 23 01:20:33 2007
@@ -128,7 +128,7 @@
if (property != null) {
endpointElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_AUTHENTICATION_REALM,
whttp, property));
}
- WSDLSerializationUtil.addWSDL2DocumentationElement(this,
endpointElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
endpointElement, omFactory, wsdl);
return endpointElement;
}
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Wed May 23 01:20:33 2007
@@ -646,7 +646,7 @@
OMFactory omFactory = OMAbstractFactory.getOMFactory();
OMElement axisOperationElement =
omFactory.createOMElement(WSDL2Constants.OPERATION_LOCAL_NAME,
wsdl);
- WSDLSerializationUtil.addWSDL2DocumentationElement(this,
axisOperationElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(this,
axisOperationElement, omFactory, wsdl);
axisOperationElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_NAME,
null,
this.getName().getLocalPart()));
@@ -666,7 +666,7 @@
OMElement inMessageElement =
omFactory.createOMElement(WSDL2Constants.IN_PUT_LOCAL_NAME, wsdl);
inMessageElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_ELEMENT,
null, WSDLSerializationUtil.getElementName(inMessage, nameSpaceMap)));
WSDLSerializationUtil.addWSAWActionAttribute(inMessageElement,
getInputAction());
- WSDLSerializationUtil.addWSDL2DocumentationElement(inMessage,
inMessageElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(inMessage,
inMessageElement, omFactory, wsdl);
axisOperationElement.addChild(inMessageElement);
}
@@ -676,7 +676,7 @@
OMElement outMessageElement =
omFactory.createOMElement(WSDL2Constants.OUT_PUT_LOCAL_NAME, wsdl);
outMessageElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_ELEMENT,
null, WSDLSerializationUtil.getElementName(outMessage, nameSpaceMap)));
WSDLSerializationUtil.addWSAWActionAttribute(outMessageElement,
getOutputAction());
- WSDLSerializationUtil.addWSDL2DocumentationElement(outMessage,
outMessageElement, omFactory, wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(outMessage,
outMessageElement, omFactory, wsdl);
axisOperationElement.addChild(outMessageElement);
}
@@ -694,7 +694,7 @@
}
faultElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_REF,
null, tns.getPrefix() + ":" + faultMessage.getName()));
WSDLSerializationUtil.addWSAWActionAttribute(faultElement,
getFaultAction(faultMessage.getName()));
-
WSDLSerializationUtil.addWSDL2DocumentationElement(faultMessage, faultElement,
omFactory, wsdl);
+
WSDLSerializationUtil.addWSDLDocumentationElement(faultMessage, faultElement,
omFactory, wsdl);
axisOperationElement.addChild(faultElement);
}
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
Wed May 23 01:20:33 2007
@@ -146,13 +146,7 @@
// <documentation><b>NEW!</b> This method accepts an ISBN
// string and returns <b>Amazon.co.uk</b> Sales Rank for
// that book.</documentation>
- String servicedescription = axisService.getServiceDescription();
- if (servicedescription != null && !"".equals(servicedescription)) {
- OMElement documenentattion = fac.createOMElement("documentation",
- wsdl);
- documenentattion.setText(servicedescription);
- ele.addChild(documenentattion);
- }
+ WSDLSerializationUtil.addWSDLDocumentationElement(axisService, ele,
fac, wsdl);
ele.addAttribute("targetNamespace", axisService.getTargetNamespace(),
null);
@@ -323,6 +317,7 @@
String operationName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
wsdl);
+ WSDLSerializationUtil.addWSDLDocumentationElement(axisOperation,
operation, fac, wsdl);
portType.addChild(operation);
operation.addAttribute(ATTRIBUTE_NAME, operationName, null);
addPolicyAsExtElement(PolicyInclude.OPERATION_POLICY, axisOperation
@@ -345,6 +340,7 @@
if (inaxisMessage != null) {
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
wsdl);
+
WSDLSerializationUtil.addWSDLDocumentationElement(inaxisMessage, input, fac,
wsdl);
input.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + inaxisMessage.getName(), null);
addPolicyAsExtElement(PolicyInclude.INPUT_POLICY,
@@ -369,6 +365,7 @@
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
wsdl);
+
WSDLSerializationUtil.addWSDLDocumentationElement(outAxisMessage, output, fac,
wsdl);
output.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + outAxisMessage.getName(), null);
addPolicyAsExtElement(PolicyInclude.OUTPUT_POLICY,
@@ -387,6 +384,7 @@
.get(i);
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
wsdl);
+
WSDLSerializationUtil.addWSDLDocumentationElement(faultyMessage, fault, fac,
wsdl);
fault.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + faultyMessage.getName(), null);
fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Wed May 23 01:20:33 2007
@@ -886,7 +886,6 @@
axisOperation.addParameter(parameter);
}
-
InterfaceMessageReference[] interfaceMessageReferences = operation
.getInterfaceMessageReferences();
for (int i = 0; i < interfaceMessageReferences.length; i++) {
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?view=diff&rev=540876&r1=540875&r2=540876
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Wed May 23 01:20:33 2007
@@ -383,9 +383,9 @@
}
}
- public static void addWSDL2DocumentationElement(AxisDescription
axisDescription, OMElement omElement, OMFactory omFactory, OMNamespace wsdl) {
+ public static void addWSDLDocumentationElement(AxisDescription
axisDescription, OMElement omElement, OMFactory omFactory, OMNamespace wsdl) {
String documentationString = axisDescription.getDocumentation();
- OMElement documentation = null;
+ OMElement documentation;
if (documentationString != null && !"".equals(documentationString)) {
documentation =
omFactory.createOMElement(WSDL2Constants.DOCUMENTATION, wsdl);
OMText omText;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
