Disable OSGi configuration admin and LDIF-based deploy config.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / runtime / KernelConstants.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
index 7c397de6c928d72c1fccfd6bd6e45740c837eefb..a02c557f2a79b8b51e021b1e38efc34c35b81d2e 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelConstants.java
@@ -12,14 +12,11 @@ public interface KernelConstants {
 
        // Files
        String DEPLOY_CONFIG_PATH = DIR_NODE + '/' + CmsConstants.DEPLOY_BASEDN + ".ldif";
-       String DEFAULT_KEYSTORE_PATH = DIR_NODE + '/' + CmsConstants.NODE + ".p12";
-       String DEFAULT_PEM_KEY_PATH = DIR_NODE + '/' + CmsConstants.NODE + ".key";
-       String DEFAULT_PEM_CERT_PATH = DIR_NODE + '/' + CmsConstants.NODE + ".crt";
        String NODE_KEY_TAB_PATH = DIR_NODE + "/krb5.keytab";
 
        // Security
-       String JAAS_CONFIG = "/org/argeo/cms/internal/kernel/jaas.cfg";
-       String JAAS_CONFIG_IPA = "/org/argeo/cms/internal/kernel/jaas-ipa.cfg";
+       String JAAS_CONFIG = "/org/argeo/cms/internal/runtime/jaas.cfg";
+       String JAAS_CONFIG_IPA = "/org/argeo/cms/internal/runtime/jaas-ipa.cfg";
 
        // Java
        String JAAS_CONFIG_PROP = "java.security.auth.login.config";
@@ -39,7 +36,8 @@ public interface KernelConstants {
        // String PATH_WORKBENCH = "/ui";
        // String PATH_WORKBENCH_PUBLIC = PATH_WORKBENCH + "/public";
 
-       String JETTY_FACTORY_PID = "org.eclipse.equinox.http.jetty.config";
+//     String JETTY_FACTORY_PID = "org.eclipse.equinox.http.jetty.config";
+       String JETTY_FACTORY_PID = "org.argeo.equinox.jetty.config";
        String WHITEBOARD_PATTERN_PROP = "osgi.http.whiteboard.servlet.pattern";
        // default Jetty server configured via JettyConfigurator
        String DEFAULT_JETTY_SERVER = "default";