Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the 'copy-sources' antrun plugin execution to <build>/<plugins>, so it will execute by default. (It was incorrectly placed in the hostedqa profile.)

Browse Source 
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
This commit is contained in:
Wendy Smoak
2006-09-08 02:54:21 +00:00
parent df6a1d6e7a
commit 7dbefd972f
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/pom.xml
+29 -22
View File
@@ -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>