Merge pull request #268 from guusdk/OF-930

OF-930 & OF-935 Fixes

Merge pull request #268 from guusdk/OF-930
OF-930 & OF-935 Fixes
ab480a24 · Guus der Kinderen · 9c8d8887 · fdd5bcfe · ab480a24 · ab480a24
Commit ab480a24 authored Aug 04, 2015 by Guus der Kinderen
Showing with 157 additions and 120 deletions

build.xml build/build.xml +146 -118

overlay.html documentation/docs/overlay.html +1 -1

SubDirInfoTask.java src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java +10 -1

No files found.
--- a/build/build.xml
+++ b/build/build.xml
--- a/documentation/docs/overlay.html
+++ b/documentation/docs/overlay.html
@@ -2,7 +2,7 @@

 <html>
 <head>
-<title>Openfire: Database Installation Guide</title>
+<title>Openfire: Customization Guide</title>
 <link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <body>

--- a/src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java
+++ b/src/tools/anttask/org/jivesoftware/ant/SubDirInfoTask.java
@@ -25,6 +25,9 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;

 /**
 * A simple ant task to return the sub directories of a given dir as a comma delimited string.
@@ -89,6 +92,12 @@ public class SubDirInfoTask extends Task {

    public void execute() throws BuildException {
        // Get the siblings of the given directory, add sub directory names to the property
+        List excepts;
+        if (except != null) {
+            excepts = Arrays.asList( except.split( getDelimiter() ) );
+        } else {
+            excepts = Collections.EMPTY_LIST;
+        }
        File[] subdirs = dir.listFiles();
        StringBuffer buf = new StringBuffer();
        String value = null;
@@ -108,7 +117,7 @@ public class SubDirInfoTask extends Task {
                        add = true;
                    }
                }
-                if (add && !subdir.getName().equals(except)) {
+                if (add && !excepts.contains(subdir.getName())) {
                    buf.append(sep).append(subdir.getName());
                    sep = getDelimiter();
                }