import org.apache.commons.logging.Log;
import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.AuthConstants;
+import org.argeo.node.NodeConstants;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
/** Package utilities */
class KernelUtils implements KernelConstants {
- private final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
- private final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
+ final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
+ final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
static Dictionary<String, ?> asDictionary(Properties props) {
Hashtable<String, Object> hashtable = new Hashtable<String, Object>();
static URI getOsgiInstanceUri(String relativePath) {
String osgiInstanceBaseUri = getFrameworkProp(OSGI_INSTANCE_AREA);
- return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
+ 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 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 {
Subject subject = new Subject();
LoginContext lc;
try {
- lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+ lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject);
lc.login();
return subject;
} catch (LoginException e) {
Thread.currentThread().setContextClassLoader(KernelUtils.class.getClassLoader());
LoginContext loginContext;
try {
- loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_DATA_ADMIN);
+ loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
loginContext.login();
} catch (LoginException e1) {
throw new CmsException("Could not login as data admin", e1);
private static BundleContext getBundleContext() {
return getBundleContext(KernelUtils.class);
}
-
- private static URI safeUri(String uri){
- if(uri==null)
+
+ private static URI safeUri(String uri) {
+ if (uri == null)
throw new CmsException("URI cannot be null");
try {
return new URI(uri);
} catch (URISyntaxException e) {
- throw new CmsException("Dadly formatted URI "+uri, e);
+ throw new CmsException("Dadly formatted URI " + uri, e);
}
}
+
private KernelUtils() {
}