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;
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(ConfigurationAdmin configurationAdmin,boolean isClean) {
+ 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);
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);
return null;
}
+ static boolean isInitialized() {
+ return Files.exists(deployConfigPath);
+ }
+
}