From 82b7886a51bbd1fddc85ef1e559772f49973e278 Mon Sep 17 00:00:00 2001
From: "Tom.Vandepoele" <tom.vandepoele@amplexor.com>
Date: Thu, 29 Jun 2017 15:15:54 +0200
Subject: [PATCH] Feature request: adding support for custom solr config #474

---
 .../maven/plugin/AbstractRunMojo.java         | 29 +++++++++++++++++++
 .../org/alfresco/maven/plugin/RunMojo.java    |  1 +
 2 files changed, 30 insertions(+)

diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
index 187cc9e4..86a99d1c 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
@@ -449,6 +449,35 @@ public abstract class AbstractRunMojo extends AbstractMojo {
         );
     }
 
+    /**
+     * Copy custom solr configuration files over, so a 
+     * developer can overwrite any files needed
+     * 
+     * @throws MojoExecutionException
+     */
+    protected void copySolrCustomConfig() throws MojoExecutionException {
+    	getLog().info("Copying custom Solr config");
+        executeMojo(
+                plugin(
+                        groupId("org.apache.maven.plugins"),
+                        artifactId("maven-resources-plugin"),
+                        version(MAVEN_RESOURCE_PLUGIN_VERSION)
+                ),
+                goal("copy-resources"),
+                configuration(
+                        element(name("outputDirectory"), solrHome),
+                        element(name("overwrite"), "true"),
+                        element(name("resources"),
+                                element(name("resource"),
+                                        element(name("directory"), "src/test/resources/solr"),
+                                        element(name("filtering"), "true")
+                                )
+                        )
+                ),
+                execEnv
+        );
+    }
+    
     /**
      * Replace property placeholders in configuration files for the cores, so the
      * index files can be found for each core when Solr starts up.
diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
index 62973acd..0f6e1a08 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
@@ -49,6 +49,7 @@ public class RunMojo extends AbstractRunMojo {
         if (enableSolr) {
             unpackSolrConfig();
             fixSolrHomePath();
+            copySolrCustomConfig();
             replaceSolrConfigProperties();
             installSolr10InLocalRepo();
         }