Author: wsmoak
Date: Thu Sep 7 19:54:21 2006
New Revision: 441357
URL: http://svn.apache.org/viewvc?view=rev&rev=441357
Log:
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
Modified:
struts/struts2/trunk/apps/pom.xml
Modified: struts/struts2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?view=diff&rev=441357&r1=441356&r2=441357
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Thu Sep 7 19:54:21 2006
@@ -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>
@@ -141,6 +123,31 @@
<home>${project.build.directory}/tomcat5x</home>
</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>
