changeset 7221:e67939cbeff2

RT-37477: [packager] Classpath seaparter internally inconsistant Summary: make space separated jars the norm.
author shemnon
date Mon, 09 Jun 2014 15:49:23 -0600
parents 9b0627dd3de8
children af5c225d743e
files modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Mon Jun 09 15:12:36 2014 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Mon Jun 09 15:49:23 2014 -0600
@@ -201,7 +201,7 @@
                         String cp = (String) params.get("classpath");
                         return cp == null ? "" : cp;
                     },
-                    (s, p) -> s
+                    (s, p) -> s.replace(File.pathSeparator, " ")
             );
 
     public static final StandardBundlerParam<Boolean> USE_FX_PACKAGING =
@@ -467,7 +467,7 @@
             files = rfs.getIncludedFiles();
             srcdir = rfs.getBaseDirectory();
         } else if (hasMainJarClassPath) {
-            files = Arrays.asList(MAIN_JAR_CLASSPATH.fetchFrom(params).split(File.pathSeparator));
+            files = Arrays.asList(MAIN_JAR_CLASSPATH.fetchFrom(params).split("\\s+"));
             srcdir = APP_RESOURCES.fetchFrom(params).getBaseDirectory();
         } else {
             RelativeFileSet rfs = APP_RESOURCES.fetchFrom(params);
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Mon Jun 09 15:12:36 2014 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Mon Jun 09 15:49:23 2014 -0600
@@ -613,7 +613,7 @@
         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).replace(":", " "));
+        data.put("DEPLOY_APP_CLASSPATH", MAIN_JAR_CLASSPATH.fetchFrom(params));
 
         //TODO: Add remainder of the classpath