Fix resource change

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.7.2 (2018-10-18)
+
+* [fix] In watch goal, resources (including static resources under `META-INF/resources`) are now properly updated on change.
+
 # Version 2.7.1 (2018-05-18)
 
 * [new] In watch goal, trigger a LiveReload (without app refresh) when a resource changes.

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack</groupId>
     <artifactId>seedstack-maven-plugin</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>2.7.2-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <properties>

src/license/THIRD-PARTY.properties

@@ -1,23 +1,23 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - Apache 2
-# - BSD
-# - CDDL 1.0
-# - CPL 1.0
-# - EPL 1.0
-# - MIT
-# - MPL
-# - Public Domain
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Fri May 18 14:52:30 CEST 2018
-classworlds--classworlds--1.1-alpha-2=
-dom4j--dom4j--1.6.1=
-jdom--jdom--1.0=
-org.codehaus.plexus--plexus-component-api--1.0-alpha-16=
-org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
-org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=
-oro--oro--2.0.8=
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache 2
+# - BSD
+# - CDDL 1.0
+# - CPL 1.0
+# - EPL 1.0
+# - MIT
+# - MPL
+# - Public Domain
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Wed Oct 17 15:28:47 CEST 2018
+classworlds--classworlds--1.1-alpha-2=
+org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
+jdom--jdom--1.0=
+org.codehaus.plexus--plexus-component-api--1.0-alpha-16=
+org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-6=
+oro--oro--2.0.8=
+dom4j--dom4j--1.6.1=

src/main/java/org/seedstack/maven/WatchMojo.java

@@ -57,6 +57,7 @@ public void execute() throws MojoExecutionException {
 
         setupResourceWatcher(mavenProject);
 
+        // Force config watching
         System.setProperty("seedstack.config.config.watch", "true");
 
         this.appRunnable = new AppRunnable(getContext());
@@ -113,7 +114,7 @@ private void stopWatcher(DirectoryWatcher watcher, Thread watcherThread) {
 
     private void setupResourceWatcher(MavenProject mavenProject) throws MojoExecutionException {
         try {
-            this.resourceWatcher = new DirectoryWatcher(getLog(), new ResourceChangeListener(this));
+            this.resourceWatcher = new DirectoryWatcher(getLog(), new ResourceChangeListener(this, getContext()));
         } catch (IOException e) {
             throw new MojoExecutionException("Unable to create resource watcher", e);
         }

src/main/java/org/seedstack/maven/watcher/ResourceChangeListener.java

@@ -8,20 +8,34 @@
 
 package org.seedstack.maven.watcher;
 
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
+
 import java.io.File;
 import java.util.Set;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.seedstack.maven.Context;
 import org.seedstack.maven.WatchMojo;
 
 public class ResourceChangeListener implements FileChangeListener {
-    private WatchMojo watchMojo;
+    private final WatchMojo watchMojo;
+    private final Context context;
 
-    public ResourceChangeListener(WatchMojo watchMojo) {
+    public ResourceChangeListener(WatchMojo watchMojo, Context context) {
         this.watchMojo = watchMojo;
+        this.context = context;
     }
 
     @Override
     public void onChange(Set<FileEvent> fileEvents) {
         boolean configChanged = false;
+        boolean staticResourceChanged = false;
         watchMojo.getLog().info("Resource change(s) detected");
 
         for (FileEvent fileEvent : fileEvents) {
@@ -38,18 +52,24 @@ public void onChange(Set<FileEvent> fileEvents) {
             }
         }
 
-        if (configChanged) {
-            // Wait for the application to notice the change
-            watchMojo.getLog()
-                    .info("A configuration file has changed, waiting for the application to notice the change");
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                // ignore
+        try {
+            copyResources();
+
+            if (configChanged) {
+                // Wait for the application to notice the change
+                watchMojo.getLog()
+                        .info("A configuration file has changed, waiting for the application to notice it");
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    // ignore
+                }
             }
-        }
 
-        watchMojo.liveReload();
+            watchMojo.liveReload();
+        } catch (MojoExecutionException e) {
+            watchMojo.getLog().warn("An error occurred during resource copy, ignoring resource changes", e);
+        }
     }
 
     private boolean isConfigFile(File file) {
@@ -62,4 +82,15 @@ private boolean isConfigFile(File file) {
                 || fileName.equals("application.override.properties")
                 || file.getParentFile().getPath().endsWith("META-INF" + File.separator + "configuration");
     }
+
+    private void copyResources() throws MojoExecutionException {
+        executeMojo(
+                plugin(groupId("org.apache.maven.plugins"), artifactId("maven-resources-plugin"), version("3.1.0")),
+                goal("resources"),
+                configuration(),
+                executionEnvironment(context.getMavenProject(),
+                        context.getMavenSession(),
+                        context.getBuildPluginManager())
+        );
+    }
 }

src/main/java/org/seedstack/maven/watcher/SourceChangeListener.java

@@ -114,7 +114,7 @@ private void refresh(Set<FileEvent> fileEvents) {
             if (toLog == null || !toLog.getClass().getName().equals(COMPILATION_FAILURE_EXCEPTION)) {
                 toLog = e;
             }
-            watchMojo.getLog().warn("An error occurred during application refresh, ignoring changes", toLog);
+            watchMojo.getLog().warn("An error occurred during application refresh, ignoring source changes", toLog);
         }
     }