[JBWS-4392]:Remove the target option for wsconsume tool

jbossws · Oct 13, 2023 · e539eda · e539eda
1 parent d1b1760
commit e539eda
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java b/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java
@@ -50,7 +50,6 @@
  *   <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. Allowed values are 2.1 and 2.2</td><td></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>
  * </table>
@@ -93,7 +92,6 @@ public class WSConsumeTask extends Task
    private boolean debug;
    private boolean nocompile;
    private boolean additionalHeaders;
-   private String target;
 
    // Not actually used right now
    public void setDebug(boolean debug)
@@ -151,11 +149,6 @@ public void setSourcedestdir(File sourcedestdir)
       this.sourcedestdir = sourcedestdir;
    }
 
-   public void setTarget(String target)
-   {
-      this.target = target;
-   }
-
    public void setPackage(String targetPackage)
    {
       this.targetPackage = targetPackage;
@@ -234,8 +227,6 @@ public void executeNonForked()
          }
          if (bindingFiles != null && bindingFiles.size() > 0)
             consumer.setBindingFiles(bindingFiles);
-         if (target != null)
-            consumer.setTarget(target);
 
          log("Consuming wsdl: " + wsdl, Project.MSG_INFO);
 
@@ -364,12 +355,6 @@ private void executeForked() throws BuildException
          command.createArgument().setFile(sourcedestdir);
       }
 
-      if (target != null)
-      {
-         command.createArgument().setValue("-t");
-         command.createArgument().setValue(target);
-      }
-
       if (verbose)
          command.createArgument().setValue("-v");
 

diff --git a/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java b/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
@@ -47,7 +47,6 @@
  *  <tr><td>-w, --wsdlLocation=&lt;loc&gt;  </td><td>Value to use for @@WebService.wsdlLocation</td></tr>
  *  <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>
- *  <tr><td>-t, --target=&lt;2.1|2.2&gt;    </td><td>The target specification target</td></tr>
  *  <tr><td>-n, --nocompile                 </td><td>Do not compile generated sources</td></tr> 
  *  <tr><td>-q, --quiet                     </td><td>Be somewhat more quiet</td></tr>
  *  <tr><td>-v, --verbose                   </td><td>Show full exception stack traces</td></tr>
@@ -77,7 +76,6 @@ public class WSConsume
    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());
 
@@ -104,7 +102,7 @@ private static void mainInternal(final String[] args)
 
    private URL parseArguments(String[] args)
    {
-      String shortOpts = "b:c:p:w:d:o:s:t:j:khqvlnea";
+      String shortOpts = "b:c:p:w:d:o:s:j:khqvlnea";
       LongOpt[] longOpts =
       {
          new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
@@ -113,7 +111,6 @@ private URL parseArguments(String[] args)
          new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'),
          new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'),
          new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'),
-         new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'),
          new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'),
          new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
          new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'),
@@ -158,9 +155,6 @@ private URL parseArguments(String[] args)
                break;
             case 'j':
                clientJar = new File(getopt.getOptarg());
-               break;   
-            case 't':
-               target = getopt.getOptarg();
                break;
             case 'q':
                quiet = true;
@@ -270,9 +264,6 @@ private int importServices(URL wsdl)
 
       if (bindingFiles != null && bindingFiles.size() > 0)
          consumer.setBindingFiles(bindingFiles);
-
-      if(target!=null)
-         consumer.setTarget(target);
 
       if (noCompile)
          consumer.setNoCompile(noCompile);
@@ -316,7 +307,6 @@ private static void printHelp()
       out.println("    -w  --wsdlLocation=<loc>    Value to use for @WebService.wsdlLocation");
       out.println("    -o, --output=<directory>    The directory to put generated artifacts");
       out.println("    -s, --source=<directory>    The directory to put Java source");
-      out.println("    -t, --target=<2.1|2.2>      The JAX-WS specification target");
       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)");