Adapt to changes in Argeo TP

[gpl/argeo-slc.git] / swt / rap / org.argeo.tool.rap.cli / src / org / argeo / tool / rap / cli / RapJettyServer.java

diff --git a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
index 6007feadfc1006b674b32996e080407f7de5e347..6f559e2c420c9b6b70468a81911fb58992f7bb82 100644 (file)
--- a/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
+++ b/swt/rap/org.argeo.tool.rap.cli/src/org/argeo/tool/rap/cli/RapJettyServer.java
@@ -10,10 +10,9 @@ import javax.servlet.ServletException;
 
 import org.argeo.cms.jetty.CmsJettyServer;
 import org.argeo.cms.web.CmsWebApp;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.ee8.servlet.DefaultServlet;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.eclipse.rap.rwt.application.ApplicationRunner;
 import org.eclipse.rap.rwt.engine.RWTServlet;
 
@@ -25,7 +24,8 @@ public class RapJettyServer extends CmsJettyServer {
                // rwt-resources requires a file system
                try {
                        Path tempDir = Files.createTempDirectory("argeo-rwtRunner");
-                       servletContextHandler.setBaseResource(Resource.newResource(tempDir.resolve("www").toString()));
+                       // FIXME we need a base directory
+                       //servletContextHandler.setBaseResource(Resource.newResource(tempDir.resolve("www").toString()));
                } catch (IOException e) {
                        throw new IllegalStateException("Cannot create temporary directory", e);
                }