X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsInstance.java;h=eef8d925e76d7663e67338c811fa0b036645b1b9;hb=6e6286a551d04ee0993dc7930bd9744f7c9df10e;hp=d040bdb1eddfe0405c8fe115919928efe90621e7;hpb=f06ad11d9b3c77604dbf439a7047a71b47abf06f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
index d040bdb1e..eef8d925e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsInstance.java
@@ -5,9 +5,9 @@ import javax.naming.ldap.LdapName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
+import org.argeo.api.NodeInstance;
 import org.argeo.cms.CmsException;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.NodeInstance;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -17,7 +17,7 @@ public class CmsInstance implements NodeInstance {
 	private final Log log = LogFactory.getLog(getClass());
 	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
-	private HomeRepository homeRepository;
+	private EgoRepository egoRepository;
 
 	public CmsInstance() {
 		initTrackers();
@@ -29,10 +29,10 @@ public class CmsInstance implements NodeInstance {
 			@Override
 			public Repository addingService(ServiceReference<Repository> reference) {
 				Object cn = reference.getProperty(NodeConstants.CN);
-				if (cn != null && cn.equals(NodeConstants.HOME)) {
-					homeRepository = (HomeRepository) bc.getService(reference);
-					if (log.isDebugEnabled())
-						log.debug("Home repository is available");
+				if (cn != null && cn.equals(NodeConstants.EGO_REPOSITORY)) {
+//					egoRepository = (EgoRepository) bc.getService(reference);
+					if (log.isTraceEnabled())
+						log.trace("Home repository is available");
 				}
 				return super.addingService(reference);
 			}
@@ -40,7 +40,7 @@ public class CmsInstance implements NodeInstance {
 			@Override
 			public void removedService(ServiceReference<Repository> reference, Repository service) {
 				super.removedService(reference, service);
-				homeRepository = null;
+//				egoRepository = null;
 			}
 
 		}.open();
@@ -52,10 +52,10 @@ public class CmsInstance implements NodeInstance {
 
 	@Override
 	public void createWorkgroup(LdapName dn) {
-		if (homeRepository == null)
-			throw new CmsException("Home repository is not available");
+		if (egoRepository == null)
+			throw new CmsException("Ego repository is not available");
 		// TODO add check that the group exists
-		homeRepository.createWorkgroup(dn);
+		egoRepository.createWorkgroup(dn);
 	}
 
 }