X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2FRepositoryServiceFactory.java;h=042ddb5d58a42bde320525b56e9c7f0c6e19a90f;hp=2a47d120cfcd99c294332b28d1499c77133c8dd2;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hpb=4185ff8826f893a4a1f054f61a11b89333c3e85d

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryServiceFactory.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryServiceFactory.java
index 2a47d120c..042ddb5d5 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryServiceFactory.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/RepositoryServiceFactory.java
@@ -8,10 +8,9 @@ import java.util.Map;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.RepositoryContext;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.jcr.RepoConf;
 import org.argeo.cms.internal.jcr.RepositoryBuilder;
 import org.argeo.cms.jcr.internal.osgi.CmsJcrActivator;
@@ -22,7 +21,7 @@ import org.osgi.service.cm.ManagedServiceFactory;
 
 /** A {@link ManagedServiceFactory} creating or referencing JCR repositories. */
 public class RepositoryServiceFactory implements ManagedServiceFactory {
-	private final static Log log = LogFactory.getLog(RepositoryServiceFactory.class);
+	private final static CmsLog log = CmsLog.getLog(RepositoryServiceFactory.class);
 //	private final BundleContext bc = FrameworkUtil.getBundle(RepositoryServiceFactory.class).getBundleContext();
 
 	private Map<String, RepositoryContext> repositories = new HashMap<String, RepositoryContext>();
@@ -55,16 +54,16 @@ public class RepositoryServiceFactory implements ManagedServiceFactory {
 				Dictionary<String, Object> props = LangUtils.dict(Constants.SERVICE_PID, pid);
 				// props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI,
 				// properties.get(RepoConf.labeledUri.name()));
-				Object cn = properties.get(NodeConstants.CN);
+				Object cn = properties.get(CmsConstants.CN);
 				if (cn != null) {
-					props.put(NodeConstants.CN, cn);
+					props.put(CmsConstants.CN, cn);
 					// props.put(NodeConstants.JCR_REPOSITORY_ALIAS, cn);
 					pidToCn.put(pid, cn);
 				}
 				CmsJcrActivator.registerService(RepositoryContext.class, repositoryContext, props);
 			} else {
 				try {
-					Object cn = properties.get(NodeConstants.CN);
+					Object cn = properties.get(CmsConstants.CN);
 					Object defaultWorkspace = properties.get(RepoConf.defaultWorkspace.name());
 					if (defaultWorkspace == null)
 						defaultWorkspace = RepoConf.defaultWorkspace.getDefault();
@@ -83,16 +82,16 @@ public class RepositoryServiceFactory implements ManagedServiceFactory {
 							new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), null, null)
 									.toString());
 					if (cn != null) {
-						props.put(NodeConstants.CN, cn);
+						props.put(CmsConstants.CN, cn);
 						// props.put(NodeConstants.JCR_REPOSITORY_ALIAS, cn);
 						pidToCn.put(pid, cn);
 					}
 					CmsJcrActivator.registerService(Repository.class, repository, props);
 
 					// home
-					if (cn.equals(NodeConstants.NODE_REPOSITORY)) {
-						Dictionary<String, Object> homeProps = LangUtils.dict(NodeConstants.CN,
-								NodeConstants.EGO_REPOSITORY);
+					if (cn.equals(CmsConstants.NODE_REPOSITORY)) {
+						Dictionary<String, Object> homeProps = LangUtils.dict(CmsConstants.CN,
+								CmsConstants.EGO_REPOSITORY);
 						EgoRepository homeRepository = new EgoRepository(repository, true);
 						CmsJcrActivator.registerService(Repository.class, homeRepository, homeProps);
 					}