11:15 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2008-02-22 12:15:14 -0500 (Fri, 22 Feb 2008)
New Revision: 5774
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
Log:
[JBWS-1990] Support for SOAP 1.2 in wsconsume
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-02-22
15:13:18 UTC (rev 5773)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-02-22
17:15:14 UTC (rev 5774)
@@ -109,6 +109,13 @@
public abstract void setSourceDirectory(File directory);
/**
+ * Enables/Disables SOAP 1.2 binding extension
+ *
+ * @param extension whether or not to enable SOAP 1.2 binding extension
+ */
+ public abstract void setExtension(boolean extension);
+
+ /**
* Enables/Disables Java source generation.
*
* @param generateSource whether or not to generate Java source.
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-02-22
15:13:18 UTC (rev 5773)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-02-22
17:15:14 UTC (rev 5774)
@@ -53,6 +53,7 @@
* <tr><td>wsdlLocation</td><td>Value to use for
@(a)WebService.wsdlLocation</td><td>generated</td></tr>
* <tr><td>destdir</td><td>The output directory for generated
artifacts.</td><td>"output"</td></tr>
* <tr><td>sourcedestdir</td><td>The output directory for Java
source.</td><td>value of destdir</td></tr>
+ * <tr><td>extension</td><td>Enable SOAP 1.2 binding
extension.</td><td>false</td></tr>
* <tr><td>target</td><td>The JAX-WS specification
target</td><td>2.0 | 2.1</td></tr>
* <tr><td>verbose</td><td>Enables more informational output
about cmd progress.</td><td>false</td><tr>
* <tr><td>wsdl*</td><td>The WSDL file or
URL</td><td>n/a</td><tr>
@@ -88,6 +89,7 @@
private String wsdlLocation;
private String targetPackage;
private boolean keep;
+ private boolean extension;
private boolean verbose;
private boolean fork;
private boolean debug;
@@ -129,6 +131,11 @@
this.keep = keep;
}
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
public void setSourcedestdir(File sourcedestdir)
{
this.sourcedestdir = sourcedestdir;
@@ -178,6 +185,7 @@
{
WSContractConsumer importer = WSContractConsumer.newInstance();
importer.setGenerateSource(keep);
+ importer.setExtension(extension);
if (destdir != null)
importer.setOutputDirectory(destdir);
if (sourcedestdir != null)
@@ -261,6 +269,9 @@
if (keep)
command.createArgument().setValue("-k");
+
+ if (extension)
+ command.createArgument().setValue("-e");
for (File file : bindingFiles)
{
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2008-02-22 15:13:18
UTC (rev 5773)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2008-02-22 17:15:14
UTC (rev 5774)
@@ -51,6 +51,7 @@
* -q, --quiet Be somewhat more quiet
* -v, --verbose Show full exception stack traces
* -l, --load-consumer Load the consumer and exit (debug utility)
+ * -e, --extension Enable SOAP 1.2 binding extension
* </pre>
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T.
Greene</a>
@@ -66,6 +67,7 @@
private boolean quiet = false;
private boolean verbose = false;
private boolean loadConsumer = false;
+ private boolean extension = false;
private File outputDir = new File("output");
private File sourceDir = null;
private String target = null;
@@ -81,7 +83,7 @@
private URL parseArguments(String[] args)
{
- String shortOpts = "b:c:p:w:o:s:t:khqvl";
+ String shortOpts = "b:c:p:w:o:s:t:khqvle";
LongOpt[] longOpts =
{
new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
@@ -95,6 +97,7 @@
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'),
new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'),
+ new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'),
new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'),
};
@@ -137,6 +140,9 @@
case 'l':
loadConsumer = true;
break;
+ case 'e':
+ extension = true;
+ break;
case 'h':
printHelp();
System.exit(0);
@@ -190,6 +196,7 @@
importer.setGenerateSource(generateSource);
importer.setOutputDirectory(outputDir);
+ importer.setExtension(extension);
if (sourceDir != null)
importer.setSourceDirectory(sourceDir);
@@ -254,6 +261,7 @@
out.println(" -q, --quiet Be somewhat more quiet");
out.println(" -v, --verbose Show full exception stack
traces");
out.println(" -l, --load-consumer Load the consumer and exit (debug
utility)");
+ out.println(" -e, --extension Enable SOAP 1.2 binding
extension");
out.flush();
}
}