X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Frap%2Forg.argeo.cms.swt.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2Fosgi%2FCmsWebAppFactory.java;h=83a83e2adb8b3d8ce3efa1ebb738f65dc6b39fb5;hb=8c6e16aa43d9523e1ec57a41a06b3ceba7d23fdb;hp=19b9fe80dcb0b9a8c5972fbfee97180f958755cd;hpb=79c14508549e1af042485b4f888a3c54f5a68833;p=lgpl%2Fargeo-commons.git diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java index 19b9fe80d..83a83e2ad 100644 --- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java +++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java @@ -6,17 +6,17 @@ import java.util.Hashtable; import java.util.Map; import org.argeo.api.cms.CmsApp; +import org.argeo.api.cms.CmsEventBus; import org.argeo.cms.web.CmsWebApp; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; -import org.osgi.service.event.EventAdmin; /** Publish a CmsApp as a RAP application. */ public class CmsWebAppFactory { private BundleContext bundleContext = FrameworkUtil.getBundle(CmsWebAppFactory.class).getBundleContext(); private final static String CONTEXT_NAME = "contextName"; - private EventAdmin eventAdmin; + private CmsEventBus cmsEventBus; private Map registrations = Collections.synchronizedMap(new HashMap<>()); @@ -24,7 +24,7 @@ public class CmsWebAppFactory { String contextName = properties.get(CmsApp.CONTEXT_NAME_PROPERTY); if (contextName != null) { CmsWebApp cmsWebApp = new CmsWebApp(); - cmsWebApp.setEventAdmin(eventAdmin); + cmsWebApp.setCmsEventBus(cmsEventBus); cmsWebApp.setCmsApp(cmsApp); Hashtable serviceProperties = new Hashtable<>(); if (!contextName.equals("")) @@ -47,8 +47,9 @@ public class CmsWebAppFactory { } } - public void setEventAdmin(EventAdmin eventAdmin) { - this.eventAdmin = eventAdmin; + public void setCmsEventBus(CmsEventBus cmsEventBus) { + this.cmsEventBus = cmsEventBus; } + }