Merge branch 'master' into raw-file-upload

Conflicts: zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java Methods removed in both branches. Removed all.
zanata · Oct 18, 2012 · 87eef70 · 87eef70
2 parents 103fa4b + 5e85fb4
commit 87eef70
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 32 deletions.
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
@@ -111,10 +111,6 @@ private void logOptions()
       log.info("Source language: {}", getOpts().getSourceLang());
       log.info("Copy previous translations: {}", getOpts().getCopyTrans());
       log.info("Merge type: {}", getOpts().getMergeType());
-      if (pushTrans() && mergeAuto())
-      {
-         log.info("Batch size: {}", getOpts().getBatchSize());
-      }
       log.info("Enable modules: {}", getOpts().getEnableModules());
 
       if (getOpts().getEnableModules())
@@ -177,12 +173,6 @@ private boolean pushTrans()
    public void run() throws Exception
    {
       logOptions();
-
-      if (getOpts().getBatchSize() <= 0)
-      {
-         throw new RuntimeException("Batch size needs to be 1 or more.");
-      }
-
       pushCurrentModule();
 
       if (pushSource() && getOpts().getEnableModules() && getOpts().isRootModule())

diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
@@ -30,6 +30,5 @@
 public interface PushOptions extends CommonPushOptions
 {
    public boolean getCopyTrans();
-   public int getBatchSize();
 }
 
diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
@@ -148,7 +148,6 @@ private PushCommand generatePushCommand(boolean pushTrans, boolean mapLocale) th
       opts.excludes = new ArrayList<String>();
       opts.sourceLang = "en-US";
       opts.mergeType = "auto";
-      opts.batchSize = 100;
       LocaleList locales = new LocaleList();
       if (mapLocale)
       {

diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
@@ -46,7 +46,6 @@ class PushOptionsImpl extends ConfigurableProjectOptionsImpl implements PushOpti
    File transDir;
    File srcDir;
    String sourceLang;
-   int batchSize;
 
    @Override
    public ZanataCommand initCommand()
@@ -188,10 +187,4 @@ public String getModuleSuffix()
       return null;
    }
 
-   @Override
-   public int getBatchSize()
-   {
-      return batchSize;
-   }
-
 }
diff --git a/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java b/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
@@ -121,13 +121,6 @@ public PushCommand initCommand()
     */
    private String[] locales;
 
-   /**
-    * Batch size for large translation file. Only apply for merge="auto"
-    * 
-    * @parameter expression="${zanata.batchSize}" default-value=100
-    */
-   private int batchSize = 100;
-
    // Cached copy of the effective locales to avoid calculating it more than once
    private LocaleList effectiveLocales;
 
@@ -164,12 +157,6 @@ public String getMergeType()
       return merge;
    }
 
-   @Override
-   public int getBatchSize()
-   {
-      return batchSize;
-   }
-
    @Override
    public boolean getDeleteObsoleteModules()
    {