Author: olamy
Date: Wed Sep 24 13:22:44 2008
New Revision: 698715
URL: http://svn.apache.org/viewvc?rev=698715&view=rev
Log:
add property chain it
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
(with props)
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml?rev=698715&r1=698714&r2=698715&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml Wed Sep 24
13:22:44 2008
@@ -35,6 +35,8 @@
</resources>
<filters>
<filter>src/main/filters/my.filter</filter>
+ <filter>src/main/filters/filter2.properties</filter>
+ <filter>src/main/filters/filter3.properties</filter>
</filters>
<pluginManagement>
<plugins>
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties?rev=698715&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
Wed Sep 24 13:22:44 2008
@@ -0,0 +1,2 @@
+var1=Foo
+var3=${var2}/Thing
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter2.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties?rev=698715&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
Wed Sep 24 13:22:44 2008
@@ -0,0 +1 @@
+var2=${var1}-Bar
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/filter3.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt?rev=698715&r1=698714&r2=698715&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
Wed Sep 24 13:22:44 2008
@@ -11,3 +11,5 @@
test:filter syspropsExecutionPropsWins=${execProps}
[EMAIL PROTECTED]@
+
+var3=${var3}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh?rev=698715&r1=698714&r2=698715&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh Wed Sep
24 13:22:44 2008
@@ -106,7 +106,15 @@
{
System.err.println( "SomeResource.txt not contains newToken=foo" );
return false;
- }
+ }
+
+ //var3=Foo-Bar/Thing
+ indexOf = paramContent.indexOf( "var3=Foo-Bar/Thing" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "SomeResource.txt not contains var3=Foo-Bar/Thing" );
+ return false;
+ }
}
catch( IOException e )
{
