changeset 7222:af5c225d743e

RT-37477: [packager] Classpath seaparter internally inconsistant Summary: change MAIN_JAR_CLASSPATH field to simply CLASSPATH
author shemnon
date Mon, 09 Jun 2014 16:12:45 -0600
parents e67939cbeff2
children 27adbe346c85
files modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java modules/fxpackager/src/main/resources/com/oracle/tools/packager/StandardBundlerParam.properties modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxAppBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxDebBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxRpmBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinAppBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinExeBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinMsiBundlerTest.java modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinServiceBundlerTest.java
diffstat 16 files changed, 39 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Mon Jun 09 16:12:45 2014 -0600
@@ -190,10 +190,10 @@
                     }
             );
 
-    public static final StandardBundlerParam<String> MAIN_JAR_CLASSPATH =
+    public static final StandardBundlerParam<String> CLASSPATH =
             new StandardBundlerParam<>(
-                    I18N.getString("param.main-jar-classpath.name"),
-                    I18N.getString("param.main-jar-classpath.description"),
+                    I18N.getString("param.classpath.name"),
+                    I18N.getString("param.classpath.description"),
                     "classpath",
                     String.class,
                     params -> {
@@ -454,7 +454,7 @@
     public static void extractMainClassInfoFromAppResources(Map<String, ? super Object> params) {
         boolean hasMainClass = params.containsKey(MAIN_CLASS.getID());
         boolean hasMainJar = params.containsKey(MAIN_JAR.getID());
-        boolean hasMainJarClassPath = params.containsKey(MAIN_JAR_CLASSPATH.getID());
+        boolean hasMainJarClassPath = params.containsKey(CLASSPATH.getID());
 
         if (hasMainClass && hasMainJar && hasMainJarClassPath) {
             return;
@@ -467,7 +467,7 @@
             files = rfs.getIncludedFiles();
             srcdir = rfs.getBaseDirectory();
         } else if (hasMainJarClassPath) {
-            files = Arrays.asList(MAIN_JAR_CLASSPATH.fetchFrom(params).split("\\s+"));
+            files = Arrays.asList(CLASSPATH.fetchFrom(params).split("\\s+"));
             srcdir = APP_RESOURCES.fetchFrom(params).getBaseDirectory();
         } else {
             RelativeFileSet rfs = APP_RESOURCES.fetchFrom(params);
@@ -530,7 +530,7 @@
                     }
                     if (!hasMainJarClassPath) {
                         String cp = attrs.getValue(Attributes.Name.CLASS_PATH);
-                        params.put(MAIN_JAR_CLASSPATH.getID(), cp == null ? "" : cp);
+                        params.put(CLASSPATH.getID(), cp == null ? "" : cp);
                     }
                     break;
                 }
@@ -543,7 +543,7 @@
     public static void validateMainClassInfoFromAppResources(Map<String, ? super Object> params) throws ConfigException {
         boolean hasMainClass = params.containsKey(MAIN_CLASS.getID());
         boolean hasMainJar = params.containsKey(MAIN_JAR.getID());
-        boolean hasMainJarClassPath = params.containsKey(MAIN_JAR_CLASSPATH.getID());
+        boolean hasMainJarClassPath = params.containsKey(CLASSPATH.getID());
 
         if (hasMainClass && hasMainJar && hasMainJarClassPath) {
             return;
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java	Mon Jun 09 16:12:45 2014 -0600
@@ -253,8 +253,7 @@
             out.println("app.mainclass=" +
                     MAIN_CLASS.fetchFrom(params).replaceAll("\\.", "/"));
         }
-        //This will be emtry string for correctly packaged JavaFX apps
-        out.println("app.classpath=" + MAIN_JAR_CLASSPATH.fetchFrom(params));
+        out.println("app.classpath=" + CLASSPATH.fetchFrom(params));
 
         List<String> jvmargs = JVM_OPTIONS.fetchFrom(params);
         int idx = 1;
@@ -337,7 +336,7 @@
                 LINUX_RUNTIME,
                 MAIN_CLASS,
                 MAIN_JAR,
-                MAIN_JAR_CLASSPATH,
+                CLASSPATH,
                 PREFERENCES_ID,
                 USER_JVM_OPTIONS,
                 VERSION
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Mon Jun 09 16:12:45 2014 -0600
@@ -612,8 +612,7 @@
 //        } else {
         data.put("DEPLOY_LAUNCHER_CLASS", MAIN_CLASS.fetchFrom(params));
 //        }
-        // This will be an empty string for correctly packaged JavaFX apps
-        data.put("DEPLOY_APP_CLASSPATH", MAIN_JAR_CLASSPATH.fetchFrom(params));
+        data.put("DEPLOY_APP_CLASSPATH", CLASSPATH.fetchFrom(params));
 
         //TODO: Add remainder of the classpath
 
@@ -681,7 +680,7 @@
                 MAC_RUNTIME,
                 MAIN_CLASS,
                 MAIN_JAR,
-                MAIN_JAR_CLASSPATH,
+                CLASSPATH,
                 PREFERENCES_ID,
                 USER_JVM_OPTIONS,
                 VERSION
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java	Mon Jun 09 16:12:45 2014 -0600
@@ -343,8 +343,7 @@
             out.println("app.mainclass=" +
                     MAIN_CLASS.fetchFrom(params).replaceAll("\\.", "/"));
         }
-        //This will be emtry string for correctly packaged JavaFX apps
-        out.println("app.classpath=" + MAIN_JAR_CLASSPATH.fetchFrom(params));
+        out.println("app.classpath=" + CLASSPATH.fetchFrom(params));
 
         List<String> jvmargs = JVM_OPTIONS.fetchFrom(params);
         int idx = 1;
@@ -425,7 +424,7 @@
                 JVM_PROPERTIES,
                 MAIN_CLASS,
                 MAIN_JAR,
-                MAIN_JAR_CLASSPATH,
+                CLASSPATH,
                 PREFERENCES_ID,
                 USER_JVM_OPTIONS,
                 VERSION,
--- a/modules/fxpackager/src/main/resources/com/oracle/tools/packager/StandardBundlerParam.properties	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/main/resources/com/oracle/tools/packager/StandardBundlerParam.properties	Mon Jun 09 16:12:45 2014 -0600
@@ -47,8 +47,8 @@
 param.main-class.name=Main Class
 param.main-class.description=The main class for the application.  Either a javafx.application.Application instance or a java class with a main method.
 
-param.main-jar-classpath.name=Main Jar Classpath
-param.main-jar-classpath.description=The classpath from the main jar of the application, relative to the assembled application directory.
+param.classpath.name=Main Jar Classpath
+param.classpath.description=The classpath from the main jar of the application, relative to the assembled application directory.
 
 param.main-jar.name=Main Jar
 param.main-jar.description=The main jar of the application.  This jar should have the main-class, and is relative to the assembled application dir.
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxAppBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxAppBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -138,7 +138,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(VERBOSE.getID(), true);
 
@@ -222,7 +222,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxDebBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxDebBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -142,7 +142,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(LICENSE_FILE.getID(), Arrays.asList("LICENSE", "LICENSE2"));
         bundleParams.put(LICENSE_TYPE.getID(), "GPL2 + Classpath Exception");
@@ -211,7 +211,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
@@ -282,7 +282,7 @@
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(MAIN_CLASS.getID(), "hello.HelloService");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
 
         bundleParams.put(DESCRIPTION.getID(), "Does a random heart beat every 30 seconds or so to a log file in tmp");
         bundleParams.put(LICENSE_FILE.getID(), "LICENSE");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxRpmBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxRpmBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -143,7 +143,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(LICENSE_FILE.getID(), Arrays.asList("LICENSE", "LICENSE2"));
         bundleParams.put(LICENSE_TYPE.getID(), "GPL2 + Classpath Exception");
@@ -213,7 +213,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
@@ -281,7 +281,7 @@
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(MAIN_CLASS.getID(), "hello.HelloService");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
 
         bundleParams.put(DESCRIPTION.getID(), "Does a random heart beat every 30 seconds or so to a log file in tmp");
         bundleParams.put(LICENSE_FILE.getID(), "LICENSE");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -145,7 +145,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(VERBOSE.getID(), true);
         bundleParams.put(DEVELOPER_ID_APP_SIGNING_KEY.getID(), null); // force no signing
@@ -264,7 +264,7 @@
         bundleParams.put(MAC_RUNTIME.getID(), System.getProperty("java.home"));
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -171,7 +171,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(IDENTIFIER.getID(), "com.example.javapacakger.hello.TestPackager");
         bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
@@ -205,7 +205,7 @@
         bundleParams.put(MAC_RUNTIME.getID(), System.getProperty("java.home"));
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -148,7 +148,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(LICENSE_FILE.getID(), Arrays.asList("LICENSE", "LICENSE2"));
         bundleParams.put(VERBOSE.getID(), true);
@@ -223,7 +223,7 @@
         bundleParams.put(MAC_RUNTIME.getID(), System.getProperty("java.home"));
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -149,7 +149,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(VERBOSE.getID(), true);
         bundleParams.put(LICENSE_FILE.getID(), Arrays.asList("LICENSE", "LICENSE2"));
         bundleParams.put(DEVELOPER_ID_APP_SIGNING_KEY.getID(), null); // force no signing
@@ -260,7 +260,7 @@
         bundleParams.put(MAC_RUNTIME.getID(), System.getProperty("java.home"));
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinAppBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinAppBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -140,7 +140,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(VERBOSE.getID(), true);
         bundleParams.put(ICON.getID(), "java-logo2.gif"); // force no signing
@@ -226,7 +226,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinExeBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinExeBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -145,7 +145,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(LICENSE_FILE.getID(), Arrays.asList("LICENSE", "LICENSE2"));
         bundleParams.put(COPYRIGHT.getID(), "Copyright(c) 2014 the testers \"who like to break stuff\"");
@@ -281,7 +281,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
         bundleParams.put(VERSION.getID(), "1.2.3.4");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinMsiBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinMsiBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -144,7 +144,7 @@
                 new RelativeFileSet(fakeMainJar.getParentFile(),
                         new HashSet<>(Arrays.asList(fakeMainJar)))
         );
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), fakeMainJar.toString());
+        bundleParams.put(CLASSPATH.getID(), fakeMainJar.toString());
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(VERBOSE.getID(), true);
 
