Merge branch 'master' of github.com:zanata/zanata

zanata · Aug 9, 2011 · fc465b1 · fc465b1
2 parents c52e143 + f3a57b9
commit fc465b1
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git a/...a-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java b/...a-client-commands/src/main/java/org/zanata/client/commands/push/AbstractPushStrategy.java
@@ -42,7 +42,7 @@ public abstract class AbstractPushStrategy
    private StringSet extensions;
    private String fileExtension;
 
-   public abstract Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException;
+   public abstract Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes, boolean includeDefaultExclude) throws IOException;
 
    public abstract Resource loadSrcDoc(File sourceDir, String docName) throws IOException;
 
@@ -54,7 +54,7 @@ public AbstractPushStrategy(StringSet extensions, String fileExtension)
       this.fileExtension = fileExtension;
    }
 
-   public String[] getSrcFiles(File srcDir, List<String> includes, List<String> excludes, boolean excludeLocalFileName)
+   public String[] getSrcFiles(File srcDir, List<String> includes, List<String> excludes, boolean excludeLocalFileName, boolean includeDefaultExclude)
    {
       includes.add("**/*" + fileExtension);
       if (excludeLocalFileName)
@@ -63,6 +63,12 @@ public String[] getSrcFiles(File srcDir, List<String> includes, List<String> exc
       }
 
       DirectoryScanner dirScanner = new DirectoryScanner();
+
+      if (includeDefaultExclude)
+      {
+         dirScanner.addDefaultExcludes();
+      }
+
       dirScanner.setBasedir(srcDir);
       dirScanner.setCaseSensitive(false);
       dirScanner.setExcludes((String[]) excludes.toArray(new String[excludes.size()]));

diff --git a/...ata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java b/...ata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
@@ -54,12 +54,12 @@ public GettextDirStrategy()
       super(new StringSet("comment;gettext"), ".pot");
    }
 
