modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/Main.java

*** 50,60 ****
  
      private static final String version = bundle.getString("MSG_Version")
              + " " + PackagerLib.JAVAFX_VERSION + "\n";
      private static final String help = bundle.getString("MSG_Help_1")
                                          + bundle.getString("MSG_Help_2")
!                                         + bundle.getString("MSG_Help_3")
                                          + bundle.getString("MSG_Help_4")
                                          + bundle.getString("MSG_Help_5")
                                          + bundle.getString("MSG_Help_6")
                                          + bundle.getString("MSG_Help_7");
  
--- 50,60 ----
  
      private static final String version = bundle.getString("MSG_Version")
              + " " + PackagerLib.JAVAFX_VERSION + "\n";
      private static final String help = bundle.getString("MSG_Help_1")
                                          + bundle.getString("MSG_Help_2")
!                                         + MessageFormat.format(bundle.getString("MSG_Help_3"), File.pathSeparator)
                                          + bundle.getString("MSG_Help_4")
                                          + bundle.getString("MSG_Help_5")
                                          + bundle.getString("MSG_Help_6")
                                          + bundle.getString("MSG_Help_7");
  
*** 65,76 ****
      private static boolean verbose = false;
      private static boolean packageAsJar = false;
      private static boolean genJNLP = false;
      private static boolean genPackages = false;
      private static boolean css2Bin = false;
-     private static boolean signJar = false;
-     private static boolean makeAll = false;
  
      private static void addResources(CommonParams commonParams,
                                       String srcdir, String srcfiles) {
          if (srcdir == null || "".equals(srcdir)) {
              return;
--- 65,74 ----
*** 406,468 ****
                          }
                      }
  
                      addResources(createBssParams, srcdir, srcfiles);
                      css2Bin = true;
-                 } else if (args[0].equalsIgnoreCase("-signJar")) {
-                     Log.info("Warning: -signJar has been deprecated and will be removed in a future release.");
-                     for (int i = 1; i < args.length; i++) {
-                         String arg = args[i];
-                         if (arg.equalsIgnoreCase("-keyStore")) {
-                             signJarParams.setKeyStore(new File(nextArg(args, i++)));
-                         } else if(arg.equalsIgnoreCase("-alias")) {
-                             signJarParams.setAlias(nextArg(args, i++));
-                         } else if(arg.equalsIgnoreCase("-storePass")) {
-                             signJarParams.setStorePass(nextArg(args, i++));
-                         } else if(arg.equalsIgnoreCase("-keyPass")) {
-                             signJarParams.setKeyPass(nextArg(args, i++));
-                         } else if(arg.equalsIgnoreCase("-storeType")) {
-                             signJarParams.setStoreType(nextArg(args, i++));
-                         } else if(arg.equalsIgnoreCase("-verbose") || arg.equalsIgnoreCase("-v")) {
-                             signJarParams.setVerbose(true);
-                             verbose = true;
-                         } else if (arg.equalsIgnoreCase("-outdir")) {
-                             signJarParams.setOutdir(new File(nextArg(args, i++)));
-                         } else if (arg.equalsIgnoreCase("-srcdir")) {
-                             srcdir = nextArg(args, i++);
-                         } else if (arg.equalsIgnoreCase("-srcfiles")) {
-                             srcfiles = nextArg(args, i++);
-                         } else {
-                             throw new PackagerException("ERR_UnknownArgument", arg);
-                         }
-                     }
- 
-                     addResources(signJarParams, srcdir, srcfiles);
-                     signJar = true;
-                 } else if (args[0].equalsIgnoreCase("-makeall")) {
-                     System.err.println("-makeall is deprecated");
-                     for (int i = 1; i < args.length; i++) {
-                         String arg = args[i];
-                         if (arg.equalsIgnoreCase("-appclass")) {
-                             makeAllParams.setAppClass(nextArg(args, i++));
-                         } else if (arg.equalsIgnoreCase("-preloader")) {
-                             makeAllParams.setPreloader(nextArg(args, i++));
-                         } else if (arg.equalsIgnoreCase("-classpath")) {
-                             makeAllParams.setClasspath(nextArg(args, i++));
-                         } else if (arg.equalsIgnoreCase("-name")) {
-                             makeAllParams.setAppName(nextArg(args, i++));
-                         } else if(arg.equalsIgnoreCase("-width")) {
-                             makeAllParams.setWidth(Integer.parseInt(nextArg(args, i++)));
-                         } else if(arg.equalsIgnoreCase("-height")) {
-                             makeAllParams.setHeight(Integer.parseInt(nextArg(args, i++)));
-                         } else if(arg.equalsIgnoreCase("-v")) {
-                             makeAllParams.setVerbose(true);
-                         } else {
-                             throw new PackagerException("ERR_UnknownArgument", arg);
-                         }
-                     }
-                     makeAll = true;
                  } else if (args[0].equalsIgnoreCase("-help")) {
                      showBundlerHelp(args[1], args.length > 2 && "-verbose".equals(args[2]));
                  } else {
                      System.err.println(MessageFormat.format(
                                          bundle.getString("ERR_UnknownCommand"),
--- 404,413 ----
*** 493,527 ****
                  if (genPackages) {
                      deployParams.setBundleType(bundleType);
                      deployParams.validate();
                      packager.generateDeploymentPackages(deployParams);
                  }
-                 if (signJar) {
-                     signJarParams.validate();
-                     if (signJarParams.storePass == null) {
-                         char[] passwd = System.console().readPassword(bundle.getString("MSG_EnterKeystorePassword"));
-                         if (passwd == null) {
-                             signJarParams.storePass = "";
-                         } else {
-                             signJarParams.storePass = new String(passwd);
-                         }
-                     }
-                     if (signJarParams.keyPass == null) {
-                         char[] passwd = System.console().readPassword(bundle.getString("MSG_EnterKeyPassword"), signJarParams.alias);
-                         if (passwd == null) {
-                             signJarParams.keyPass = "";
-                         } else {
-                             signJarParams.keyPass = new String(passwd);
-                         }
-                     }
-                     packager.signJar(signJarParams);
-                 }
-                 if (makeAll) {
-                     makeAllParams.validate();
-                     packager.makeAll(makeAllParams);
-                 }
- 
              } catch (Exception e) {
                  if (verbose) {
                      throw e;
                  } else {
                      System.err.println(e.getMessage());
--- 438,447 ----