From bc7bf875e317391b8d8893e9080821848325282a Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Thu, 26 Nov 2015 15:46:57 +0000
Subject: [PATCH] Add enforcer for app-name setting, better structure of
 installer poms, ensure web app removal before installing

---
 installer/pom.xml        | 31 +++++++++++++++++++++++++++++++
 installer/solr/pom.xml   | 35 ++++++++++++++++++++++++++++++++---
 installer/webapp/pom.xml | 35 ++++++++++++++++++++++++++++++++---
 3 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/installer/pom.xml b/installer/pom.xml
index 7e029e8b..62d9ee4b 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -89,5 +89,36 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>install</id>
+            <activation>
+                <property><name>vivo-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>1.4.1</version>
+                        <executions>
+                            <execution>
+                                <id>enforce-properties</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireProperty>
+                                            <property>app-name</property>
+                                            <message>You must provide an application name (app-name)</message>
+                                        </requireProperty>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
index 1846d0a6..db3c1978 100644
--- a/installer/solr/pom.xml
+++ b/installer/solr/pom.xml
@@ -21,11 +21,12 @@
 
     <profiles>
         <profile>
-            <id>install</id>
+            <id>package</id>
             <activation>
-                <property><name>vivo-dir</name></property>
+                <property><name>app-name</name></property>
             </activation>
             <build>
+                <finalName>${app-name}solr</finalName>
                 <plugins>
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
@@ -52,6 +53,34 @@
                             </webResources>
                         </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>pinstall</id>
+            <activation>
+                <property><name>tomcat-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>remove-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <delete dir="${tomcat-dir}/webapps/${build.finalName}" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
@@ -71,7 +100,7 @@
                                             <version>${project.version}</version>
                                             <type>war</type>
                                             <overWrite>true</overWrite>
-                                            <outputDirectory>${tomcat-dir}/webapps/${app-name}solr</outputDirectory>
+                                            <outputDirectory>${tomcat-dir}/webapps/${build.finalName}</outputDirectory>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
index e3b75a58..fce1452f 100644
--- a/installer/webapp/pom.xml
+++ b/installer/webapp/pom.xml
@@ -21,11 +21,12 @@
 
     <profiles>
         <profile>
-            <id>install</id>
+            <id>package</id>
             <activation>
-                <property><name>vivo-dir</name></property>
+                <property><name>app-name</name></property>
             </activation>
             <build>
+                <finalName>${app-name}</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +54,34 @@
                             </webResources>
                         </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>pinstall</id>
+            <activation>
+                <property><name>tomcat-dir</name></property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>
+                        <executions>
+                            <execution>
+                                <id>remove-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <delete dir="${tomcat-dir}/webapps/${build.finalName}" />
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
@@ -72,7 +101,7 @@
                                             <version>${project.version}</version>
                                             <type>war</type>
                                             <overWrite>true</overWrite>
-                                            <outputDirectory>${tomcat-dir}/webapps/${app-name}</outputDirectory>
+                                            <outputDirectory>${tomcat-dir}/webapps/${build.finalName}</outputDirectory>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>