Author: olamy
Date: Sun Feb 17 14:36:43 2008
New Revision: 628569
URL: http://svn.apache.org/viewvc?rev=628569&view=rev
Log:
[MWAR-144] Custom filter list does not work
add a test for this in it MWAR-96
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/src/main/webapp/index.jsp
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/pom.xml?rev=628569&r1=628568&r2=628569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/pom.xml Sun Feb 17
14:36:43 2008
@@ -23,7 +23,7 @@
<artifactId>MWAR-96</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
- <name>MWAR-96 Maven Webapp</name>
+ <name>MWAR-96 MWAR-144 Tests</name>
<url>http://maven.apache.org</url>
<build>
<plugins>
@@ -32,6 +32,9 @@
<version>@pom.version@</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
+ <filters>
+ <filter>src/main/filters/filter.properties</filter>
+ </filters>
<webResources>
<resource>
<filtering>true</filtering>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/src/main/webapp/index.jsp?rev=628569&r1=628568&r2=628569&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/src/main/webapp/index.jsp
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/src/main/webapp/index.jsp
Sun Feb 17 14:36:43 2008
@@ -18,4 +18,5 @@
-->
<tr><td>java version</td><td>java version : ${java.version}</td></tr>
<tr><td>Project</td><td>${pom.name}</td></tr>
-<tr><td>Version</td><td>${pom.version}</td></tr>
\ No newline at end of file
+<tr><td>Version</td><td>${pom.version}</td></tr>
+<tr><td>custom filter</td><td>${warPluginFilterConfigurationProperty}</td></tr>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh?rev=628569&r1=628568&r2=628569&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-96/verify.bsh Sun Feb 17
14:36:43 2008
@@ -56,6 +56,13 @@
return false;
}
+ indexOf = paramContent.indexOf("<td>okitworks</td>");
+ if ( indexOf < 0)
+ {
+ System.err.println( "index.jsp not contains <td>okitworks</td>" );
+ return false;
+ }
+
}
catch( Throwable e )
{
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=628569&r1=628568&r2=628569&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Sun Feb 17 14:36:43 2008
@@ -122,8 +122,8 @@
/**
* Filters (property files) to include during the interpolation of the
pom.xml.
- *
- * @parameter expression="${project.build.filters}"
+
+ * @parameter
*/
private List filters;