@@ -292,7 +292,7 @@
         bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
         bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
         bundleParams.put(PREFERENCES_ID.getID(), "everything.preferences.id");
         bundleParams.put(PRODUCT_VERSION.getID(), "1.2.3");
         bundleParams.put(USER_JVM_OPTIONS.getID(), "-Xmx=256M\n");
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinServiceBundlerTest.java	Mon Jun 09 15:49:23 2014 -0600
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinServiceBundlerTest.java	Mon Jun 09 16:12:45 2014 -0600
@@ -167,7 +167,7 @@
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(MAIN_CLASS.getID(), "hello.HelloService");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
 
         bundleParams.put(DESCRIPTION.getID(), "Does a random heart beat every 30 seconds or so to a log file in tmp");
         bundleParams.put(LICENSE_FILE.getID(), "LICENSE");
@@ -208,7 +208,7 @@
         bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
         bundleParams.put(MAIN_CLASS.getID(), "hello.HelloService");
         bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
-        bundleParams.put(MAIN_JAR_CLASSPATH.getID(), "mainApp.jar");
+        bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
 
         bundleParams.put(DESCRIPTION.getID(), "Does a random heart beat every 30 seconds or so to a log file in tmp");
         bundleParams.put(LICENSE_FILE.getID(), "LICENSE");