You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Hervé BOUTEMY <he...@free.fr> on 2011/02/05 10:35:21 UTC
Re: svn commit: r1065840 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/ test/java/org/apache/maven/shared/filtering/ test/units-files/MSHARED-177/
Olivier,
this commit seems to have broken maven-resources-plugin MRESOURCES-77 IT
I don't know if the expected IT result was wrong, or the actual fix
can you have a look at it, please?
Regards,
Hervé
Le lundi 31 janvier 2011, olamy@apache.org a écrit :
> Author: olamy
> Date: Mon Jan 31 22:52:32 2011
> New Revision: 1065840
>
> URL: http://svn.apache.org/viewvc?rev=1065840&view=rev
> Log:
> [MSHARED-177] Filter files are not filtered with already known filter
> values
>
> Added:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/
>
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties (with props)
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties (with props)
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties (with props) Modified:
>
> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilter.java
> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilterTest.java
>
> Modified:
> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilter.java URL:
> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/j
> ava/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=10658
> 40&r1=1065839&r2=1065840&view=diff
> ==========================================================================
> ==== ---
> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilter.java (original) +++
> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilter.java Mon Jan 31 22:52:32 2011 @@ -257,12
> +257,18 @@ public class DefaultMavenFileFilter
> return defaultFilterWrappers;
> }
>
> - private void loadProperties( Properties filterProperties, List /*
> String */propertiesFilePaths, + /**
> + * protected only for testing reason !
> + */
> + protected void loadProperties( Properties filterProperties, List /*
> String */propertiesFilePaths, Properties baseProps )
> throws MavenFilteringException
> {
> if ( propertiesFilePaths != null )
> {
> + Properties workProperties = new Properties();
> + workProperties.putAll(baseProps);
> +
> for ( Iterator iterator = propertiesFilePaths.iterator();
> iterator.hasNext(); ) {
> String filterFile = (String) iterator.next();
> @@ -274,8 +280,9 @@ public class DefaultMavenFileFilter
> try
> {
> // TODO new File should be new
> File(mavenProject.getBasedir(), filterfile ) ? -
> Properties properties = PropertyUtils.loadPropertyFile( new File(
> filterFile ), baseProps ); + Properties properties =
> PropertyUtils.loadPropertyFile( new File( filterFile ), workProperties );
> filterProperties.putAll( properties );
> + workProperties.putAll(properties);
> }
> catch ( IOException e )
> {
>
> Modified:
> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilterTest.java URL:
> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/j
> ava/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=1
> 065840&r1=1065839&r2=1065840&view=diff
> ==========================================================================
> ==== ---
> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilterTest.java (original) +++
> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
> iltering/DefaultMavenFileFilterTest.java Mon Jan 31 22:52:32 2011 @@ -1,6
> +1,8 @@
> package org.apache.maven.shared.filtering;
>
> import java.io.File;
> +import java.util.ArrayList;
> +import java.util.List;
> import java.util.Properties;
>
> import org.codehaus.plexus.PlexusTestCase;
> @@ -32,7 +34,7 @@ import org.codehaus.plexus.util.FileUtil
> public class DefaultMavenFileFilterTest
> extends PlexusTestCase
> {
> -
> +
> File to = new File( getBasedir(), "target/reflection-test.properties"
> );
>
> protected void setUp()
> @@ -101,4 +103,23 @@ public class DefaultMavenFileFilterTest
> // shouldn't fail
> }
>
> + public void testMultiFilterFileInheritance()
> + throws Exception
> + {
> + DefaultMavenFileFilter mavenFileFilter = new
> DefaultMavenFileFilter(); +
> + File testDir = new File(getBasedir(),
> "src/test/units-files/MSHARED-177"); +
> + List filters = new ArrayList();
> +
> + filters.add(new File(testDir,
> "first_filter_file.properties").getAbsolutePath()); +
> filters.add(new File(testDir,
> "second_filter_file.properties").getAbsolutePath()); +
> filters.add(new File(testDir,
> "third_filter_file.properties").getAbsolutePath()); +
> + final Properties filterProperties = new Properties();
> +
> + mavenFileFilter.loadProperties(filterProperties, filters, new
> Properties() ); +
> + assertTrue( filterProperties.getProperty( "third_filter_key"
> ).equals( "first and second" ) ); + }
> }
>
> Added:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties URL:
> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
> nits-files/MSHARED-177/first_filter_file.properties?rev=1065840&view=auto
> ==========================================================================
> ==== ---
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties (added) +++
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,13 @@
> +# Licensed 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.
> +# under the License.
> +first_filter_key=first
> \ No newline at end of file
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:eol-style = native
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
> filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:keywords = Author Date Id Revision
>
> Added:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties URL:
> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
> nits-files/MSHARED-177/second_filter_file.properties?rev=1065840&view=auto
> ==========================================================================
> ==== ---
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties (added) +++
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,15 @@
> +# Licensed 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.
> +# under the License.
> +second_filter_key=second
> +
> +
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:eol-style = native
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
> _filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:keywords = Author Date Id Revision
>
> Added:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties URL:
> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
> nits-files/MSHARED-177/third_filter_file.properties?rev=1065840&view=auto
> ==========================================================================
> ==== ---
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties (added) +++
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,13 @@
> +# Licensed 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.
> +# under the License.
> +third_filter_key=${first_filter_key} and ${second_filter_key}
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:eol-style = native
>
> Propchange:
> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
> filter_file.properties
> --------------------------------------------------------------------------
> ---- svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1065840 - in /maven/shared/trunk/maven-filtering/src:
main/java/org/apache/maven/shared/filtering/ test/java/org/apache/maven/shared/filtering/
test/units-files/MSHARED-177/
Posted by Olivier Lamy <ol...@apache.org>.
Hello,
Fixed.
2011/2/5 Hervé BOUTEMY <he...@free.fr>:
> Olivier,
>
> this commit seems to have broken maven-resources-plugin MRESOURCES-77 IT
>
> I don't know if the expected IT result was wrong, or the actual fix
>
> can you have a look at it, please?
>
> Regards,
>
> Hervé
>
> Le lundi 31 janvier 2011, olamy@apache.org a écrit :
>> Author: olamy
>> Date: Mon Jan 31 22:52:32 2011
>> New Revision: 1065840
>>
>> URL: http://svn.apache.org/viewvc?rev=1065840&view=rev
>> Log:
>> [MSHARED-177] Filter files are not filtered with already known filter
>> values
>>
>> Added:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/
>>
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties (with props)
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties (with props)
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties (with props) Modified:
>>
>> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilter.java
>> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilterTest.java
>>
>> Modified:
>> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilter.java URL:
>> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/j
>> ava/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=10658
>> 40&r1=1065839&r2=1065840&view=diff
>> ==========================================================================
>> ==== ---
>> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilter.java (original) +++
>> maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilter.java Mon Jan 31 22:52:32 2011 @@ -257,12
>> +257,18 @@ public class DefaultMavenFileFilter
>> return defaultFilterWrappers;
>> }
>>
>> - private void loadProperties( Properties filterProperties, List /*
>> String */propertiesFilePaths, + /**
>> + * protected only for testing reason !
>> + */
>> + protected void loadProperties( Properties filterProperties, List /*
>> String */propertiesFilePaths, Properties baseProps )
>> throws MavenFilteringException
>> {
>> if ( propertiesFilePaths != null )
>> {
>> + Properties workProperties = new Properties();
>> + workProperties.putAll(baseProps);
>> +
>> for ( Iterator iterator = propertiesFilePaths.iterator();
>> iterator.hasNext(); ) {
>> String filterFile = (String) iterator.next();
>> @@ -274,8 +280,9 @@ public class DefaultMavenFileFilter
>> try
>> {
>> // TODO new File should be new
>> File(mavenProject.getBasedir(), filterfile ) ? -
>> Properties properties = PropertyUtils.loadPropertyFile( new File(
>> filterFile ), baseProps ); + Properties properties =
>> PropertyUtils.loadPropertyFile( new File( filterFile ), workProperties );
>> filterProperties.putAll( properties );
>> + workProperties.putAll(properties);
>> }
>> catch ( IOException e )
>> {
>>
>> Modified:
>> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilterTest.java URL:
>> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/j
>> ava/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=1
>> 065840&r1=1065839&r2=1065840&view=diff
>> ==========================================================================
>> ==== ---
>> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilterTest.java (original) +++
>> maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/f
>> iltering/DefaultMavenFileFilterTest.java Mon Jan 31 22:52:32 2011 @@ -1,6
>> +1,8 @@
>> package org.apache.maven.shared.filtering;
>>
>> import java.io.File;
>> +import java.util.ArrayList;
>> +import java.util.List;
>> import java.util.Properties;
>>
>> import org.codehaus.plexus.PlexusTestCase;
>> @@ -32,7 +34,7 @@ import org.codehaus.plexus.util.FileUtil
>> public class DefaultMavenFileFilterTest
>> extends PlexusTestCase
>> {
>> -
>> +
>> File to = new File( getBasedir(), "target/reflection-test.properties"
>> );
>>
>> protected void setUp()
>> @@ -101,4 +103,23 @@ public class DefaultMavenFileFilterTest
>> // shouldn't fail
>> }
>>
>> + public void testMultiFilterFileInheritance()
>> + throws Exception
>> + {
>> + DefaultMavenFileFilter mavenFileFilter = new
>> DefaultMavenFileFilter(); +
>> + File testDir = new File(getBasedir(),
>> "src/test/units-files/MSHARED-177"); +
>> + List filters = new ArrayList();
>> +
>> + filters.add(new File(testDir,
>> "first_filter_file.properties").getAbsolutePath()); +
>> filters.add(new File(testDir,
>> "second_filter_file.properties").getAbsolutePath()); +
>> filters.add(new File(testDir,
>> "third_filter_file.properties").getAbsolutePath()); +
>> + final Properties filterProperties = new Properties();
>> +
>> + mavenFileFilter.loadProperties(filterProperties, filters, new
>> Properties() ); +
>> + assertTrue( filterProperties.getProperty( "third_filter_key"
>> ).equals( "first and second" ) ); + }
>> }
>>
>> Added:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties URL:
>> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
>> nits-files/MSHARED-177/first_filter_file.properties?rev=1065840&view=auto
>> ==========================================================================
>> ==== ---
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties (added) +++
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,13 @@
>> +# Licensed 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.
>> +# under the License.
>> +first_filter_key=first
>> \ No newline at end of file
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:eol-style = native
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/first_
>> filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:keywords = Author Date Id Revision
>>
>> Added:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties URL:
>> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
>> nits-files/MSHARED-177/second_filter_file.properties?rev=1065840&view=auto
>> ==========================================================================
>> ==== ---
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties (added) +++
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,15 @@
>> +# Licensed 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.
>> +# under the License.
>> +second_filter_key=second
>> +
>> +
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:eol-style = native
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/second
>> _filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:keywords = Author Date Id Revision
>>
>> Added:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties URL:
>> http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/u
>> nits-files/MSHARED-177/third_filter_file.properties?rev=1065840&view=auto
>> ==========================================================================
>> ==== ---
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties (added) +++
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties Mon Jan 31 22:52:32 2011 @@ -0,0 +1,13 @@
>> +# Licensed 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.
>> +# under the License.
>> +third_filter_key=${first_filter_key} and ${second_filter_key}
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:eol-style = native
>>
>> Propchange:
>> maven/shared/trunk/maven-filtering/src/test/units-files/MSHARED-177/third_
>> filter_file.properties
>> --------------------------------------------------------------------------
>> ---- svn:keywords = Author Date Id Revision
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Olivier Lamy
http://twitter.com/olamy
http://www.linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org