WebSVN - OpenConcerto - Diff - Rev 177 and 180 - /trunk/OpenConcerto/src/org/openconcerto/utils/prog/VMLauncher.java

  package org.openconcerto.utils.prog;
 import org.openconcerto.utils.FileUtils;
 import org.openconcerto.utils.OSFamily;
+import org.openconcerto.utils.OSFamily.Unix;
 import org.openconcerto.utils.ProcessStreams;
 import org.openconcerto.utils.PropertiesUtils;
 import java.io.File;
 import java.io.IOException;
  * @author Sylvain
  * @see #launch(String, List)
  */
 public abstract class VMLauncher {
+    private static final String PROPERTIES_EXT = ".properties";
     /**
      * Boolean system property, if set to <code>true</code> then {@link #restart(Class, List)} will
      * simply return <code>null</code>. Useful e.g. when using IDE launch configuration (to debug).
      */
     static public final String NO_RESTART = "vm.noRestart";
+    // Explicitly passed to jpackage
+    static public final String APPDIR_SYSPROP = "jpackage.app.dir";
+    // Automatically set by the jpackage launcher (could be set explicitly using --java-options
+    // '-Djpackage.app-path=$APPDIR/../../bin/launcher' if jpackage ever changes that)
+    static public final String APP_EXE_SYSPROP = "jpackage.app-path";
+    // The path to the app directory with the jar
+    public static final File getJPackageAppDir() {
+        final String appPath = System.getProperty(APPDIR_SYSPROP, "");
+        return appPath.isEmpty() ? null : new File(appPath);
+    }
+    // The path to the executable
+    private static final String getJPackageAppPath() {
+        final String appPath = System.getProperty(APP_EXE_SYSPROP, "");
+        return appPath.isEmpty() ? null : appPath;
+    }
+    private static final void addJPackageSystemPropertyArgument(final List<String> args, final String propName) {
+        final String arg = getJPackageSystemPropertyArg(propName);
+        if (arg != null)
+            args.add(arg);
+    }
+    private static final String getJPackageSystemPropertyArg(final String propName) {
+        final String val = System.getProperty(propName);
+        if (val == null)
+            return null;
+        return "-D" + propName + "=" + val;
+    }
     private static NativeLauncherFinder getNativeAppLauncher() {
         final OSFamily os = OSFamily.getInstance();
         final NativeLauncherFinder l;
         if (os.equals(OSFamily.Windows)) {
             l = new WinLauncherFinder();
         } else if (os.equals(OSFamily.Mac)) {
             l = new MacLauncherFinder();
+        } else if (os instanceof Unix) {
+            l = new UnixLauncherFinder();
         } else {
             l = UnknownLauncherFinder;
+        }
         return l;
+    }
         /**
          * The command to launch this application with the passed arguments.
+         *
          * @param args the program arguments.
          * @return the command.
+         * @throws UnsupportedOperationException if {@link #getAppPath()} returns <code>null</code>.
          */
+        public final List<String> getCommand(final List<String> args) throws UnsupportedOperationException {
+            final String appPath = this.getAppPath();
+            if (appPath == null)
+                throw new UnsupportedOperationException();
+            return getCommand(appPath, args);
+        }
-        public abstract List<String> getCommand(final List<String> args);
+        protected List<String> getCommand(final String appPath, final List<String> args) {
+            final List<String> command = new ArrayList<String>(4 + args.size());
+            command.add(appPath);
+            command.addAll(args);
+            return command;
+        }
+    }
     private static class MacLauncherFinder extends NativeLauncherFinder {
         private static final String APP_EXT = ".app";
+        // jpackage uses "Contents/app"
-        private static final Pattern MAC_PATTERN = Pattern.compile(Pattern.quote(APP_EXT) + "/Contents/Resources(/Java)?/[^/]+\\.jar$");
+        private static final Pattern MAC_PATTERN = Pattern.compile(Pattern.quote(APP_EXT) + "/Contents/(Resources(/Java)?|app)/[^/]+\\.jar$");
         @Override
         public String getAppPath() {
             final Matcher matcher = MAC_PATTERN.matcher(this.getFirstItem());
             if (matcher.matches()) {
                 final String appPath = getFirstItem().substring(0, matcher.start() + APP_EXT.length());
                 final File contentsDir = new File(appPath, "Contents");
-                final List<String> bundleContent = Arrays.asList(contentsDir.list());
-                if (bundleContent.contains("Info.plist") && bundleContent.contains("PkgInfo") && new File(contentsDir, "MacOS").isDirectory())
+                if (new File(contentsDir, "Info.plist").isFile() && new File(contentsDir, "MacOS").isDirectory())
                     return appPath;
+            }
             return null;
+        }
         @Override
-        public List<String> getCommand(List<String> args) {
+        protected List<String> getCommand(String appPath, List<String> args) {
             final List<String> command = new ArrayList<String>(4 + args.size());
             command.add("open");
             // since we restarting we need to launch a new instance of us
             command.add("-n");
-            command.add(getAppPath());
+            command.add(appPath);
             command.add("--args");
             command.addAll(args);
             return command;
+        }
+    }
             if (this.getFirstItem().endsWith(".exe"))
                 return getFirstItem();
             else
                 return null;
+        }
+    }
+    private static class UnixLauncherFinder extends NativeLauncherFinder {
+        private final String jpackageApp;
+        public UnixLauncherFinder() {
+            this.jpackageApp = getJPackageAppPath();
+        }
         @Override
-        public List<String> getCommand(List<String> args) {
-            final List<String> command = new ArrayList<String>(4 + args.size());
-            command.add(getAppPath());
+        public String getAppPath() {
-            command.addAll(args);
-            return command;
+            return this.jpackageApp;
+        }
+    }
     private static final NativeLauncherFinder UnknownLauncherFinder = new NativeLauncherFinder() {
         @Override
         public String getAppPath() {
             return null;
+        }
-        @Override
-        public List<String> getCommand(List<String> args) {
-            throw new UnsupportedOperationException();
-        }
     };
     public static final Process restart(final Class<?> mainClass, final String... args) throws IOException {
         return restart(mainClass, Arrays.asList(args));
+    }
     public static final String ENV_VMARGS = "JAVA_VMARGS";
     public static final String PROPS_VMARGS = "VMARGS";
     public static final String ENV_PROGARGS = "JAVA_PROGARGS";
+    // Don't split on spaces to avoid dealing with quotes or escapes : vmArgs=-Dfoo bar\t-DotherProp
-    // handle DOS, Mac and Unix newlines
+    // Handle DOS, Mac and Unix newlines (and tabs).
     private static final Pattern NL = Pattern.compile("\\p{Cntrl}+");
     private File wd;
     public VMLauncher() {
         this.wd = null;
+    }
     public final File getLauncherWD() {
         if (this.wd == null) {
+            final File appDir = getJPackageAppDir();
+            if (appDir == null) {
-            final NativeLauncherFinder nativeAppLauncher = getNativeAppLauncher();
+                final NativeLauncherFinder nativeAppLauncher = getNativeAppLauncher();
-            final String appPath = nativeAppLauncher.getAppPath();
+                final String appPath = nativeAppLauncher.getAppPath();
-            if (appPath != null)
+                if (appPath != null)
-                this.wd = new File(appPath).getAbsoluteFile().getParentFile();
+                    this.wd = new File(appPath).getAbsoluteFile().getParentFile();
-            // when launched with -jar there's only one item
+                // when launched with -jar there's only one item
-            else if (nativeAppLauncher.getFirstItem().equals(nativeAppLauncher.getClassPath()) && new File(nativeAppLauncher.getFirstItem()).isFile())
+                else if (nativeAppLauncher.getFirstItem().equals(nativeAppLauncher.getClassPath()) && new File(nativeAppLauncher.getFirstItem()).isFile())
-                this.wd = new File(nativeAppLauncher.getFirstItem()).getParentFile();
+                    this.wd = new File(nativeAppLauncher.getFirstItem()).getParentFile();
-            // support launch in an IDE
+                // support launch in an IDE
-            else
+                else
-                this.wd = FileUtils.getWD();
+                    this.wd = FileUtils.getWD();
+            } else {
+                this.wd = appDir;
+            }
+        }
         return this.wd;
+    }
     private final List<String> split(String res) {
      */
     public final Process launch(final String mainClass, final List<String> progParams) throws IOException {
         final boolean debug = Boolean.getBoolean("launcher.debug");
         final String javaBinary = getJavaBinary();
         final File sameJava = new File(System.getProperty("java.home"), "bin/" + javaBinary);
+        // allow to know what binary (and thus java.home) was tested
+        if (debug)
+            System.err.println("sameJava : " + sameJava);
         final String java = sameJava.canExecute() ? sameJava.getAbsolutePath() : javaBinary;
         final File propFile = this.getPropFile(mainClass);
         final Properties props = this.getProps(propFile);
         if (debug)
             System.err.println("propFile : " + propFile);
         if (this.enableRemoteDebug(props)) {
             command.add(RemoteDebugArgs.getArgs(props.getProperty("remoteDebugAddr")));
+        }
         command.addAll(this.getVMArguments());
-        // for java the last specified property wins
+        // For java the last specified property wins. MAYBE concat properties whose names start with
+        // PROPS_VMARGS, that way we could override just one of many e.g. VMARGS.garbageCollector.
         if (propFile != null) {
             final List<String> appProps = this.getProp(props, PROPS_VMARGS);
             command.addAll(appProps);
-            final File userFile = new File(System.getProperty("user.home"), ".java/ilm/" + propFile.getName());
-            final List<String> userProps = this.getProp(userFile, PROPS_VMARGS);
-            command.addAll(userProps);
             if (debug) {
-                System.err.println("appProps : " + appProps);
+                System.err.println("VM arguments from " + propFile + " : " + appProps);
+            }
+            // Don't use Properties(defaults) constructor since we want to combine values.
+            final File localFile = FileUtils.prependSuffix(propFile, "-local", PROPERTIES_EXT);
+            final File userFile = new File(System.getProperty("user.home"), ".java/ilm/" + propFile.getName());
+            for (final File f : Arrays.asList(localFile, userFile)) {
+                final List<String> moreProps = this.getProp(f, PROPS_VMARGS);
+                command.addAll(moreProps);
+                if (debug) {
-                System.err.println("userProps ( from " + userFile + ") : " + userProps);
+                    System.err.println("VM arguments from " + f + " : " + moreProps);
+                }
+            }
+        }
         final String envVMArgs = System.getenv(ENV_VMARGS);
         if (envVMArgs != null)
             command.addAll(split(envVMArgs));
+        // launched app may also need this context
+        addJPackageSystemPropertyArgument(command, APPDIR_SYSPROP);
+        addJPackageSystemPropertyArgument(command, APP_EXE_SYSPROP);
         command.add("-cp");
         command.add(getClassPath());
         command.add(mainClass);
         final String envProgArgs = System.getenv(ENV_PROGARGS);
         return this.getLauncherWD();
+    }
     protected File getPropFile(final String mainClass) {
         final String className = mainClass.substring(mainClass.lastIndexOf('.') + 1);
-        return new File(getWD(), className + ".properties");
+        return new File(getWD(), className + PROPERTIES_EXT);
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/prog/VMLauncher.java - Rev 177 → 180