ensure ARCHIVA_BASE works

Previous workaround failed due to the ordering of wrapper.conf, so now we
leave the current mechanism in place, but workaround the APPASM bug by
replacing set.ARCHIVA_BASE=. with set.default.ARCHIVA_BASE=.

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/2.0.0-RC@1563760 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index aa26ebddd408fe1a4990e3d7d6d9180e5c647375..e97fbdcde337d64b74d447c4dc8533b91895c0a9 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -196,25 +196,10 @@
               <goal>generate-daemons</goal>
               <goal>create-repository</goal>
             </goals>
+            <phase>prepare-package</phase>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptor>src/main/assembly/bin.xml</descriptor>
-          <finalName>apache-archiva-${project.version}</finalName>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -235,6 +220,20 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>fix-appassembler-bug</id>
+            <phase>prepare-package</phase>
+            <configuration>
+              <tasks>
+                <replaceregexp
+                  file="target/generated-resources/appassembler/jsw/archiva/conf/wrapper.conf"
+                  match="set.ARCHIVA_BASE" replace="set.default.ARCHIVA_BASE" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -245,6 +244,22 @@
           </supplementalModels>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptor>src/main/assembly/bin.xml</descriptor>
+          <finalName>apache-archiva-${project.version}</finalName>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>