Add a basic filter for FileUtil.copy

As i encountered some copy issues, e.g was not able to copy blank build/ dir, i implemented a basic filter for the FileUtil.copy function. This matches on any XML-File and on includes specified on ManualIncludes list from scm-sync-configuration.

Author: zilmTT

src/main/java/hudson/plugins/scm_sync_configuration/ScmSyncConfigurationBusiness.java

@@ -39,6 +39,7 @@ public class ScmSyncConfigurationBusiness {
     private SCMManipulator scmManipulator;
     private File checkoutScmDirectory = null;
     private ScmSyncConfigurationStatusManager scmSyncConfigurationStatusManager = null;
+    private List<String> manualSynchronizationIncludes = new ArrayList<String>();
 
     /**
      * Use of a size 1 thread pool frees us from worrying about accidental thread death and
@@ -187,8 +188,17 @@ private void processCommitsQueue() {
                             String firstNonExistingParentScmPath = pathRelativeToJenkinsRoot.getFirstNonExistingParentScmPath();
 
                             try {
-                                FileUtils.copyDirectory(JenkinsFilesHelper.buildFileFromPathRelativeToHudsonRoot(pathRelativeToJenkinsRoot.getPath()),
-                                        fileTranslatedInScm);
+                                File buildFileFromPathRelativeToHudsonRoot = JenkinsFilesHelper.buildFileFromPathRelativeToHudsonRoot(pathRelativeToJenkinsRoot.getPath());
+                                FileUtils.copyDirectory(buildFileFromPathRelativeToHudsonRoot, fileTranslatedInScm, new FileFilter() {
+                                  @Override
+                                  public boolean accept(File pathname) {
+                                    if(pathname.getPath().endsWith(".xml")
+                                        || getManualSynchronizationIncludes().contains(pathname)){
+                                      return true;
+                                    }
+                                    return false;
+                                  }
+                                });
                             } catch (IOException e) {
                                 throw new LoggableException("Error while copying file hierarchy to SCM directory", FileUtils.class, "copyDirectory", e);
                             }
@@ -212,7 +222,8 @@ private void processCommitsQueue() {
                 }
                 for(Path path : commit.getChangeset().getPathsToDelete()){
                     List<File> deletedFiles = deleteHierarchy(commit.getScmContext(), path);
-                    updatedFiles.addAll(deletedFiles);
+                    if(deletedFiles != null)
+                      updatedFiles.addAll(deletedFiles);
                 }
 
                 if(updatedFiles.isEmpty()){
@@ -245,6 +256,15 @@ private void processCommitsQueue() {
         }
     }
 
+    public List<String> getManualSynchronizationIncludes() {
+      return manualSynchronizationIncludes;
+    }
+
+    public void setManualSynchronizationIncludes(
+        List<String> manualSynchronizationIncludes) {
+      this.manualSynchronizationIncludes = manualSynchronizationIncludes;
+    }
+
     private boolean writeScmContentOnlyIfItDiffers(Path pathRelativeToJenkinsRoot, byte[] content, File fileTranslatedInScm)
             throws LoggableException {
         boolean scmContentUpdated = false;

src/main/java/hudson/plugins/scm_sync_configuration/ScmSyncConfigurationPlugin.java

@@ -164,6 +164,7 @@ public void loadData(ScmSyncConfigurationPOJO pojo){
         this.displayStatus = pojo.isDisplayStatus();
         this.commitMessagePattern = pojo.getCommitMessagePattern();
         this.manualSynchronizationIncludes = pojo.getManualSynchronizationIncludes();
+        this.business.setManualSynchronizationIncludes(manualSynchronizationIncludes);
     }
 
     protected void initialInit() throws Exception {
@@ -228,6 +229,8 @@ public void configure(StaplerRequest req, JSONObject formData)
             this.manualSynchronizationIncludes = new ArrayList<String>();
         }
 
+        this.business.setManualSynchronizationIncludes(manualSynchronizationIncludes);
+
         // Repo initialization should be made _before_ plugin save, in order to let scm-sync-configuration.xml
         // file synchronizable
         if(repoInitializationRequired){