Adapt to changes in Argeo TP.

diff --git a/Makefile b/Makefile
index 3c47984094961b6b4fc85317166a147a4fa6f5d1..8688ce849c46b46f241bd47ba8b3f3a42315e17e 100644 (file)
--- 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 99197c05b320d79e57763f3698eeccf0d446c302..02ca5296230633f39962df7dc3e2aee5b2a07559 100644 (file)
--- 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 e6a24b92b0fee4f77901e9a95fbc480323119a5f..aa2a29e28f7b744a1bdfc00cebcd3e52727dde69 100644 (file)
--- 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 5a199d87c32d081ff09c9d768b25a0329bbfc1f5..7c24f87d9b02964098f7320e3ce2850c6b3f5465 100644 (file)
--- 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;