X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsInstance.java;h=0d65a6c0b2be132c19a76dbeac3b4962047f8edf;hb=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=d040bdb1eddfe0405c8fe115919928efe90621e7;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;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..0d65a6c0b 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 @@ -1,23 +1,18 @@ package org.argeo.cms.internal.kernel; -import javax.jcr.Repository; import javax.naming.ldap.LdapName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.CmsException; -import org.argeo.node.NodeConstants; -import org.argeo.node.NodeInstance; +import org.argeo.api.NodeInstance; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; 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(); @@ -25,25 +20,25 @@ public class CmsInstance implements NodeInstance { private void initTrackers() { // node repository - new ServiceTracker(bc, Repository.class, null) { - @Override - public Repository addingService(ServiceReference 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"); - } - return super.addingService(reference); - } - - @Override - public void removedService(ServiceReference reference, Repository service) { - super.removedService(reference, service); - homeRepository = null; - } - - }.open(); +// new ServiceTracker(bc, Repository.class, null) { +// @Override +// public Repository addingService(ServiceReference reference) { +// Object cn = reference.getProperty(NodeConstants.CN); +// 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); +// } +// +// @Override +// public void removedService(ServiceReference reference, Repository service) { +// super.removedService(reference, service); +//// egoRepository = null; +// } +// +// }.open(); } public void shutdown() { @@ -52,10 +47,11 @@ public class CmsInstance implements NodeInstance { @Override public void createWorkgroup(LdapName dn) { - if (homeRepository == null) - throw new CmsException("Home repository is not available"); - // TODO add check that the group exists - homeRepository.createWorkgroup(dn); +// if (egoRepository == null) +// throw new CmsException("Ego repository is not available"); +// // TODO add check that the group exists +// egoRepository.createWorkgroup(dn); + throw new UnsupportedOperationException(); } }