Author: olamy
Date: Sun Nov 9 14:32:41 2008
New Revision: 712576
URL: http://svn.apache.org/viewvc?rev=712576&view=rev
Log:
[MWAR-172] Allow specification of escape character to escape filter
interpolation in WAR resources
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/verify.bsh
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
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/web-resources-filtering/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/verify.bsh?rev=712576&r1=712575&r2=712576&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/verify.bsh
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/verify.bsh
Sun Nov 9 14:32:41 2008
@@ -50,8 +50,14 @@
{
System.err.println( "jdbc.url not filtered correctly" );
return false;
- }
-
+ }
+
+ indexOf = paramContent.indexOf( "<Set
name=\"password\">${jdbc.password}</Set>" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "jdbc.password has been filtered" );
+ return false;
+ }
}
catch( IOException e )
{
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/pom.xml?rev=712576&r1=712575&r2=712576&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/pom.xml
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/pom.xml
Sun Nov 9 14:32:41 2008
@@ -33,6 +33,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
+ <escapeString>\</escapeString>
<webResources>
<resource>
<directory>${basedir}/src/main/webresources</directory>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml?rev=712576&r1=712575&r2=712576&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
Sun Nov 9 14:32:41 2008
@@ -2,14 +2,14 @@
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd";>
<Configure class="org.mortbay.jetty.webapp.WebAppContext">
- <New id="MyDS" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/EventdialogDS</Arg>
- <Arg>
- <New class="oracle.jdbc.pool.OracleConnectionPoolDataSource">
- <Set name="URL">${jdbc.url}</Set>
- <Set name="user">${jdbc.user}</Set>
- <Set name="password">${jdbc.password}</Set>
- </New>
- </Arg>
- </New>
+ <New id="MyDS" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>jdbc/EventdialogDS</Arg>
+ <Arg>
+ <New class="oracle.jdbc.pool.OracleConnectionPoolDataSource">
+ <Set name="URL">${jdbc.url}</Set>
+ <Set name="user">${jdbc.user}</Set>
+ <Set name="password">\${jdbc.password}</Set>
+ </New>
+ </Arg>
+ </New>
</Configure>
\ No newline at end of file
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=712576&r1=712575&r2=712576&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 Nov 9 14:32:41 2008
@@ -47,6 +47,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -281,6 +282,14 @@
* @since 2.1-alpha-2
*/
private boolean escapedBackslashesInFilePath = false;
+
+ /**
+ * Expression preceded with the String won't be interpolated
+ * \${foo} will be replaced with ${foo}
+ * @parameter expression="${maven.war.escapeString}"
+ * @since 2.1-beta-1
+ */
+ protected String escapeString;
/**
* The archive configuration to use.
@@ -417,9 +426,12 @@
List defaultFilterWrappers = null;
try
{
+ MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution();
+ mavenResourcesExecution.setEscapeString( escapeString );
+
defaultFilterWrappers = mavenFileFilter.getDefaultFilterWrappers(
project, filters,
escapedBackslashesInFilePath,
-
this.session );
+
this.session, mavenResourcesExecution );
}
catch ( MavenFilteringException e )
