X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=rap%2Forg.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebApp.java;h=68fd803b9e7fc75590e133086982fda5d4a58892;hb=c615307d7b87bcb260d8a9f402c6e0a880862f38;hp=e5b6c7efca1e37b6d76b1ffb5086a5505047e84f;hpb=f9efbe5228615951dd8482a4582aa24e00c10ce5;p=lgpl%2Fargeo-commons.git

diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
index e5b6c7efc..68fd803b9 100644
--- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
@@ -5,10 +5,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsAppListener;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsView;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -21,17 +20,16 @@ import org.eclipse.rap.rwt.application.ExceptionHandler;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.event.EventAdmin;
 
 /** An RWT web app integrating with a {@link CmsApp}. */
 public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, CmsAppListener {
-	private final static Log log = LogFactory.getLog(CmsWebApp.class);
+	private final static CmsLog log = CmsLog.getLog(CmsWebApp.class);
 
 	private BundleContext bundleContext;
 	private CmsApp cmsApp;
-	private String cmsAppId;
+//	private String cmsAppId;
 	private EventAdmin eventAdmin;
 
 	private ServiceRegistration<ApplicationConfiguration> rwtAppReg;
@@ -125,13 +123,13 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	public void setCmsApp(CmsApp cmsApp, Map<String, String> properties) {
 		this.cmsApp = cmsApp;
-		this.cmsAppId = properties.get(Constants.SERVICE_PID);
+//		this.cmsAppId = properties.get(Constants.SERVICE_PID);
 		this.cmsApp.addCmsAppListener(this);
 	}
 
 	public void unsetCmsApp(CmsApp cmsApp, Map<String, String> properties) {
-		String cmsAppId = properties.get(Constants.SERVICE_PID);
-		if (!cmsAppId.equals(this.cmsAppId))
+		String contextName = properties.get(CmsApp.CONTEXT_NAME_PROPERTY);
+		if (!contextName.equals(this.contextName))
 			return;
 		if (this.cmsApp != null) {
 			this.cmsApp.removeCmsAppListener(this);