Force clean in SLC command line

[gpl/argeo-slc.git] / runtime / org.argeo.slc.launcher / src / main / java / org / argeo / slc / cli / SlcMain.java

diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
index 3890feefc674b814196a316b9d981fae645934a9..7bda5c84f7c7f6141deb44460c18f2d06a2908a1 100644 (file)
--- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
+++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java
@@ -35,7 +35,6 @@ import javax.security.auth.login.LoginContext;
 
 import org.argeo.osgi.boot.OsgiBoot;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
@@ -100,8 +99,10 @@ public class SlcMain implements PrivilegedAction<String> {
                        configuration.put("osgi.configuration.area",
                                        confDir.getCanonicalPath());
                        configuration.put("osgi.instance.area", dataDir.getCanonicalPath());
+                       // FIXME must clean configuration area because jars are installed as
+                       // file: by OSGi boot and not as reference:file:
+                       configuration.put("osgi.clean", "true");
                        if (args.length == 0) {
-                               // configuration.put("osgi.clean", "true");
                                configuration.put("osgi.console", "");
                        }
 
@@ -245,6 +246,7 @@ public class SlcMain implements PrivilegedAction<String> {
         */
        protected static File findSlcDir(File currentDir) {
                File slcDir = new File(currentDir, slcDirName);
+               // covers the use case of running from the home directory
                if (slcDir.exists() && slcDir.isDirectory())
                        return slcDir;
                File parentDir = currentDir.getParentFile();