Explorar o código

Cleanup of Bootstrap.java and added 'sbt-assembly' related option to build.sbt to disable the compilation and running of tests at assembly time

Mark Kolich %!s(int64=11) %!d(string=hai) anos
pai
achega
8802868528
Modificáronse 2 ficheiros con 16 adicións e 7 borrados
  1. 2 0
      curacao/build.sbt
  2. 14 7
      curacao/src/main/java/benchmark/Bootstrap.java

+ 2 - 0
curacao/build.sbt

@@ -31,3 +31,5 @@ mainClass in assembly := Some("benchmark.Bootstrap")
 outputPath in assembly := file("dist/curacao-standalone.jar")
 
 assemblyOption in assembly ~= { _.copy(includeScala = false) }
+
+test in assembly := {}

+ 14 - 7
curacao/src/main/java/benchmark/Bootstrap.java

@@ -2,27 +2,29 @@ package benchmark;
 
 import com.kolich.curacao.CuracaoDispatcherServlet;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 public final class Bootstrap {
 
     public static void main(final String[] args) throws Exception {
 
-        final Server server = new Server(8080);
+        final File workingDir = getWorkingDir();
 
-        final ServletHandler handler = new ServletHandler();
-        handler.setServer(server);
+        final Server server = new Server(8080);
 
-        final ServletHolder holder = handler.addServletWithMapping(CuracaoDispatcherServlet.class, "/");
+        final ServletHolder holder = new ServletHolder(CuracaoDispatcherServlet.class);
         holder.setAsyncSupported(true); // Async supported = true
         holder.setInitOrder(1); // Load on startup = true
 
         final WebAppContext context = new WebAppContext();
         context.setContextPath("/");
-        context.setResourceBase("src/main/webapp");
-        context.addServlet(holder, "/");
+        context.setResourceBase(workingDir.getAbsolutePath());
+        context.addServlet(holder, "/*");
 
         server.setHandler(context);
 
@@ -31,4 +33,9 @@ public final class Bootstrap {
 
     }
 
+    private static final File getWorkingDir() {
+        final Path currentRelativePath = Paths.get("");
+        return currentRelativePath.toAbsolutePath().toFile();
+    }
+
 }