portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r775904 - /portals/pluto/trunk/pluto-testsuite/pom.xml
Date Mon, 18 May 2009 11:39:38 GMT
Author: ate
Date: Mon May 18 11:39:38 2009
New Revision: 775904

URL: http://svn.apache.org/viewvc?rev=775904&view=rev
Log:
Restoring maven-war-plugin and maven-pluto-plugin configuration
Also adding maven-remote-resources-plugin "fix" to for war files so legal files end up in
the right location (META-INF/ instead of WEB-INF/classes/META-INF/).
Because of the m-r-r-plugin fix the ianal-maven-plugin override isn't needed anymore either

Modified:
    portals/pluto/trunk/pluto-testsuite/pom.xml

Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=775904&r1=775903&r2=775904&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Mon May 18 11:39:38 2009
@@ -85,18 +85,39 @@
             </resource>
         </resources>
         <plugins>
+            <!-- configure maven-war-plugin to use updated web.xml -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>ianal-maven-plugin</artifactId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+                </configuration>
+            </plugin>
+            <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
+            <plugin>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>maven-pluto-plugin</artifactId>
+                <version>${pom.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>assemble</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- workaround for war processing of m-r-r-plugin causing the generated NOTICE
and LICENSE file to be put under WEB-INF/classes/META-INF -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>verify-legal-files</goal>
+                            <goal>process</goal>
                         </goals>
                         <configuration>
-                            <searchPaths>
-                                <searchPath>WEB-INF/classes/META-INF</searchPath>
-                            </searchPaths>
+                            <outputDirectory>${project.build.directory}/${build.finalName}</outputDirectory>
+                            <attached>false</attached>
                         </configuration>
                     </execution>
                 </executions>



Mime
View raw message