Author: olamy
Date: Tue Jan 11 18:27:46 2011
New Revision: 1057785
URL: http://svn.apache.org/viewvc?rev=1057785&view=rev
Log:
[MRESOURCES-110] escapeString is broken - break filtered output
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
(with props)
Added: maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml?rev=1057785&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
(added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
Tue Jan 11 18:27:46 2011
@@ -0,0 +1,45 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.test</groupId>
+ <artifactId>MRESOURCES-110</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>MRESOURCES-110</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <replaceThis>I am the replacement</replaceThis>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5-SNAPSHOT</version>
+ <configuration>
+ <escapeString>!</escapeString>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java?rev=1057785&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
Tue Jan 11 18:27:46 2011
@@ -0,0 +1,13 @@
+package org.test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/java/org/test/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml?rev=1057785&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
Tue Jan 11 18:27:46 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+ <!-- This is a comment ... until filtering ... -->
+ <broken-tag>Why are my !\${\}\! static.content broken if the escapeString
occure ?!?</broken-tag>
+ <broken-tag>Content with replacement: ${replaceThis} !</broken-tag>
+ <broken-tag>Content with escaped replacement: Do not !${replaceThis}
!</broken-tag>
+</root>
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/main/resources/mresources-110.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java?rev=1057785&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
Tue Jan 11 18:27:46 2011
@@ -0,0 +1,38 @@
+package org.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy?rev=1057785&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
Tue Jan 11 18:27:46 2011
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+assert new File(basedir, 'target/classes/mresources-110.xml').exists();
+
+content = new File(basedir, 'target/classes/mresources-110.xml').text;
+assert content.contains( '<broken-tag>Content with replacement: I am the
replacement !</broken-tag>');
+assert content.contains( '<broken-tag>Content with escaped replacement: Do not
${replaceThis} !</broken-tag>');
+
+return true;
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/MRESOURCES-110/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
