[jbossws-commits] JBossWS SVN: r17482 - in common-tools/trunk: src/main/java/org/jboss/ws/tools/ant and 2 other directories.

Author: jim.ma Date: 2013-04-09 00:51:41 -0400 (Tue, 09 Apr 2013) New Revision: 17482 Modified: common-tools/trunk/pom.xml common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java Log: [JBWS-3138]:add clientjar flag Modified: common-tools/trunk/pom.xml =================================================================== --- common-tools/trunk/pom.xml 2013-04-09 04:50:51 UTC (rev 17481) +++ common-tools/trunk/pom.xml 2013-04-09 04:51:41 UTC (rev 17482) @@ -24,8 +24,8 @@ </scm> <properties> - <jbossws.api.version>1.0.1.Final</jbossws.api.version> - <jbossws.spi.version>2.1.0.Final</jbossws.spi.version> + <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version> + <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version> <ant.version>1.7.1</ant.version> <getopt.version>1.0.13</getopt.version> <junit.version>3.8.2</junit.version> Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java =================================================================== --- common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2013-04-09 04:50:51 UTC (rev 17481) +++ common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2013-04-09 04:51:41 UTC (rev 17482) @@ -48,6 +48,7 @@ * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> + * <tr><td>clientjar</td><td>Gnerate the client jar of generated artifacts for calling a webservice</td><td>none</td></tr> * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;td&gt;generated&lt;/td&gt;&lt;/tr&gt; @@ -86,6 +87,7 @@ private File sourcedestdir; private List<File> bindingFiles = new ArrayList<File>(); private File catalog; + private File clientjar; private String wsdlLocation; private String targetPackage; private boolean keep; @@ -117,6 +119,11 @@ { this.catalog = catalog; } + + public void setClientJar(File clientJar) + { + this.clientjar = clientJar; + } public void setDestdir(File destdir) { @@ -209,6 +216,8 @@ consumer.setTargetPackage(targetPackage); if (wsdlLocation != null) consumer.setWsdlLocation(wsdlLocation); + if (clientjar != null) + consumer.setClientJar(clientjar); if (catalog != null) { if (catalog.exists() && catalog.isFile()) @@ -315,6 +324,12 @@ command.createArgument().setValue("-c"); command.createArgument().setFile(catalog); } + + if (clientjar != null) + { + command.createArgument().setValue("-j"); + command.createArgument().setFile(clientjar); + } if (targetPackage != null) { Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java =================================================================== --- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2013-04-09 04:50:51 UTC (rev 17481) +++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2013-04-09 04:51:41 UTC (rev 17482) @@ -49,6 +49,7 @@ * <tr><td>-k, --keep </td><td>Keep/Generate Java source</td></tr> * <tr><td>-c, --catalog=&lt;file&gt; </td><td>Oasis XML Catalog file for entity resolution</td></tr> * <tr><td>-p, --package=&lt;name&gt; </td><td>The target package for generated source</td></tr> + * <tr><td>-j, --clientjar=&lt;name&gt; </td><td>Create a jar file of the generated artifacts for calling the webservice</td></tr> * <tr><td>-w, --wsdlLocation=&lt;loc&gt; </td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;/tr&gt; * <tr><td>-o, --output=&lt;directory&gt; </td><td>The directory to put generated artifacts</td></tr> * <tr><td>-s, --source=&lt;directory&gt; </td><td>The directory to put Java source</td></tr> @@ -79,6 +80,7 @@ private boolean additionalHeaders; private boolean noCompile; private File sourceDir; + private File clientJar; private String target; public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSConsume.class.getName()); @@ -106,7 +108,7 @@ private URL parseArguments(String[] args) { - String shortOpts = "b:c:p:w:o:s:t:khqvlnea"; + String shortOpts = "b:c:p:w:o:s:t:j:khqvlnea"; LongOpt[] longOpts = { new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), @@ -124,6 +126,7 @@ new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'), new LongOpt("additionalHeaders", LongOpt.NO_ARGUMENT, null, 'a'), new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), + new LongOpt("clientjar", LongOpt.REQUIRED_ARGUMENT, null, 'j'), }; Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); @@ -153,6 +156,9 @@ case 's': sourceDir = new File(getopt.getOptarg()); break; + case 'j': + clientJar = new File(getopt.getOptarg()); + break; case 't': target = getopt.getOptarg(); break; @@ -231,6 +237,9 @@ consumer.setAdditionalHeaders(additionalHeaders); if (sourceDir != null) consumer.setSourceDirectory(sourceDir); + if (clientJar != null) { + consumer.setClientJar(clientJar); + } boolean cleanPS = false; PrintStream ps = System.out; @@ -313,6 +322,7 @@ out.println(" -b, --binding=<file> One or more JAX-WS or JAXB binding files "); out.println(" -k, --keep Keep/Generate Java source"); out.println(" -c --catalog=<file> Oasis XML Catalog file for entity resolution"); + out.println(" -j --clientjar=<name> Create a jar file of the generated artifacts for calling the webservice"); out.println(" -p --package=<name> The target package for generated source"); out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); out.println(" -o, --output=<directory> The directory to put generated artifacts"); Modified: common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java =================================================================== --- common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java 2013-04-09 04:50:51 UTC (rev 17481) +++ common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java 2013-04-09 04:51:41 UTC (rev 17482) @@ -118,4 +118,12 @@ { LAST_EVENT += "setNoCompile"; } + + @Override + public void setClientJar(File clientJar) + { + + LAST_EVENT += "setClientJar"; + + } }