Enables /mvn clean package liberty:run -Pliberty

Author: Karm

Container/README.md

@@ -4,6 +4,18 @@ Building an image and running a container
 Development workflow
 ====================
 
+Locally without Docker, with Liberty
+------------------------------------
+
+```
+./mvn clean package liberty:run -Pliberty
+```
+
+Open: http://localhost:9080/starter/index.xhtml
+
+Note that the test suite requires Quarkus runtime, so it is
+not supported to run tests with Liberty.
+
 Locally without Docker, with Quarkus
 ------------------------------------
 

pom.xml

@@ -24,9 +24,9 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import java.util.Objects;
 import java.util.Scanner;
 
-
 /**
  * @author Michal Karm Babacek <[email protected]>
  */
@@ -38,8 +38,8 @@ public class Version {
 
     @PostConstruct
     public void init() {
-        try (Scanner s = new Scanner(FilesLocator.class.getClassLoader()
-                .getResourceAsStream("/version.txt")).useDelimiter("\\A")) {
+        try (Scanner s = new Scanner(Objects.requireNonNull(
+                FilesLocator.class.getClassLoader().getResourceAsStream("/version.txt"))).useDelimiter("\\A")) {
             git = s.hasNext() ? s.next() : "";
         } catch (Exception e) {
             LOG.error(e.getMessage());

src/main/java/org/eclipse/microprofile/starter/Version.java

@@ -22,14 +22,14 @@
  */
 package org.eclipse.microprofile.starter.core.files;
 
-import com.google.common.io.ByteStreams;
 import org.eclipse.microprofile.starter.core.exception.TechnicalException;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -49,16 +49,15 @@ public byte[] processFile(String file, Set<String> alternatives) {
             throw new FileResolutionException(file, alternatives);
         }
 
-        String sourceFile = "/" + filesLocator.getTemplateFile(fileIndication);
+        final String sourceFile = "/" + filesLocator.getTemplateFile(fileIndication);
+        final ByteArrayOutputStream result = new ByteArrayOutputStream();
 
-        InputStream resource = FileCopyEngine.class.getResourceAsStream(sourceFile);
-        ByteArrayOutputStream result = new ByteArrayOutputStream();
-
-        try {
-            ByteStreams.copy(resource, result);
+        try (InputStream resource = FileCopyEngine.class.getResourceAsStream(sourceFile)) {
+            Objects.requireNonNull(resource).transferTo(result);
         } catch (IOException e) {
             throw new TechnicalException(e);
         }
+
         return result.toByteArray();
     }
 

src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java

@@ -0,0 +1,13 @@
+package org.eclipse.microprofile.starter.log;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+public @interface AppContext {
+}

src/main/java/org/eclipse/microprofile/starter/log/AppContext.java

@@ -0,0 +1,21 @@
+package org.eclipse.microprofile.starter.log;
+
+import org.eclipse.microprofile.context.ManagedExecutor;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+@ApplicationScoped
+public class ManagedExecutorProducer {
+
+    @Produces
+    @AppContext
+    ManagedExecutor createExecutor() {
+        return ManagedExecutor.builder().build();
+    }
+
+    void disposeExecutor(@Disposes @AppContext ManagedExecutor exec) {
+        exec.shutdownNow();
+    }
+}

src/main/java/org/eclipse/microprofile/starter/log/ManagedExecutorProducer.java

@@ -40,6 +40,7 @@
 import org.eclipse.microprofile.starter.core.model.ModelManager;
 import org.eclipse.microprofile.starter.core.model.OptionValue;
 import org.eclipse.microprofile.starter.core.validation.PackageNameValidator;
+import org.eclipse.microprofile.starter.log.AppContext;
 import org.eclipse.microprofile.starter.log.ErrorLogger;
 import org.eclipse.microprofile.starter.log.LoggingTask;
 import org.eclipse.microprofile.starter.rest.model.MPOptionsAvailable;
@@ -204,7 +205,8 @@ private List<StandaloneMPSpec> defineStandaloneSpecs(MicroProfileVersion version
     ZipFileCreator zipFileCreator;
 
     @Inject
-    ManagedExecutor executor;
+    @AppContext
+    transient ManagedExecutor executor;
 
     public Response readme(String ifNoneMatch) {
         if (ifNoneMatch != null) {

src/main/java/org/eclipse/microprofile/starter/rest/APIService.java

@@ -42,6 +42,7 @@
 import org.eclipse.microprofile.starter.core.model.MicroProfileVersion;
 import org.eclipse.microprofile.starter.core.model.ModelManager;
 import org.eclipse.microprofile.starter.core.model.OptionValue;
+import org.eclipse.microprofile.starter.log.AppContext;
 import org.eclipse.microprofile.starter.log.ErrorLogger;
 import org.eclipse.microprofile.starter.log.LoggingTask;
 
@@ -89,7 +90,8 @@ public class GeneratorDataBean implements Serializable {
     ErrorLogger errorLogger;
 
     @Inject
-    ManagedExecutor executor;
+    @AppContext
+    transient ManagedExecutor executor;
 
     private EngineData engineData;
 

src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java

@@ -41,8 +41,19 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         servletResponse.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains");
         servletResponse.setHeader("X-Content-Type-Options", "nosniff");
         servletResponse.setHeader("X-Frame-Options", "DENY");
-        servletResponse.setHeader("Content-Security-Policy", "default-src: https: font-src 'https://fonts.googleapis.com';" +
-                "img-src 'self' https://microprofile.io; style-src 'self'; frame-ancestors 'none';");
+        servletResponse.setHeader("Content-Security-Policy", ""
+                + "default-src 'self'; "
+                + "script-src 'self' 'unsafe-inline' 'unsafe-eval' "
+                + "     https://use.fontawesome.com "
+                + "     https://kit.fontsawesome.com; "
+                + "style-src 'self' 'unsafe-inline' "
+                + "     fonts.gstatic.com "
+                + "     fonts.googleapis.com "
+                + "     *.fontawesome.com; "
+                + "img-src 'self' fonts.gstatic.com microprofile.io; "
+                + "font-src 'self' fonts.gstatic.com fonts.googleapis.com *.fontsawesome.com; "
+                + "connect-src 'self' fonts.gstatic.com fonts.googleapis.com *.fontsawesome.com; "
+        );
         chain.doFilter(request, response);
     }
 

src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="${project.name}">
+<featureManager>
+    <feature>microProfile-4.1</feature>
+    <feature>webprofile-8.0</feature>
+    <feature>mpContextPropagation-1.2</feature>
+</featureManager>
+<httpEndpoint id="defaultHttpEndpoint"
+              httpPort="9080"
+              httpsPort="9443"/>
+<webApplication location="${project.name}.war" contextRoot="${app.context.root}">
+    <classloader apiTypeVisibility="+third-party" />
+</webApplication>
+</server>