From 6b7f9f4ad8bf8f4277ce00ac565ae73c15f38647 Mon Sep 17 00:00:00 2001
From: James William Dumay <jdumay@apache.org>
Date: Fri, 13 Mar 2009 04:54:59 +0000
Subject: [PATCH] MRM-1138 - Fix java.lang.NullPointerException: configuration
 can not be null on startup

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753108 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/pom.xml        | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index f22a975dc..9f650e114 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -356,6 +356,19 @@
               </tasks>
             </configuration>
           </execution>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy todir="${basedir}/appserver-base">
+                  <fileset dir="src/appserver-base" />
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -459,25 +472,6 @@
           </roleDefaults>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <copy todir="${basedir}/appserver-base">
-                  <fileset dir="src/appserver-base" />
-                </copy>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <profiles>
-- 
2.39.5