From a7856633ec99aa650ccd0a800e59323b4b1319c9 Mon Sep 17 00:00:00 2001
From: Ole Hejlskov <ole@phpfreak.dk>
Date: Tue, 7 Apr 2015 17:37:24 +0200
Subject: [PATCH] Set virtual class path up correctly. Running 'mvn compile'
 makes sure the changes end up in target/${project.build.finalName}/config.
 This causes issues when changing existing files after starting/restarting,
 since integration-test makes the files appear in target/test-classes. The app
 would then only serve the file in target/test-classes and ignore the rest.

By switching these we can strive for having 'mvn compile' do everything we need
to ensure hot reloading works.
---
 .../runner/tomcat/context-repo.xml            |  9 ++++++-
 .../runner/tomcat/context-share.xml           |  9 ++++++-
 .../archetype-resources/tomcat/context.xml    | 12 ++++++++--
 .../archetype-resources/tomcat/context.xml    | 24 +++++++++++++++----
 poms/alfresco-sdk-parent/pom.xml              |  3 +++
 5 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
index 95b83dd4..88c314f9 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml
@@ -16,9 +16,16 @@
                extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
 
     <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files -->
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         2) target/${project.build.finalName}/config
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
             searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/test-classes;${project.parent.basedir}/repo-amp/target/repo-amp/config" />
+            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/repo-amp/config;${project.parent.basedir}/repo-amp/target/test-classes" />
 
     <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
index 65d1c488..d2ae9316 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml
@@ -13,9 +13,16 @@
                extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
 
     <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         2) target/${project.build.finalName}/config
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
             searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share-amp/target/share-amp/config" />
+            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
 
     <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
index 0862d9c0..3a6aef29 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
@@ -13,10 +13,18 @@
 
   <Resources className="org.apache.naming.resources.VirtualDirContext"
              extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
+
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         2) target/${project.build.finalName}/config
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
     <Loader searchVirtualFirst="true"
             className="org.apache.catalina.loader.VirtualWebappLoader"
-            virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
+            virtualClasspath="${project.build.outputDirectory};${project.build.directory}/${project.build.finalName}/config;${project.build.testOutputDirectory}" />
+
 
     <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources -->
     <JarScanner scanAllDirectories="true" />
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
index a5347d33..0b2c4d4d 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Alfresco.war
+    =================================================================================================================-->
+-->
+
 <!-- Setup docBase to something like share-amp/target/share-amp-war
      and path to /share -->
 <Context docBase="${app.amp.client.war.folder}" path="${share.client.contextPath}">
 
   <Resources className="org.apache.naming.resources.VirtualDirContext"
     extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
+
+
+  <!-- Setup the virtual class path like this:
+       1) target/classes
+       2) target/${project.build.finalName}/config
+       3) target/test-classes
+
+       This way mvn compile can be invoked and all changes will be picked up
+  -->
+  <Loader searchVirtualFirst="true"
+          className="org.apache.catalina.loader.VirtualWebappLoader"
+          virtualClasspath="${project.build.outputDirectory};${project.build.directory}/${project.build.finalName}/config;${project.build.testOutputDirectory}" />
+
   <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources -->
   <JarScanner scanAllDirectories="true" />
   
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index aca83146..1c26246e 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -492,6 +492,9 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
+                                <!-- Important to do this in the compile phase, otherwise the files will be copied
+                                     after this and the web script refresh will not be recognized
+                                -->
                                 <phase>compile</phase>
                                 <goals>
                                     <goal>execute</goal>