From 7dbefd972f40bd2e0d654154ab296aa0df72434a Mon Sep 17 00:00:00 2001
From: Wendy Smoak <wsmoak@apache.org>
Date: Fri, 8 Sep 2006 02:54:21 +0000
Subject: [PATCH] Move the 'copy-sources' antrun plugin execution to
 <build>/<plugins>, so it will execute by default.  (It was incorrectly placed
 in the hostedqa profile.) Make sure the files in src/main/resources get
 included in both WEB-INF/classes and WEB-INF/src. WW-1305

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@441357 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/pom.xml | 51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/apps/pom.xml b/apps/pom.xml
index 446461c51..b5b432ad8 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -66,6 +66,9 @@
                                 <include>**/*.xml</include>
                              </includes>
                      </resource>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                    </resource>
                 </resources>
                 <plugins>
                     <plugin>
@@ -99,32 +102,11 @@
                             </dependency>
                         </dependencies>
                     </plugin>
-         <!-- Include source code under WEB-INF/src/java -->
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>copy-sources</id>
-                  <phase>process-sources</phase>
-                  <configuration>
-                     <tasks>
-                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
-                              failonerror="false">
-                           <fileset dir="${basedir}/src/main/java"/>
-                        </copy>
-                     </tasks>
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -142,6 +124,31 @@
                     </configuration>
                 </configuration>
             </plugin>
+            <!-- Include source code under WEB-INF/src/java -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <tasks>
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/java"/>
+                                </copy>
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/resources"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         
         <finalName>${pom.artifactId}</finalName>