-   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException
+   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes, boolean includeDefaultExclude) throws IOException
    {
       Set<String> localDocNames = new HashSet<String>();
 
       // populate localDocNames by looking in pot directory
-      String[] srcFiles = getSrcFiles(srcDir, includes, excludes, false);
+      String[] srcFiles = getSrcFiles(srcDir, includes, excludes, false, includeDefaultExclude);
 
       for (String potName : srcFiles)
       {

diff --git a/...ata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java b/...ata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
@@ -52,11 +52,11 @@ public PropertiesStrategy()
    }
 
    @Override
-   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException
+   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes, boolean includeDefaultExclude) throws IOException
    {
       Set<String> localDocNames = new HashSet<String>();
 
-      String[] files = getSrcFiles(srcDir, includes, excludes, true);
+      String[] files = getSrcFiles(srcDir, includes, excludes, true, includeDefaultExclude);
 
       for (String relativeFilePath : files)
       {

diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
@@ -172,7 +172,7 @@ public void run() throws Exception
       // NB we don't load all the docs into a HashMap, because that would waste
       // memory
 
-      Set<String> localDocNames = strat.findDocNames(sourceDir, opts.getIncludes(), opts.getExcludes());
+      Set<String> localDocNames = strat.findDocNames(sourceDir, opts.getIncludes(), opts.getExcludes(), opts.getDefaultexclude());
       for (String docName : localDocNames)
       {
          log.info("Source file to be uploaded: {}", docName);

diff --git a/...t/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java b/...t/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XliffStrategy.java
@@ -31,12 +31,12 @@ public XliffStrategy()
    }
 
    @Override
-   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException
+   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes, boolean includeDefaultExclude) throws IOException
    {
       sourceFiles = new HashSet<String>();
       Set<String> localDocNames = new HashSet<String>();
 
-      String[] files = getSrcFiles(srcDir, includes, excludes, true);
+      String[] files = getSrcFiles(srcDir, includes, excludes, true, includeDefaultExclude);
 
       for (String relativeFilePath : files)
       {

diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XmlStrategy.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/XmlStrategy.java
@@ -62,11 +62,11 @@ public XmlStrategy()
    }
 
    @Override
-   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException
+   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes, boolean includeDefaultExclude) throws IOException
    {
       Set<String> localDocNames = new HashSet<String>();
 
-      String[] files = getSrcFiles(srcDir, includes, excludes, true);
+      String[] files = getSrcFiles(srcDir, includes, excludes, true, includeDefaultExclude);
 
       for (String relativeFilePath : files)
       {

diff --git a/...nata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java b/...nata-client-commands/src/test/java/org/zanata/client/commands/push/XliffStrategyTest.java
@@ -62,11 +62,12 @@ public void findDocNamesTest() throws IOException
       // EasyMock.expect(mockPushOption.getIncludes()).andReturn(include);
       EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes();
       EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes();
+      EasyMock.expect(mockPushOption.getDefaultexclude()).andReturn(true).anyTimes();
 
       xliffStrategy.setPushOptions(mockPushOption);
       EasyMock.replay(mockPushOption);
 
-      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, new ArrayList<String>());
+      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, new ArrayList<String>(), mockPushOption.getDefaultexclude());
 
       control.verify();
       for (String docName : localDocNames)
@@ -88,11 +89,12 @@ public void loadSrcDocTest() throws IOException
       EasyMock.expect(mockPushOption.getTransDir()).andReturn(sourceDir).anyTimes();
       EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes();
       EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes();
+      EasyMock.expect(mockPushOption.getDefaultexclude()).andReturn(true).anyTimes();
 
       xliffStrategy.setPushOptions(mockPushOption);
       EasyMock.replay(mockPushOption);
 
-      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, new ArrayList<String>());
+      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, new ArrayList<String>(), mockPushOption.getDefaultexclude());
       List<Resource> resourceList = new ArrayList<Resource>();
       for (String docName : localDocNames)
       {
@@ -134,6 +136,7 @@ public void loadSrcDocTestWithExcludeFileOption() throws IOException
       EasyMock.expect(mockPushOption.getTransDir()).andReturn(sourceDir).anyTimes();
       EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes();
       EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes();
+      EasyMock.expect(mockPushOption.getDefaultexclude()).andReturn(true).anyTimes();
 
       List<String> exclude = new ArrayList<String>();
       exclude.add("**/*StringResource*");
@@ -142,7 +145,7 @@ public void loadSrcDocTestWithExcludeFileOption() throws IOException
       xliffStrategy.setPushOptions(mockPushOption);
       EasyMock.replay(mockPushOption);
 
-      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, exclude);
+      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, exclude, mockPushOption.getDefaultexclude());
       List<Resource> resourceList = new ArrayList<Resource>();
       for (String docName : localDocNames)
       {
@@ -184,6 +187,7 @@ public void loadSrcDocTestWithExcludeOption() throws IOException
       EasyMock.expect(mockPushOption.getTransDir()).andReturn(sourceDir).anyTimes();
       EasyMock.expect(mockPushOption.getLocales()).andReturn(locales).anyTimes();
       EasyMock.expect(mockPushOption.getSourceLang()).andReturn("en-US").anyTimes();
+      EasyMock.expect(mockPushOption.getDefaultexclude()).andReturn(true).anyTimes();
 
       List<String> exclude = new ArrayList<String>();
       exclude.add("**/dir2/*");
@@ -192,7 +196,7 @@ public void loadSrcDocTestWithExcludeOption() throws IOException
       xliffStrategy.setPushOptions(mockPushOption);
       EasyMock.replay(mockPushOption);
 
-      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, exclude);
+      Set<String> localDocNames = xliffStrategy.findDocNames(sourceDir, include, exclude, mockPushOption.getDefaultexclude());
       List<Resource> resourceList = new ArrayList<Resource>();
       for (String docName : localDocNames)
       {

diff --git a/client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java b/client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
@@ -6,7 +6,6 @@
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.tools.ant.DirectoryScanner;
 import org.zanata.client.commands.push.PushCommand;
 import org.zanata.client.commands.push.PushOptions;
 
@@ -181,17 +180,10 @@ public List<String> getExcludes()
    {
       String[] excludeList = StringUtils.split(excludes, ",");
       List<String> list = new ArrayList<String>();
-
       if (excludeList != null && excludeList.length > 0)
       {
          Collections.addAll(list, excludeList);
       }
-
-      if (getDefaultexclude())
-      {
-         Collections.addAll(list, DirectoryScanner.getDefaultExcludes());
-      }
-
       return list;
    }