X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsContextImpl.java;h=c2d2ccf42d4cdd2814e6c4806d366bf9385d935d;hb=138e686fbf65683c3c94a52f1cfbaf8e02362e19;hp=e14b21e7073cd39241250fa0ec337a2a795a83e8;hpb=dca2b13e0e3ca3e7a9469e089b980c48c880ad1a;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java index e14b21e70..c2d2ccf42 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsContextImpl.java @@ -1,7 +1,5 @@ package org.argeo.cms.internal.runtime; -import static java.util.Locale.ENGLISH; - import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.HashMap; @@ -14,31 +12,31 @@ import java.util.concurrent.ExecutionException; import javax.security.auth.Subject; -import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsDeployment; +import org.argeo.api.cms.CmsEventBus; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsSession; import org.argeo.api.cms.CmsSessionId; import org.argeo.api.cms.CmsState; import org.argeo.api.uuid.UuidFactory; import org.argeo.cms.CmsDeployProperty; -import org.argeo.cms.LocaleUtils; import org.argeo.cms.internal.auth.CmsSessionImpl; import org.ietf.jgss.GSSCredential; import org.osgi.service.useradmin.UserAdmin; public class CmsContextImpl implements CmsContext { + private final CmsLog log = CmsLog.getLog(getClass()); -// private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); -// private EgoRepository egoRepository; private static CompletableFuture instance = new CompletableFuture(); +// private static CmsContextImpl instance = null; private CmsState cmsState; private CmsDeployment cmsDeployment; private UserAdmin userAdmin; private UuidFactory uuidFactory; + private CmsEventBus cmsEventBus; // private ProvidedRepository contentRepository; // i18n @@ -51,41 +49,23 @@ public class CmsContextImpl implements CmsContext { private Map cmsSessionsByUuid = new HashMap<>(); private Map cmsSessionsByLocalId = new HashMap<>(); -// public CmsContextImpl() { -// initTrackers(); -// } - public void start() { List codes = CmsStateImpl.getDeployProperties(cmsState, CmsDeployProperty.LOCALE); locales = getLocaleList(codes); if (locales.size() == 0) throw new IllegalStateException("At least one locale must be set"); defaultLocale = locales.get(0); -// Object defaultLocaleValue = KernelUtils.getFrameworkProp(CmsConstants.I18N_DEFAULT_LOCALE); -// defaultLocale = defaultLocaleValue != null ? new Locale(defaultLocaleValue.toString()) -// : new Locale(ENGLISH.getLanguage()); - // 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.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(); - checkReadiness(); + new Thread(() -> { + while (!checkReadiness()) { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + } + } + }, "Check readiness").start(); + + // checkReadiness(); setInstance(this); } @@ -98,10 +78,13 @@ public class CmsContextImpl implements CmsContext { * Checks whether the deployment is available according to expectations, and * mark it as available. */ - private void checkReadiness() { + private boolean checkReadiness() { if (isAvailable()) - return; - if (cmsDeployment != null && userAdmin != null) { + return true; + if (cmsDeployment == null) + return false; + + if (((CmsDeploymentImpl) cmsDeployment).allExpectedServicesAvailable() && userAdmin != null) { String data = KernelUtils.getFrameworkProp(KernelUtils.OSGI_INSTANCE_AREA); String state = KernelUtils.getFrameworkProp(KernelUtils.OSGI_CONFIGURATION_AREA); availableSince = System.currentTimeMillis(); @@ -118,8 +101,11 @@ public class CmsContextImpl implements CmsContext { if (log.isTraceEnabled()) log.trace("Kernel initialization took " + initDuration + "ms"); tributeToFreeSoftware(initDuration); + + return true; } else { - throw new IllegalStateException("Deployment is not available"); + return false; + // throw new IllegalStateException("Deployment is not available"); } } @@ -205,56 +191,83 @@ public class CmsContextImpl implements CmsContext { return defaultLocale; } + @Override + public UUID timeUUID() { + return uuidFactory.timeUUID(); + } + @Override public List getLocales() { return locales; } @Override - public synchronized Long getAvailableSince() { + public Long getAvailableSince() { return availableSince; } - public synchronized boolean isAvailable() { + public boolean isAvailable() { return availableSince != null; } - @Override public CmsState getCmsState() { return cmsState; } + @Override + public CmsEventBus getCmsEventBus() { + return cmsEventBus; + } + + public void setCmsEventBus(CmsEventBus cmsEventBus) { + this.cmsEventBus = cmsEventBus; + } + /* * STATIC */ - public synchronized static CmsContextImpl getCmsContext() { + public static CmsContextImpl getCmsContext() { return getInstance(); } -// /** Required by USER login module. */ -// public synchronized static UserAdmin getUserAdmin() { -// return getInstance().userAdmin; -// } - /** Required by SPNEGO login module. */ - @Deprecated - public synchronized static GSSCredential getAcceptorCredentials() { - // FIXME find a cleaner way - return ((CmsUserAdmin) getInstance().userAdmin).getAcceptorCredentials(); + public GSSCredential getAcceptorCredentials() { + // TODO find a cleaner way + return ((CmsUserAdmin) userAdmin).getAcceptorCredentials(); } - private synchronized static void setInstance(CmsContextImpl cmsContextImpl) { + private static void setInstance(CmsContextImpl cmsContextImpl) { +// if (cmsContextImpl != null) { +// if (instance != null) +// throw new IllegalStateException("CMS Context is already set"); +// instance = cmsContextImpl; +// } else { +// instance = null; +// } +// CmsContextImpl.class.notifyAll(); + if (cmsContextImpl != null) { if (instance.isDone()) throw new IllegalStateException("CMS Context is already set"); instance.complete(cmsContextImpl); } else { + if (!instance.isDone()) + instance.cancel(true); instance = new CompletableFuture(); } } - private synchronized static CmsContextImpl getInstance() { + private static CmsContextImpl getInstance() { +// while (instance == null) { +// try { +// CmsContextImpl.class.wait(); +// } catch (InterruptedException e) { +// throw new IllegalStateException("Cannot wait for CMS context instance", e); +// } +// } +// return instance; + try { return instance.get(); } catch (InterruptedException | ExecutionException e) { @@ -271,14 +284,14 @@ public class CmsContextImpl implements CmsContext { */ @Override - public synchronized CmsSession getCmsSession(Subject subject) { + public CmsSession getCmsSession(Subject subject) { if (subject.getPrivateCredentials(CmsSessionId.class).isEmpty()) return null; CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next(); return getCmsSessionByUuid(cmsSessionId.getUuid()); } - public synchronized void registerCmsSession(CmsSessionImpl cmsSession) { + public void registerCmsSession(CmsSessionImpl cmsSession) { if (cmsSessionsByUuid.containsKey(cmsSession.getUuid()) || cmsSessionsByLocalId.containsKey(cmsSession.getLocalId())) throw new IllegalStateException("CMS session " + cmsSession + " is already registered."); @@ -286,7 +299,7 @@ public class CmsContextImpl implements CmsContext { cmsSessionsByLocalId.put(cmsSession.getLocalId(), cmsSession); } - public synchronized void unregisterCmsSession(CmsSessionImpl cmsSession) { + public void unregisterCmsSession(CmsSessionImpl cmsSession) { if (!cmsSessionsByUuid.containsKey(cmsSession.getUuid()) || !cmsSessionsByLocalId.containsKey(cmsSession.getLocalId())) throw new IllegalStateException("CMS session " + cmsSession + " is not registered."); @@ -299,7 +312,7 @@ public class CmsContextImpl implements CmsContext { * The {@link CmsSession} related to this UUID, or null if not * registered. */ - public synchronized CmsSessionImpl getCmsSessionByUuid(UUID uuid) { + public CmsSessionImpl getCmsSessionByUuid(UUID uuid) { return cmsSessionsByUuid.get(uuid); } @@ -307,7 +320,7 @@ public class CmsContextImpl implements CmsContext { * The {@link CmsSession} related to this local id, or null if not * registered. */ - public synchronized CmsSessionImpl getCmsSessionByLocalId(String localId) { + public CmsSessionImpl getCmsSessionByLocalId(String localId) { return cmsSessionsByLocalId.get(localId); }