X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBuilder.java;h=6eed6db533ab659e71861ae601bbbf672fc45b66;hb=722dc6b20b15014e3d963bd09617ddfd9b63a89f;hp=cd2c80acb556792558ba6f316362932e3898b08b;hpb=14d78f16b17e152d0f34021fc4771606b12f1604;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java
index cd2c80acb..6eed6db53 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java
@@ -12,6 +12,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
 
+import org.argeo.api.init.InitConstants;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -38,8 +39,8 @@ public class OsgiBuilder {
 
 	public OsgiBuilder() {
 		// configuration.put("osgi.clean", "true");
-		configuration.put(OsgiBoot.PROP_OSGI_CONFIGURATION_AREA, System.getProperty(OsgiBoot.PROP_OSGI_CONFIGURATION_AREA));
-		configuration.put(OsgiBoot.PROP_OSGI_INSTANCE_AREA, System.getProperty(OsgiBoot.PROP_OSGI_INSTANCE_AREA));
+		configuration.put(InitConstants.PROP_OSGI_CONFIGURATION_AREA, System.getProperty(InitConstants.PROP_OSGI_CONFIGURATION_AREA));
+		configuration.put(InitConstants.PROP_OSGI_INSTANCE_AREA, System.getProperty(InitConstants.PROP_OSGI_INSTANCE_AREA));
 		configuration.put(PROP_OSGI_CLEAN, System.getProperty(PROP_OSGI_CLEAN));
 	}
 
@@ -48,7 +49,7 @@ public class OsgiBuilder {
 		framework = OsgiBootUtils.launch(configuration);
 
 		BundleContext bc = framework.getBundleContext();
-		String osgiData = bc.getProperty(OsgiBoot.PROP_OSGI_INSTANCE_AREA);
+		String osgiData = bc.getProperty(InitConstants.PROP_OSGI_INSTANCE_AREA);
 		// String osgiConf = bc.getProperty(OsgiBoot.CONFIGURATION_AREA_PROP);
 		String osgiConf = framework.getDataFile("").getAbsolutePath();
 		if (OsgiBootUtils.isDebug())
@@ -278,7 +279,7 @@ public class OsgiBuilder {
 	private Properties startLevelsToProperties() {
 		Properties properties = new Properties();
 		for (Integer startLevel : startLevels.keySet()) {
-			String property = OsgiBoot.PROP_ARGEO_OSGI_START + "." + startLevel;
+			String property = InitConstants.PROP_ARGEO_OSGI_START + "." + startLevel;
 			StringBuilder value = new StringBuilder();
 			for (String bundle : startLevels.get(startLevel).getBundles()) {
 				value.append(bundle);