You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by am...@apache.org on 2011/05/10 15:53:30 UTC
svn commit: r1101464 - in /axis/axis2/java/core/trunk/modules:
java2wsdl/src/org/apache/ws/java2wsdl/
java2wsdl/src/org/apache/ws/java2wsdl/utils/
kernel/src/org/apache/axis2/description/java2wsdl/
Author: amilas
Date: Tue May 10 13:53:30 2011
New Revision: 1101464
URL: http://svn.apache.org/viewvc?rev=1101464&view=rev
Log:
adding an options to add a suffix to request message
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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -70,6 +70,7 @@ public class Java2WSDL {
System.out.println(" -soap11BindingName soap11 binding name of the WSDL");
System.out.println(" -soap12BindingName soap 12 binding name of the WSDL");
System.out.println(" -restBindingName rest binding name of the WSDL");
+ System.out.println(" -res <requestElementSuffix> Adds a suffix to the request elemment");
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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -95,6 +95,8 @@ public class Java2WSDLBuilder implements
private String soap12BindingName;
private String restBindingName;
+ private String requestElementSuffix;
+
public Java2WSDLBuilder() {
try {
ConfigurationContext configCtx = ConfigurationContextFactory
@@ -287,6 +289,10 @@ public class Java2WSDLBuilder implements
service.addParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG, messagePartName);
}
+ if (requestElementSuffix != null){
+ service.addParameter(Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_OPTION_LONG, requestElementSuffix);
+ }
+
schemaGenerator.setAxisService(service);
AxisService axisService = AxisService.createService(className,
serviceName == null ? Java2WSDLUtils
@@ -562,4 +568,12 @@ public class Java2WSDLBuilder implements
public void setRestBindingName(String restBindingName) {
this.restBindingName = restBindingName;
}
+
+ public String getRequestElementSuffix() {
+ return requestElementSuffix;
+ }
+
+ public void setRequestElementSuffix(String requestElementSuffix) {
+ this.requestElementSuffix = requestElementSuffix;
+ }
}
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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -286,6 +286,13 @@ public class Java2WSDLCodegenEngine impl
if (option != null) {
java2WsdlBuilder.setRestBindingName(option.getOptionValue());
}
+
+ option = loadOption(Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_OPTION,
+ Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_OPTION_LONG,
+ optionsMap);
+ if (option != null) {
+ java2WsdlBuilder.setRequestElementSuffix(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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -80,6 +80,8 @@ public class Java2WSDLOptionsValidator i
Java2WSDLConstants.SOAP11_BINDING_NAME_OPTION_LONG.equalsIgnoreCase(optionType)||
Java2WSDLConstants.SOAP12_BINDING_NAME_OPTION_LONG.equalsIgnoreCase(optionType)||
Java2WSDLConstants.REST_BINDING_NAME_OPTION_LONG.equalsIgnoreCase(optionType)||
+ Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_OPTION.equalsIgnoreCase(optionType)||
+ Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -362,9 +362,16 @@ public class DefaultSchemaGenerator impl
// we need to add the method opration wrapper part even to
// empty parameter operations
sequence = new XmlSchemaSequence();
- methodSchemaType = createSchemaTypeForMethodPart(methodName);
+
+ String requestElementSuffix = getRequestElementSuffix();
+ String requestLocalPart = methodName;
+ if (requestElementSuffix != null) {
+ requestLocalPart += requestElementSuffix;
+ }
+
+ methodSchemaType = createSchemaTypeForMethodPart(requestLocalPart);
methodSchemaType.setParticle(sequence);
- inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
+ inMessage.setElementQName(typeTable.getQNamefortheType(requestLocalPart));
Parameter param = service.getParameter(Java2WSDLConstants.MESSAGE_PART_NAME_OPTION_LONG);
if (param != null) {
@@ -1343,6 +1350,15 @@ public class DefaultSchemaGenerator impl
return complexType;
}
+ private String getRequestElementSuffix() {
+ String requestElementSuffix = null;
+ Parameter param = service.getParameter(Java2WSDLConstants.REQUEST_ELEMENT_SUFFIX_OPTION_LONG);
+ if (param != null) {
+ requestElementSuffix = (String) param.getValue();
+ }
+ return requestElementSuffix;
+ }
+
protected XmlSchemaComplexType getComplexTypeForElement(XmlSchema xmlSchema, QName name) {
Iterator<?> iterator = xmlSchema.getItems().getIterator();
while (iterator.hasNext()) {
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=1101464&r1=1101463&r2=1101464&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 13:53:30 2011
@@ -153,6 +153,9 @@ public interface Java2WSDLConstants {
String MESSAGE_PART_NAME_OPTION = "mpn";
String MESSAGE_PART_NAME_OPTION_LONG = "messagePartName";
+ String REQUEST_ELEMENT_SUFFIX_OPTION = "res";
+ String REQUEST_ELEMENT_SUFFIX_OPTION_LONG = "requestElementSuffix";
+
String AXIS2_NAMESPACE_PREFIX = "ns1";
public static final String SOLE_INPUT = "SOLE_INPUT";