From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 8 Jul 2022 13:28:56 +0000 (+0200)
Subject: Adapt to changes in Argeo TP.
X-Git-Tag: v2.3.10~133
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=0ef433b9f20114f07c42982c7bb5cba65f8c10c6

Adapt to changes in Argeo TP.
---

diff --git a/Makefile b/Makefile
index 3c4798409..8688ce849 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,10 @@ DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse.equinox \
-org.argeo.tp.eclipse.rwt \
-org.argeo.tp.eclipse.rap \
+org.argeo.tp.eclipse \
+osgi/api/org.argeo.tp.osgi \
+swt/rap/org.argeo.tp.swt \
+swt/rap/org.argeo.tp.swt.workbench \
 org.argeo.tp.jcr
 
 jni:
diff --git a/Makefile-rcp.mk b/Makefile-rcp.mk
index 99197c05b..02ca52962 100644
--- a/Makefile-rcp.mk
+++ b/Makefile-rcp.mk
@@ -19,9 +19,11 @@ org.argeo.cms \
 org.argeo.tp \
 org.argeo.tp.apache \
 org.argeo.tp.jetty \
-org.argeo.tp.eclipse.equinox \
-org.argeo.tp.eclipse.swt \
-org.argeo.tp.eclipse.rcp \
+org.argeo.tp.eclipse \
+osgi/osgi/org.argeo.tp.osgi \
+swt/rcp/org.argeo.tp.swt \
+lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
+swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp.jcr
 
 
diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
index e6a24b92b..aa2a29e28 100644
--- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
+++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
@@ -27,8 +27,6 @@ import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
@@ -37,7 +35,7 @@ import org.osgi.service.event.EventAdmin;
 public class CmsRcpApp implements CmsView {
 	private final static CmsLog log = CmsLog.getLog(CmsRcpApp.class);
 
-	private BundleContext bundleContext = FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext();
+	//private BundleContext bundleContext = FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext();
 
 	private Shell shell;
 	private CmsApp cmsApp;
diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java
index 5a199d87c..7c24f87d9 100644
--- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java
+++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServletFactory.java
@@ -6,7 +6,6 @@ import java.lang.System.Logger.Level;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
 import java.net.URI;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;