Merge branch 'feature/config-file-filtering' into develop

Author: stefanseifert

.gitignore

@@ -27,3 +27,5 @@ npm-debug.log
 *.sublime-*
 *nbactions*.xml
 .temp/
+
+pom-test.xml

README.md

@@ -11,15 +11,18 @@ In our wcm.io and other Maven-based projects we usually use both m2e Integration
 
 So we maintain a fork of the original plugin here and publish it under Apache 2.0 license within the wcm.io DevOps project.
 
-This fork includes the patch from [MECLIPSE-641](https://issues.apache.org/jira/browse/MECLIPSE-641) which was never applied to the original code base, but is important for generating the eclipse project settings.
+Changes since the original Maven Eclipse Plugin 2.10:
+
+* Patch from [MECLIPSE-641](https://issues.apache.org/jira/browse/MECLIPSE-641) which was never applied to the original code base, but is important for generating the eclipse project settings (since 3.0.0)
+* Add support for `filtering` property on additionalConfig files (since 3.1.0)
 
 To use this in your projects update all your POMs to use
 
 ```xml
 <plugin>
   <groupId>io.wcm.devops.maven.plugins</groupId>
   <artifactId>eclipse-maven-plugin</artifactId>
-  <version>3.0.0</version>
+  <version>3.1.0</version>
 </plugin>
 ```
 

pom.xml

@@ -139,6 +139,16 @@ under the License.
       <artifactId>wagon-provider-api</artifactId>
       <version>2.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-filtering</artifactId>
+      <version>3.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.25</version>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -320,6 +330,7 @@ under the License.
             <excludes combine.children="append">
               <exclude>README-testing.txt</exclude>
               <exclude>README.md</exclude>
+              <exclude>infinitest.filters</exclude>
 
               <!--
                 These files contain several files for eclipse

src/main/java/org/apache/maven/plugin/eclipse/EclipseConfigFile.java

@@ -52,6 +52,8 @@ public class EclipseConfigFile
      * @since 2.5
      */
     private URL url;
+    
+    private boolean filtering;
 
     /**
      * Getter for <code>content</code>.
@@ -132,4 +134,27 @@ public void setURL( URL url )
     {
         this.url = url;
     }
+
+    /**
+     * Filter resource (replace placeholders)
+     * @return if true resources is filtered
+     * 
+     * @since 3.1.0
+     */
+    public boolean isFiltering()
+    {
+        return filtering;
+    }
+
+    /**
+     * Filter resource (replace placeholders)
+     * @param filtering if true resources is filtered
+     * 
+     * @since 3.1.0
+     */
+    public void setFiltering( boolean filtering )
+    {
+        this.filtering = filtering;
+    }
+    
 }

src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

@@ -27,6 +27,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -37,6 +38,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Resource;
@@ -66,6 +68,9 @@
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
 import org.apache.maven.wagon.observers.Debug;
@@ -95,7 +100,7 @@
  * @author <a href="mailto:fgiust@apache.org">Fabrizio Giustina</a>
  * @version $Id$
  */
-@Mojo( name = "eclipse" )
+@Mojo( name = "eclipse", requiresProject = true )
 @Execute( phase = LifecyclePhase.GENERATE_RESOURCES )
 public class EclipsePlugin
     extends AbstractIdeSupportMojo
@@ -647,6 +652,11 @@ public class EclipsePlugin
     @Parameter( property = "eclipse.jeeversion" )
     protected String jeeversion;
 
+    @Component( role = MavenResourcesFiltering.class, hint = "default" )
+    protected MavenResourcesFiltering mavenResourcesFiltering;
+    @Parameter( defaultValue = "${session}" )
+    private MavenSession mavenSession;
+    
     protected final boolean isJavaProject()
     {
         return isJavaProject;
@@ -1337,6 +1347,51 @@ private void writeAdditionalConfig()
                     throw new MojoExecutionException( Messages.getString( "EclipsePlugin.settingsxmlfailure",
                                                                           e.getMessage() ) );
                 }
+                
+                // if configured apply resource filtering on the copied resource
+                if ( projectRelativeFile.exists() && projectRelativeFile.isFile() && file.isFiltering() )
+                {
+                    String encoding = IdeUtils.getCompilerSourceEncoding( project );
+
+                    File outputDir = new File( projectRelativeFile.getParent() + "/_filtered" );
+                    outputDir.mkdirs();
+                    
+                    Resource dummyResource = new Resource();
+                    dummyResource.setDirectory( projectRelativeFile.getParent() );
+                    dummyResource.setIncludes( Arrays.asList( projectRelativeFile.getName() ) );
+                    dummyResource.setFiltering( true );
+                    MavenResourcesExecution exec = new MavenResourcesExecution(
+                            Arrays.asList( dummyResource ),
+                            outputDir,
+                            project,
+                            encoding,
+                            Collections.<String>emptyList(),
+                            Collections.<String>emptyList(),
+                            mavenSession );
+                    try
+                    {
+                        mavenResourcesFiltering.filterResources( exec );
+                    }
+                    catch ( MavenFilteringException ex )
+                    {
+                        throw new MojoExecutionException( "Error filtering resource: "
+                                + projectRelativeFile.getPath(), ex );
+                    }
+                    
+                    File filteredFile = new File( outputDir, projectRelativeFile.getName() );
+                    projectRelativeFile.delete();
+                    try
+                    {
+                        org.apache.commons.io.FileUtils.moveFile( filteredFile, projectRelativeFile );
+                    }
+                    catch ( IOException ex )
+                    {
+                        throw new MojoExecutionException( "Error moving " + filteredFile.getPath() + " to "
+                                + projectRelativeFile.getPath(), ex );
+                    }
+                    outputDir.delete();
+                }
+                
             }
         }
     }