X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=swt%2Frap%2Forg.argeo.tool.rap.cli%2Fsrc%2Forg%2Fargeo%2Ftool%2Frap%2Fcli%2FRapJettyServer.java;h=6f559e2c420c9b6b70468a81911fb58992f7bb82;hb=ecfa1478016ac6407e6dbe09c6dc3bcdf1b7a9d7;hp=6007feadfc1006b674b32996e080407f7de5e347;hpb=02f5d9030b0cb78111320a54a205870b9e747d6c;p=gpl%2Fargeo-slc.git 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 6007feadf..6f559e2c4 100644 --- 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); }