Author: amilas
Date: Tue May 10 06:29:09 2011
New Revision: 1101330
URL: http://svn.apache.org/viewvc?rev=1101330&view=rev
Log:
add an option to give the message part name
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL.java
Tue May 10 06:29:09 2011
@@ -65,6 +65,7 @@ public class Java2WSDL {
System.out.println(" -disableSOAP11 disable
binding generation for SOAP11");
System.out.println(" -disableSOAP12 disable
binding generation for SOAP12");
System.out.println(" -disableREST disable
binding generation for REST");
+ System.out.println(" -mpn <messagePartName> change
the part name of the generated wsdl messages");
System.exit(0);
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Tue May 10 06:29:09 2011
@@ -87,6 +87,8 @@ public class Java2WSDLBuilder implements
private boolean disableSOAP12 = false;
private boolean disableREST = false;
+ private String messagePartName;
+
public Java2WSDLBuilder() {
try {
ConfigurationContext configCtx =
ConfigurationContextFactory
@@ -255,6 +257,10 @@ public class Java2WSDLBuilder implements
service.addParameter(Java2WSDLConstants.DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG,
"true");
}
+ if (messagePartName != null){
+
service.addParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG,
messagePartName);
+ }
+
schemaGenerator.setAxisService(service);
AxisService axisService = AxisService.createService(className,
serviceName == null ? Java2WSDLUtils
@@ -490,4 +496,12 @@ public class Java2WSDLBuilder implements
public void setDisableSOAP11(boolean disableSOAP11) {
this.disableSOAP11 = disableSOAP11;
}
+
+ public String getMessagePartName() {
+ return messagePartName;
+ }
+
+ public void setMessagePartName(String messagePartName) {
+ this.messagePartName = messagePartName;
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
Tue May 10 06:29:09 2011
@@ -257,6 +257,13 @@ public class Java2WSDLCodegenEngine impl
if (option != null) {
java2WsdlBuilder.setDisableREST(true);
}
+
+ option = loadOption(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION,
+ Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG,
+ optionsMap);
+ if (option != null) {
+ java2WsdlBuilder.setMessagePartName(option.getOptionValue());
+ }
}
private Java2WSDLCommandLineOption loadOption(String shortOption, String
longOption,
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
Tue May 10 06:29:09 2011
@@ -73,6 +73,8 @@ public class Java2WSDLOptionsValidator i
Java2WSDLConstants.DISABLE_BINDING_SOAP11.equalsIgnoreCase(optionType)||
Java2WSDLConstants.DISABLE_BINDING_SOAP12.equalsIgnoreCase(optionType)||
Java2WSDLConstants.DISABLE_BINDING_REST.equalsIgnoreCase(optionType)||
+
Java2WSDLConstants.MESSAGE_PART_NAME_OPTION.equalsIgnoreCase(optionType)||
+
Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG.equalsIgnoreCase(optionType)||
Java2WSDLConstants.SCHEMA_MAPPING_FILE_LOCATION.equalsIgnoreCase(optionType)||
Java2WSDLConstants.SCHEMA_MAPPING_FILE_LOCATION_LONG.equalsIgnoreCase(optionType)||
Java2WSDLConstants.WSDL_VERSION_OPTION_LONG.equalsIgnoreCase(optionType)
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Tue May 10 06:29:09 2011
@@ -360,6 +360,12 @@ public class DefaultSchemaGenerator impl
methodSchemaType = createSchemaTypeForMethodPart(methodName);
methodSchemaType.setParticle(sequence);
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
+
+ Parameter param =
service.getParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG);
+ if (param != null) {
+ inMessage.setPartName((String) param.getValue());
+ }
+
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
axisOperation);
@@ -419,6 +425,12 @@ public class DefaultSchemaGenerator impl
WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
outMessage.setElementQName(typeTable.getQNamefortheType(partQname));
outMessage.setName(partQname);
+
+ Parameter outparam =
service.getParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG);
+ if (outparam != null) {
+ outMessage.setPartName((String) outparam.getValue());
+ }
+
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
axisOperation);
}
@@ -475,6 +487,12 @@ public class DefaultSchemaGenerator impl
AxisMessage faultMessage = new AxisMessage();
faultMessage.setName(this.service.getName() +
getSimpleClassName(extype));
faultMessage.setElementQName(typeTable.getQNamefortheType(partQname));
+
+ Parameter param =
service.getParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG);
+ if (param != null) {
+ faultMessage.setPartName((String) param.getValue());
+ }
+
axisOperation.setFaultMessages(faultMessage);
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?rev=1101330&r1=1101329&r2=1101330&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Tue May 10 06:29:09 2011
@@ -144,6 +144,9 @@ public interface Java2WSDLConstants {
String DISALLOW_NILLABLE_ELEMENTS_OPTION = "dne";
String DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG = "disallowNillableElements";
+ String MESSAGE_PART_NAME_OPTION = "mpn";
+ String MESSAGE_PART_NAME_OPTION_LONG = "messagePartName";
+
String AXIS2_NAMESPACE_PREFIX = "ns1";
public static final String SOLE_INPUT = "SOLE_INPUT";
