X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsInstance.java;h=0d65a6c0b2be132c19a76dbeac3b4962047f8edf;hb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;hp=fb3e6ad4d88c5f6b531edf45182c2a4fe577bf40;hpb=61780b581925666edd4bd7743a00dca7170f1d35;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 fb3e6ad4d..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,20 +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.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 EgoRepository egoRepository; public CmsInstance() { initTrackers(); @@ -22,21 +20,38 @@ 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.ALIAS_NODE)) { - if (log.isDebugEnabled()) - log.debug("Node repository is available"); - } - return super.addingService(reference); - } - }.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() { } + @Override + public void createWorkgroup(LdapName 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(); + } + }