Author: amilas
Date: Tue May 10 05:39:31 2011
New Revision: 1101316
URL: http://svn.apache.org/viewvc?rev=1101316&view=rev
Log:
adding an option to disable soap11 soap12 and rest bindings from the java2wsdl
tool
Modified:
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/Java2WSDLConstants.java
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=1101316&r1=1101315&r2=1101316&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 05:39:31 2011
@@ -38,6 +38,7 @@ import org.apache.axis2.engine.AxisConfi
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.Loader;
import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.axis2.Constants;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
@@ -82,6 +83,10 @@ public class Java2WSDLBuilder implements
private String mappingFileLocation;
private HashMap<String,MessageReceiver> messageReceivers = null;
+ private boolean disableSOAP11 = false;
+ private boolean disableSOAP12 = false;
+ private boolean disableREST = false;
+
public Java2WSDLBuilder() {
try {
ConfigurationContext configCtx =
ConfigurationContextFactory
@@ -264,6 +269,19 @@ public class Java2WSDLBuilder implements
axisService.setSchemaTargetNamespace(getSchemaTargetNamespace());
axisService
.setSchemaTargetNamespacePrefix(getSchemaTargetNamespacePrefix());
+
+ if (disableREST) {
+ axisService.addParameter(Constants.Configuration.DISABLE_REST,
disableREST);
+ }
+
+ if (disableSOAP11) {
+ axisService.addParameter(Constants.Configuration.DISABLE_SOAP11,
disableSOAP11);
+ }
+
+ if (disableSOAP12) {
+ axisService.addParameter(Constants.Configuration.DISABLE_SOAP12,
disableSOAP12);
+ }
+
String uri = locationUri;
if (uri == null) {
uri = DEFAULT_LOCATION_URL
@@ -448,4 +466,28 @@ public class Java2WSDLBuilder implements
public void setNillableElementsAllowed(boolean nillableElementsAllowed) {
this.nillableElementsAllowed = nillableElementsAllowed;
}
+
+ public boolean isDisableREST() {
+ return disableREST;
+ }
+
+ public void setDisableREST(boolean disableREST) {
+ this.disableREST = disableREST;
+ }
+
+ public boolean isDisableSOAP12() {
+ return disableSOAP12;
+ }
+
+ public void setDisableSOAP12(boolean disableSOAP12) {
+ this.disableSOAP12 = disableSOAP12;
+ }
+
+ public boolean isDisableSOAP11() {
+ return disableSOAP11;
+ }
+
+ public void setDisableSOAP11(boolean disableSOAP11) {
+ this.disableSOAP11 = disableSOAP11;
+ }
}
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=1101316&r1=1101315&r2=1101316&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 05:39:31 2011
@@ -244,6 +244,19 @@ public class Java2WSDLCodegenEngine impl
if (option != null) {
java2WsdlBuilder.setNillableElementsAllowed(false);
}
+
+ option = loadOption(Java2WSDLConstants.DISABLE_BINDING_SOAP11, null,
optionsMap);
+ if (option != null) {
+ java2WsdlBuilder.setDisableSOAP11(true);
+ }
+ option = loadOption(Java2WSDLConstants.DISABLE_BINDING_SOAP12, null,
optionsMap);
+ if (option != null) {
+ java2WsdlBuilder.setDisableSOAP12(true);
+ }
+ option = loadOption(Java2WSDLConstants.DISABLE_BINDING_REST, null,
optionsMap);
+ if (option != null) {
+ java2WsdlBuilder.setDisableREST(true);
+ }
}
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=1101316&r1=1101315&r2=1101316&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 05:39:31 2011
@@ -70,6 +70,9 @@ public class Java2WSDLOptionsValidator i
Java2WSDLConstants.WSDL_VERSION_OPTION.equalsIgnoreCase(optionType)||
Java2WSDLConstants.CUSTOM_SCHEMA_LOCATION.equalsIgnoreCase(optionType)||
Java2WSDLConstants.CUSTOM_SCHEMA_LOCATION_LONG.equalsIgnoreCase(optionType)||
+
Java2WSDLConstants.DISABLE_BINDING_SOAP11.equalsIgnoreCase(optionType)||
+
Java2WSDLConstants.DISABLE_BINDING_SOAP12.equalsIgnoreCase(optionType)||
+
Java2WSDLConstants.DISABLE_BINDING_REST.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/Java2WSDLConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?rev=1101316&r1=1101315&r2=1101316&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 05:39:31 2011
@@ -137,6 +137,9 @@ public interface Java2WSDLConstants {
String CUSTOM_SCHEMA_LOCATION_LONG = "custom-schema-location";
String SCHEMA_MAPPING_FILE_LOCATION = "mfl";
String SCHEMA_MAPPING_FILE_LOCATION_LONG = "mapping-file-location";
+ String DISABLE_BINDING_SOAP11 = "disableSOAP11";
+ String DISABLE_BINDING_SOAP12 = "disableSOAP12";
+ String DISABLE_BINDING_REST = "disableREST";
String DISALLOW_NILLABLE_ELEMENTS_OPTION = "dne";
String DISALLOW_NILLABLE_ELEMENTS_OPTION_LONG = "disallowNillableElements";
