X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fjcr%2FJcrInitUtils.java;h=0536fb6455bb06704868833151c3658bc12781fa;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=27f011b13ca87b0fbf5cf0ddb49fb6e67df2b33e;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java b/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
index 27f011b13..0536fb645 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/internal/jcr/JcrInitUtils.java
@@ -11,30 +11,29 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeDeployment;
+import org.argeo.api.cms.CmsDeployment;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory;
 import org.argeo.jcr.JcrException;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 
 /** JCR specific init utilities. */
 public class JcrInitUtils {
-	private final static Log log = LogFactory.getLog(JcrInitUtils.class);
+	private final static CmsLog log = CmsLog.getLog(JcrInitUtils.class);
 	private final static BundleContext bundleContext = FrameworkUtil.getBundle(JcrInitUtils.class).getBundleContext();
 
-	public static void addToDeployment(NodeDeployment nodeDeployment) {
+	public static void addToDeployment(CmsDeployment nodeDeployment) {
 		// node repository
 //		Dictionary<String, Object> provided = null;
-		Dictionary<String, Object> provided = nodeDeployment.getProps(NodeConstants.NODE_REPOS_FACTORY_PID,
-				NodeConstants.NODE);
+		Dictionary<String, Object> provided = nodeDeployment.getProps(CmsConstants.NODE_REPOS_FACTORY_PID,
+				CmsConstants.NODE);
 		Dictionary<String, Object> nodeConfig = JcrInitUtils.getNodeRepositoryConfig(provided);
 		// node repository is mandatory
-		nodeDeployment.addFactoryDeployConfig(NodeConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
+		nodeDeployment.addFactoryDeployConfig(CmsConstants.NODE_REPOS_FACTORY_PID, nodeConfig);
 
 		// additional repositories
 //		dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
@@ -52,25 +51,25 @@ public class JcrInitUtils {
 	public static Dictionary<String, Object> getNodeRepositoryConfig(Dictionary<String, Object> provided) {
 		Dictionary<String, Object> props = provided != null ? provided : new Hashtable<String, Object>();
 		for (RepoConf repoConf : RepoConf.values()) {
-			Object value = getFrameworkProp(NodeConstants.NODE_REPO_PROP_PREFIX + repoConf.name());
+			Object value = getFrameworkProp(CmsConstants.NODE_REPO_PROP_PREFIX + repoConf.name());
 			if (value != null) {
 				props.put(repoConf.name(), value);
 				if (log.isDebugEnabled())
 					log.debug("Set node repo configuration " + repoConf.name() + " to " + value);
 			}
 		}
-		props.put(NodeConstants.CN, NodeConstants.NODE_REPOSITORY);
+		props.put(CmsConstants.CN, CmsConstants.NODE_REPOSITORY);
 		return props;
 	}
 
 	public static Dictionary<String, Object> getRepositoryConfig(String dataModelName,
 			Dictionary<String, Object> provided) {
-		if (dataModelName.equals(NodeConstants.NODE_REPOSITORY) || dataModelName.equals(NodeConstants.EGO_REPOSITORY))
+		if (dataModelName.equals(CmsConstants.NODE_REPOSITORY) || dataModelName.equals(CmsConstants.EGO_REPOSITORY))
 			throw new IllegalArgumentException("Data model '" + dataModelName + "' is reserved.");
 		Dictionary<String, Object> props = provided != null ? provided : new Hashtable<String, Object>();
 		for (RepoConf repoConf : RepoConf.values()) {
 			Object value = getFrameworkProp(
-					NodeConstants.NODE_REPOS_PROP_PREFIX + dataModelName + '.' + repoConf.name());
+					CmsConstants.NODE_REPOS_PROP_PREFIX + dataModelName + '.' + repoConf.name());
 			if (value != null) {
 				props.put(repoConf.name(), value);
 				if (log.isDebugEnabled())
@@ -78,7 +77,7 @@ public class JcrInitUtils {
 			}
 		}
 		if (props.size() != 0)
-			props.put(NodeConstants.CN, dataModelName);
+			props.put(CmsConstants.CN, dataModelName);
 		return props;
 	}
 
@@ -86,7 +85,7 @@ public class JcrInitUtils {
 		try {
 			Repository repository = createRemoteRepository(new URI(uri));
 			Hashtable<String, Object> properties = new Hashtable<>();
-			properties.put(NodeConstants.CN, NodeConstants.NODE_INIT);
+			properties.put(CmsConstants.CN, CmsConstants.NODE_INIT);
 			properties.put(LdapAttrs.labeledURI.name(), uri);
 			properties.put(Constants.SERVICE_RANKING, -1000);
 			bundleContext.registerService(Repository.class, repository, properties);
@@ -102,7 +101,7 @@ public class JcrInitUtils {
 		Map<String, String> params = new HashMap<String, String>();
 		params.put(ClientDavexRepositoryFactory.JACKRABBIT_DAVEX_URI, uri.toString());
 		// TODO make it configurable
-		params.put(ClientDavexRepositoryFactory.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, NodeConstants.SYS_WORKSPACE);
+		params.put(ClientDavexRepositoryFactory.JACKRABBIT_REMOTE_DEFAULT_WORKSPACE, CmsConstants.SYS_WORKSPACE);
 		return repositoryFactory.getRepository(params);
 	}