X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=a2618922212b3ec34ebfba678f2c972ffb7f1042;hb=35507e18257f2e9f59842ba5120fcd3f19c4cf4d;hp=fbe206644d169aa57003e93dfd0608e9fbad1b16;hpb=df8ecf06ff62ff3f31a7cbe7c992e183312563fd;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
index fbe206644..a26189222 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -19,12 +19,10 @@ import javax.naming.ldap.Rdn;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.jcr.ArgeoJcrConstants;
+import org.argeo.naming.AttributesDictionary;
+import org.argeo.naming.LdifParser;
+import org.argeo.naming.LdifWriter;
 import org.argeo.node.NodeConstants;
-import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.util.naming.AttributesDictionary;
-import org.argeo.util.naming.LdifParser;
-import org.argeo.util.naming.LdifWriter;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.Configuration;
@@ -36,13 +34,14 @@ class DeployConfig implements ConfigurationListener {
 	private final Log log = LogFactory.getLog(getClass());
 	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
-	private Path deployConfigPath = KernelUtils.getOsgiInstancePath(KernelConstants.DEPLOY_CONFIG_PATH);
+	private static Path deployConfigPath = KernelUtils.getOsgiInstancePath(KernelConstants.DEPLOY_CONFIG_PATH);
 	private SortedMap<LdapName, Attributes> deployConfigs = new TreeMap<>();
 
-	public DeployConfig(boolean isClean) {
-		ConfigurationAdmin configurationAdmin = bc.getService(bc.getServiceReference(ConfigurationAdmin.class));
+	public DeployConfig(ConfigurationAdmin configurationAdmin, boolean isClean) {
+		// ConfigurationAdmin configurationAdmin =
+		// bc.getService(bc.getServiceReference(ConfigurationAdmin.class));
 		try {
-			if (!Files.exists(deployConfigPath)) { // first init
+			if (!isInitialized()) { // first init
 				firstInit();
 			}
 			init(configurationAdmin, isClean);
@@ -56,19 +55,19 @@ class DeployConfig implements ConfigurationListener {
 	private void firstInit() throws IOException {
 		Files.createDirectories(deployConfigPath.getParent());
 
-		FirstInitProperties firstInit = new FirstInitProperties();
-		firstInit.prepareInstanceArea();
+		FirstInit firstInit = new FirstInit();
+		FirstInit.prepareInstanceArea();
 
-		if (!Files.exists(deployConfigPath))// could have juste been copied
-			Files.createFile(deployConfigPath);
-
-		try (InputStream in = Files.newInputStream(deployConfigPath)) {
-			deployConfigs = new LdifParser().read(in);
-		}
+		if (!Files.exists(deployConfigPath))
+			deployConfigs = new TreeMap<>();
+		else// config file could have juste been copied by preparation
+			try (InputStream in = Files.newInputStream(deployConfigPath)) {
+				deployConfigs = new LdifParser().read(in);
+			}
 
 		// node repository
 		Dictionary<String, Object> nodeConfig = firstInit
-				.getNodeRepositoryConfig(getProps(NodeConstants.NODE_REPOS_FACTORY_PID, ArgeoJcrConstants.ALIAS_NODE));
+				.getNodeRepositoryConfig(getProps(NodeConstants.NODE_REPOS_FACTORY_PID, NodeConstants.NODE));
 		// node repository is mandatory
 		putFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
 
@@ -246,4 +245,8 @@ class DeployConfig implements ConfigurationListener {
 			return null;
 	}
 
+	static boolean isInitialized() {
+		return Files.exists(deployConfigPath);
+	}
+
 }