Author: dims
Date: Thu May 24 06:56:10 2007
New Revision: 541303
URL: http://svn.apache.org/viewvc?view=rev&rev=541303
Log:
Fix for AXIS2-2175 - wsdl2java wsdl creation for interop. with .net
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.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/WSDL11ToAxisServiceBuilder.java
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?view=diff&rev=541303&r1=541302&r2=541303
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
Thu May 24 06:56:10 2007
@@ -41,11 +41,20 @@
// such as SchemaElementName , direction etc.
private QName elementQname;
private String direction;
+ private String messagePartName;
// private PolicyInclude policyInclude;
- public AxisMessage() {
+ public String getMessagePartName() {
+ return messagePartName;
+ }
+
+ public void setMessagePartName(String messagePartName) {
+ this.messagePartName = messagePartName;
+ }
+
+ public AxisMessage() {
soapHeaders = new ArrayList();
handlerChain = new ArrayList();
}
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=541303&r1=541302&r2=541303
==============================================================================
---
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
Thu May 24 06:56:10 2007
@@ -287,7 +287,11 @@
OMElement messagePart = fac.createOMElement(
PART_ATTRIBUTE_NAME, wsdl);
messageElement.addChild(messagePart);
- messagePart.addAttribute(ATTRIBUTE_NAME, "part1", null);
+ if(axismessage.getMessagePartName() != null) {
+ messagePart.addAttribute(ATTRIBUTE_NAME,
axismessage.getMessagePartName(), null);
+ } else {
+ messagePart.addAttribute(ATTRIBUTE_NAME, "part1", null);
+ }
messagePart.addAttribute(ELEMENT_ATTRIBUTE_NAME,
WSDLSerializationUtil.getPrefix(schemaElementName.getNamespaceURI(),
axisService.getNameSpacesMap()) + ":"
+
schemaElementName.getLocalPart(), null);
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=541303&r1=541302&r2=541303
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Thu May 24 06:56:10 2007
@@ -848,6 +848,7 @@
QName elementName = part.getElementName();
if (elementName != null) {
message.setElementQName(elementName);
+ message.setMessagePartName(part.getName());
((AxisService) message.getParent().getParent())
.addMessageElementQNameToOperationMapping(elementName,
(AxisOperation) message
@@ -878,6 +879,7 @@
QName elementName = part.getElementName();
if (elementName != null) {
message.setElementQName(elementName);
+ message.setMessagePartName(part.getName());
((AxisService) message.getParent().getParent())
.addMessageElementQNameToOperationMapping(elementName,
(AxisOperation) message
@@ -939,7 +941,8 @@
log.error(message);
throw new AxisFault(message);
}
-
+
+ faultMessage.setMessagePartName(wsdl4jMessagePart.getName());
faultMessage.setElementQName(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
