Author: amilas
Date: Sun Feb 6 08:29:39 2011
New Revision: 1067612
URL: http://svn.apache.org/viewvc?rev=1067612&view=rev
Log:
apply the patch for AXIS2-4921
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=1067612&r1=1067611&r2=1067612&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Sun Feb 6 08:29:39 2011
@@ -3009,6 +3009,7 @@ public class AxisServiceBasedMultiLangua
// This is the wrapped component - add the type mapping
Element mainParameter = generateParamComponent(doc,
+inputMessage.getDocumentation(),
this.mapper.getParameterName(
inputMessage.getElementQName()),
this.mapper.getTypeMappingName(
@@ -3052,9 +3053,11 @@ public class AxisServiceBasedMultiLangua
wrapped_jaxws = true;
//populate the parts list - this list is needed to generate
multiple
//parameters in the signatures
+//todo documentation is kept empty(null) in this scenario
for (int i = 0; i < partsList.size(); i++) {
QName qName = (QName) partsList.get(i);
mainParameter.appendChild(generateParamComponent(doc,
+null,
this.mapper.getParameterName(
qName),
this.mapper.getTypeMappingName(
@@ -3091,11 +3094,12 @@ public class AxisServiceBasedMultiLangua
* @return DOM Element
*/
protected Element generateParamComponent(Document doc,
+ String comment,
String paramName,
String paramType,
QName operationName,
QName paramQName) {
-return generateParamComponent(doc, paramName, paramType,
operationName, paramQName, null,
+return generateParamComponent(doc, comment, paramName, paramType,
operationName, paramQName, null,
false, false);
}
@@ -3108,10 +3112,11 @@ public class AxisServiceBasedMultiLangua
* @return DOM Element
*/
protected Element generateParamComponent(Document doc,
+ String comment,
String paramName,
String paramType,
QName paramQName) {
-return generateParamComponent(doc, paramName, paramType, null,
paramQName, null, false,
+return generateParamComponent(doc,comment, paramName, paramType, null,
paramQName, null, false,
false);
}
@@ -3141,6 +3146,7 @@ public class AxisServiceBasedMultiLangua
* @param paramName
*/
protected Element generateParamComponent(Document doc,
+ String comment,
String paramName,
String paramType,
QName opName,
@@ -3152,6 +3158,10 @@ public class AxisServiceBasedMultiLangua
addAttribute(doc, "name",
paramName, paramElement);
+addAttribute(doc, "comment",
+(comment == null) ? "" : comment,
+paramElement);
+
if (codeGenConfiguration.getOutputLanguage().equals("jax-ws") &&
useHolderClass_jaxws) {
Class primitive = JavaUtils.getWrapperClass(paramType);
if(primitive != null){
@@ -3225,12 +3235,15 @@ public class AxisServiceBasedMultiLangua
}
String parameterName;
String typeMappingStr;
+String comment = null;
parameterName =
this.mapper.getParameterName(outputMessage.getElementQName());
+comment = outputMessage.getDocumentation();
String typeMapping =
this.
