Move ZanataClient to new module zanata-cli; add push command

.gitignore

@@ -1,8 +1,9 @@
 /target/
 /*/target/
 *~
-/.settings
-/.project
+.classpath
+.project
+.settings
 *.iml
 */bin/
 test-output/

pom.xml

@@ -25,6 +25,11 @@
 
    <dependencyManagement>
       <dependencies>
+        <dependency>
+            <groupId>org.zanata</groupId>
+            <artifactId>zanata-cli</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.zanata</groupId>
             <artifactId>zanata-client-commands</artifactId>
@@ -64,6 +69,7 @@
    </dependencyManagement>
 
   <modules>
+    <module>zanata-cli</module>
     <module>zanata-client-commands</module>
     <module>zanata-maven-plugin</module>
     <module>zanata-rest-client</module>

zanata-cli/etc/scripts/zanataj

@@ -0,0 +1,2 @@
+#!/bin/bash -e
+exec mvn -q exec:java -Dexec.args="$*"

zanata-cli/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.zanata</groupId>
+		<artifactId>client</artifactId>
+		<version>2.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>zanata-cli</artifactId>
+	<name>Zanata command-line client</name>
+
+    <!-- Should be the same as zanata-client/pom.xml -->
+    <scm>
+        <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
+        <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
+        <url>https://github.com/zanata/zanata-client</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- See the script etc/zanataj -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>org.zanata.client.ZanataClient</mainClass>
+                    <!-- mainly to get logging working: -->
+                    <classpathScope>test</classpathScope>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>args4j</groupId>
+			<artifactId>args4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.zanata</groupId>
+			<artifactId>zanata-client-commands</artifactId>
+		</dependency>
+	</dependencies>
+</project>

zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java → zanata-cli/src/main/java/org/zanata/client/ZanataClient.java

@@ -14,13 +14,14 @@
 import org.zanata.client.commands.BasicOptions;
 import org.zanata.client.commands.BasicOptionsImpl;
 import org.zanata.client.commands.ListRemoteOptionsImpl;
-import org.zanata.client.commands.PublicanPullOptionsImpl;
-import org.zanata.client.commands.PublicanPushOptionsImpl;
+//import org.zanata.client.commands.PublicanPullOptionsImpl;
+//import org.zanata.client.commands.PublicanPushOptionsImpl;
 import org.zanata.client.commands.PutProjectOptionsImpl;
 import org.zanata.client.commands.PutUserOptionsImpl;
 import org.zanata.client.commands.PutVersionOptionsImpl;
 import org.zanata.client.commands.SystemExitStrategy;
 import org.zanata.client.commands.ZanataCommand;
+import org.zanata.client.commands.push.PushOptionsImpl;
 import org.zanata.client.commands.stats.GetStatisticsOptionsImpl;
 import org.zanata.util.VersionUtility;
 
@@ -53,7 +54,7 @@ public ZanataCommand initCommand()
    /**
     * Only for testing (allows access to optionsMap)
     */
-   public ZanataClient()
+   ZanataClient()
    {
       this(new SystemExitStrategy(), System.out, System.err);
    }
@@ -65,8 +66,10 @@ public ZanataClient(AppAbortStrategy strategy, PrintStream out, PrintStream err)
       this.err = err;
       // getOptionsMap().put("listlocal", new ListLocalOptionsImpl());
       getOptionsMap().put("listremote", new ListRemoteOptionsImpl());
-      getOptionsMap().put("publican-push", new PublicanPushOptionsImpl());
-      getOptionsMap().put("publican-pull", new PublicanPullOptionsImpl());
+//      getOptionsMap().put("publican-push", new PublicanPushOptionsImpl());
+//      getOptionsMap().put("publican-pull", new PublicanPullOptionsImpl());
+//      getOptionsMap().put("pull", new PullOptionsImpl());
+      getOptionsMap().put("push", new PushOptionsImpl());
       getOptionsMap().put("putproject", new PutProjectOptionsImpl());
       getOptionsMap().put("putuser", new PutUserOptionsImpl());
       getOptionsMap().put("putversion", new PutVersionOptionsImpl());

zanata-cli/src/main/resources/log4j.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
+<log4j:configuration>
+	<appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+		<param name="threshold" value="info"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p [%c{1}] - %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="info" />
+		<appender-ref ref="STDOUT" />
+	</root>
+</log4j:configuration>

zanata-client-commands/pom.xml

@@ -9,12 +9,12 @@
 	<artifactId>zanata-client-commands</artifactId>
 	<name>Zanata client commands</name>
 
-   <!-- Should be the same as zanata-client/pom.xml -->
-   <scm>
-      <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
-      <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
-      <url>https://github.com/zanata/zanata-client</url>
-   </scm>
+    <!-- Should be the same as zanata-client/pom.xml -->
+    <scm>
+        <connection>scm:git:git://github.com/zanata/zanata-client.git</connection>
+        <developerConnection>scm:git:git@github.com:zanata/zanata-client.git</developerConnection>
+        <url>https://github.com/zanata/zanata-client</url>
+    </scm>
 
 	<dependencies>
 		<dependency>

zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java

@@ -31,7 +31,7 @@ public interface ConfigurableProjectOptions extends ConfigurableOptions
 
    public String getProjectType();
 
-   @Option(name = "--project-type", metaVar = "PROJTYPE", usage = "Project type  This value is required unless specified in zanata.xml.")
+   @Option(aliases = { "-T" }, name = "--project-type", metaVar = "PROJTYPE", usage = "Project type  This value is required unless specified in zanata.xml.")
    public void setProjectType(String projectType);
 
    public File getProjectConfig();

zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java

@@ -160,4 +160,8 @@ public static ZanataProxyFactory createRequestFactory(ConfigurableOptions opts)
       }
    }
 
+   public boolean parseBoolean(String s)
+   {
+      return Boolean.parseBoolean(s);
+   }
 }

zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java

@@ -108,6 +108,7 @@ public static void logOptions(Logger logger, PullOptions opts)
       }
       logger.info("Locales to pull: {}", opts.getLocaleMapList());
       logger.info("Encode tab as \\t: {}", opts.getEncodeTabs());
+      logger.info("Current directory: {}", System.getProperty("user.dir"));
       if (opts.getPullType() == PushPullType.Source)
       {
          logger.info("Pulling source documents only");

zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

@@ -151,6 +151,7 @@ else if (opts.getPushType() == PushPullType.Source)
          logger.info("Pushing source and target documents");
          logger.info("Locales to push: {}", opts.getLocaleMapList());
       }
+      logger.info("Current directory: {}", System.getProperty("user.dir"));
       logger.info("Source directory (originals): {}", opts.getSrcDir());
       if (opts.getPushType() == PushPullType.Both || opts.getPushType() == PushPullType.Trans)
       {