Author: bmaxwell Date: 2011-04-14 23:20:38 -0400 (Thu, 14 Apr 2011) New Revision: 14114 Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java spi/branches/jbossws-spi-1.0.0.GA_CP/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java Log: [JBPAPP-6253] backport - implementing support for protocol in wsprovide Property changes on: spi/branches/jbossws-spi-1.0.0.GA_CP/src ___________________________________________________________________ Added: svn:mergeinfo + /spi/trunk/src:11158 Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java =================================================================== --- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2011-04-14 21:30:27 UTC (rev 14113) +++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java 2011-04-15 03:20:38 UTC (rev 14114) @@ -77,6 +77,13 @@ * @param generateWsdl whether or not to generate WSDL */ public abstract void setGenerateWsdl(boolean generateWsdl); + + /** + * 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. Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java =================================================================== --- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2011-04-14 21:30:27 UTC (rev 14113) +++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2011-04-15 03:20:38 UTC (rev 14114) @@ -53,8 +53,9 @@ * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> + * <tr><td>extension</td><td>Enable SOAP 1.2 binding extension.</td><td>false</td></tr> * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> - * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> + * <tr><td>sei</td><td>Service Endpoint Implementation.</td><td></td><tr> * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> * </table> * <b>* = required.</b> @@ -73,6 +74,7 @@ * resourcedestdir=&quot;out-resource&quot; * sourcedestdir=&quot;out-source&quot; * genwsdl=&quot;true&quot; + * extension=&quot;true&quot; * verbose=&quot;true&quot; * sei=&quot;org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl&quot;&gt; * &lt;classpath&gt; @@ -83,21 +85,23 @@ * </pre> * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @version $Revision$ */ public class WSProvideTask extends Task { private Path classpath = new Path(getProject()); private CommandlineJava command = new CommandlineJava(); - private String sei = null; - private File destdir = null; - private File resourcedestdir = null; - private File sourcedestdir = null; - private boolean keep = false; - private boolean genwsdl = false; - private boolean verbose = false; - private boolean fork = false; - private boolean debug = false; + private String sei; + private File destdir; + private File resourcedestdir; + private File sourcedestdir; + private boolean keep; + private boolean extension; + private boolean genwsdl; + private boolean verbose; + private boolean fork; + private boolean debug; // Not actually used right now public void setDebug(boolean debug) @@ -129,7 +133,20 @@ { this.destdir = destdir; } + + public void setExtension(boolean extension) + { + this.extension = extension; + } + public void setProtocol(String protocol) + { + if (protocol != null) + { + this.extension = protocol.toLowerCase().indexOf("Xsoap1.2") != -1; + } + } + public void setKeep(boolean keep) { this.keep = keep; @@ -209,6 +226,8 @@ gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); gen.setGenerateSource(keep); gen.setGenerateWsdl(genwsdl); + gen.setExtension(extension); + if (destdir != null) gen.setOutputDirectory(destdir); if (resourcedestdir != null) @@ -263,6 +282,9 @@ if (genwsdl) command.createArgument().setValue("-w"); + if (extension) + command.createArgument().setValue("-e"); + if (destdir != null) { command.createArgument().setValue("-o"); @@ -295,4 +317,4 @@ if (execute.fork(this) != 0) throw new BuildException("Could not invoke WSProvideTask", getLocation()); } -} \ No newline at end of file +} Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java =================================================================== --- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-14 21:30:27 UTC (rev 14113) +++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-15 03:20:38 UTC (rev 14114) @@ -60,17 +60,18 @@ public class WSConsume { private List<File> bindingFiles = new ArrayList<File>(); - private boolean generateSource = false; - private File catalog = null; - private String targetPackage = null; - private String wsdlLocation = null; - 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; + private boolean generateSource; + private File catalog; + private String targetPackage; + private String wsdlLocation; + private boolean quiet; + private boolean verbose; + private boolean loadConsumer; + private boolean extension; + private boolean noCompile; + private File sourceDir; + private String target; public static String PROGRAM_NAME = System.getProperty("program.name", WSConsume.class.getName()); Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java =================================================================== --- spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-14 21:30:27 UTC (rev 14113) +++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-15 03:20:38 UTC (rev 14114) @@ -51,6 +51,7 @@ * -q, --quiet Be somewhat more quiet * -t, --show-traces Show full exception stack traces * -l, --load-provider Load the provider 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> @@ -58,15 +59,16 @@ */ public class WSProvide { - private boolean generateSource = false; - private boolean generateWsdl = false; - private boolean quiet = false; - private boolean showTraces = false; - private boolean loadProvider = false; private ClassLoader loader = Thread.currentThread().getContextClassLoader(); private File outputDir = new File("output"); - private File resourceDir = null; - private File sourceDir = null; + private boolean generateSource; + private boolean generateWsdl; + private boolean extension; + private boolean quiet; + private boolean showTraces; + private boolean loadProvider; + private File resourceDir; + private File sourceDir; public static String PROGRAM_NAME = System.getProperty("program.name", WSProvide.class.getSimpleName()); @@ -79,7 +81,7 @@ private String parseArguments(String[] args) { - String shortOpts = "hwko:r:s:c:qtl"; + String shortOpts = "hwko:r:s:c:qtle"; LongOpt[] longOpts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), @@ -92,6 +94,7 @@ new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), new LongOpt("load-provider", LongOpt.NO_ARGUMENT, null, 'l'), + new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'), }; Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); @@ -127,6 +130,9 @@ case 'l': loadProvider = true; break; + case 'e': + extension = true; + break; case 'h': printHelp(); System.exit(0); @@ -171,6 +177,7 @@ gen.setGenerateWsdl(generateWsdl); gen.setGenerateSource(generateSource); gen.setOutputDirectory(outputDir); + gen.setExtension(extension); if (resourceDir != null) gen.setResourceDirectory(resourceDir); if (sourceDir != null) @@ -235,9 +242,10 @@ out.println(" -o, --output=<directory> The directory to put generated artifacts"); out.println(" -r, --resource=<directory> The directory to put resource artifacts"); out.println(" -s, --source=<directory> The directory to put Java source"); + out.println(" -e, --extension Enable SOAP 1.2 binding extension"); out.println(" -q, --quiet Be somewhat more quiet"); out.println(" -t, --show-traces Show full exception stack traces"); - out.println(" -l, --load-provider Load the provider and exit (debug utility)"); - out.flush(); + out.println(" -l, --load-provider Load the provider and exit (debug utility)"); + out.flush(); } } Modified: spi/branches/jbossws-spi-1.0.0.GA_CP/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java =================================================================== --- spi/branches/jbossws-spi-1.0.0.GA_CP/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java 2011-04-14 21:30:27 UTC (rev 14113) +++ spi/branches/jbossws-spi-1.0.0.GA_CP/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java 2011-04-15 03:20:38 UTC (rev 14114) @@ -40,6 +40,11 @@ LAST_EVENT += "setGenerateWsdl"; } + public void setExtension(boolean extension) + { + LAST_EVENT += "setExtension"; + } + public void setGenerateSource(boolean generateSource) { LAST_EVENT += "setGenerateSource";