X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=bf8e8d38e462a58a6821e5a41c4bed69b53a092a;hb=5b3108fe285bca50565b58b63fa4feddc96c0765;hp=1d81409115b9bcba31ae862117c18c2a728df571;hpb=e61a7a2dbff5e17fbf1c6c8bbd7fa687935d2897;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
index 1d8140911..bf8e8d38e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
@@ -24,9 +24,9 @@ import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
+import org.argeo.api.DataModelNamespace;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
-import org.argeo.node.DataModelNamespace;
-import org.argeo.node.NodeConstants;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -91,18 +91,6 @@ class KernelUtils implements KernelConstants {
 		return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
 	}
 
-	// static String getOsgiInstancePath(String relativePath) {
-	// try {
-	// if (relativePath == null)
-	// return getOsgiInstanceDir().getCanonicalPath();
-	// else
-	// return new File(getOsgiInstanceDir(), relativePath).getCanonicalPath();
-	// } catch (IOException e) {
-	// throw new CmsException("Cannot get instance path for " + relativePath,
-	// e);
-	// }
-	// }
-
 	static File getOsgiConfigurationFile(String relativePath) {
 		try {
 			return new File(new URI(getBundleContext().getProperty(OSGI_CONFIGURATION_AREA) + relativePath))
@@ -198,14 +186,14 @@ class KernelUtils implements KernelConstants {
 				st.open();
 			}
 		};
-		new Thread(run, "Open service tracker " + st).start();
+		Activator.getInternalExecutorService().execute(run);
+//		new Thread(run, "Open service tracker " + st).start();
 	}
 
 	/**
 	 * @return the {@link BundleContext} of the {@link Bundle} which provided this
 	 *         class, never null.
-	 * @throws CmsException
-	 *             if the related bundle is not active
+	 * @throws CmsException if the related bundle is not active
 	 */
 	static BundleContext getBundleContext(Class<?> clzz) {
 		Bundle bundle = FrameworkUtil.getBundle(clzz);
@@ -228,8 +216,7 @@ class KernelUtils implements KernelConstants {
 		case "false":
 			return false;
 		default:
-			throw new CmsException("Unsupported value for attribute " + DataModelNamespace.ABSTRACT
-					+ ": " + value);
+			throw new CmsException("Unsupported value for attribute " + DataModelNamespace.ABSTRACT + ": " + value);
 		}
 	}