[zanata/zanata-client] 1d992f: remove deprecated publican push and pull commands

GitHub noreply at github.com
Wed Jan 14 00:52:36 UTC 2015


  Branch: refs/heads/fix-formatting
  Home:   https://github.com/zanata/zanata-client
  Commit: 1d992f87ae34158aad1c26194fff7d4848780253
      https://github.com/zanata/zanata-client/commit/1d992f87ae34158aad1c26194fff7d4848780253
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java

  Log Message:
  -----------
  remove deprecated publican push and pull commands


  Commit: 8257ff3c447ae47296690b8c8439bb1a537b502a
      https://github.com/zanata/zanata-client/commit/8257ff3c447ae47296690b8c8439bb1a537b502a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    A mock-server/pom.xml
    A mock-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A mock-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A mock-server/src/main/java/org/zanata/rest/service/MockServerRule.java
    A mock-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A mock-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M pom.xml
    A rest-client/pom.xml
    A rest-client/src/main/java/org/zanata/ManualTest.java
    A rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    A rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    A rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    A rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A rest-client/src/test/resources/log4j.xml
    A rest-client/src/test/resources/test-odt.odt
    A rest-client/src/test/resources/zh-CN/test-odt.odt
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    A zanata-client-commands/src/test/java/org/zanata/client/integraion/FileProjectITCase.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

  Log Message:
  -----------
  create mock zanata rest server


  Commit: 85bbade80857ef09de08a598dc99872f128f6f0a
      https://github.com/zanata/zanata-client/commit/85bbade80857ef09de08a598dc99872f128f6f0a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    R rest-client/pom.xml
    R rest-client/src/main/java/org/zanata/ManualTest.java
    R rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    R rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    R rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    R rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    R rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    R rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    R rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    R rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    R rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    R rest-client/src/test/resources/log4j.xml
    R rest-client/src/test/resources/test-odt.odt
    R rest-client/src/test/resources/zh-CN/test-odt.odt
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  move new client back to zanata-rest-client module


  Commit: 354594150a101b5a49a5ab8735af9e5b6f5e6eb5
      https://github.com/zanata/zanata-client/commit/354594150a101b5a49a5ab8735af9e5b6f5e6eb5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M mock-server/pom.xml
    M mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    M pom.xml
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    R zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    A zanata-client-commands/src/test/java/org/zanata/client/MockitoServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/integraion/FileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  remove resteasy dependency and switch to new client


  Commit: 8eb617005432e6a7ecf7f3693919e7ff2e68055d
      https://github.com/zanata/zanata-client/commit/8eb617005432e6a7ecf7f3693919e7ff2e68055d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M mock-server/pom.xml
    M pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  rhbz1124630 - fix according review comments


  Commit: 9c6ea3e91de9d96b23f285d35840ecf60c60d104
      https://github.com/zanata/zanata-client/commit/9c6ea3e91de9d96b23f285d35840ecf60c60d104
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    R mock-server/pom.xml
    R mock-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    R mock-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    R mock-server/src/main/java/org/zanata/rest/service/MockServerRule.java
    R mock-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    R mock-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M pom.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-rest-client/pom.xml
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java

  Log Message:
  -----------
  rhbz1124630 - rename mock-server module to stub-server


  Commit: 31a21853d3ca837ed078ad1887c710f933578dbb
      https://github.com/zanata/zanata-client/commit/31a21853d3ca837ed078ad1887c710f933578dbb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    A zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    R zanata-client-commands/src/test/java/org/zanata/client/MockitoServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java

  Log Message:
  -----------
  rename MockitoServerRule to MockServerRule


  Commit: ffcc07caa662d87b7d801703b808d2d03ee2469d
      https://github.com/zanata/zanata-client/commit/ffcc07caa662d87b7d801703b808d2d03ee2469d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M stub-server/pom.xml

  Log Message:
  -----------
  rhbz1124630 - remove find-duplicate skip and control httpcomponent version


  Commit: eec55675829ea6d53a719645837c50d2cad112d4
      https://github.com/zanata/zanata-client/commit/eec55675829ea6d53a719645837c50d2cad112d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java

  Log Message:
  -----------
  rhbz1124630 - use explicit path construction

- jersey can not handle path template with regex in path param
- extra url prefix (i.e. rest) will get appended twice using previous method


  Commit: 8fee4de63b6c5b414c96c747255f8eb683e201cc
      https://github.com/zanata/zanata-client/commit/8fee4de63b6c5b414c96c747255f8eb683e201cc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M pom.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

  Log Message:
  -----------
  Merge pull request #37 from zanata/jersey-boys

Rhbz1124630 - remove RESTEasy dependency from client


  Commit: 6c2099ddc2e0d001102c1a700e7b01f1b958de1a
      https://github.com/zanata/zanata-client/commit/6c2099ddc2e0d001102c1a700e7b01f1b958de1a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java

  Log Message:
  -----------
  rhbz1124630 - need to override accept header for some clients to work


  Commit: 93fb090782b855d56fa0f663d6f30e5c1d32eb01
      https://github.com/zanata/zanata-client/commit/93fb090782b855d56fa0f663d6f30e5c1d32eb01
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java

  Log Message:
  -----------
  Merge pull request #39 from zanata/rhbz1124630-jersey

rhbz1124630 - need to override accept header for some clients to work


  Commit: 20970d26fb922603b181c04faad08280ec802f15
      https://github.com/zanata/zanata-client/commit/20970d26fb922603b181c04faad08280ec802f15
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  rhbz1174516 - enable more flexible file mappings rules in podir and gettext project

- when push, podir project will log warning on locales don't have any translation file but won't rely on directory convention
- when push, gettext project will log warning on po file missing locale but won't rely on file name convention


  Commit: 2ba3685c07ab53d81beed6668f28a012a012d863
      https://github.com/zanata/zanata-client/commit/2ba3685c07ab53d81beed6668f28a012a012d863
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Optimization: strip untranslated entries if merge type is NOT import (i.e. auto)

- if after the stripping there is no entries left, we can skip the REST call for that translation file


  Commit: 29cbd7ec6e85e4a42292476fdd15d599cb307cf6
      https://github.com/zanata/zanata-client/commit/29cbd7ec6e85e4a42292476fdd15d599cb307cf6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Merge pull request #40 from zanata/rhbz1174516-podir-filemapping

rhbz1174516 - enable more flexible file mappings rules in podir project


  Commit: 1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
      https://github.com/zanata/zanata-client/commit/1fbfeacd6d59f1b419d16f5bfe351678fc8e7db7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master

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


  Commit: 5e30fc97234c66d1f024ddd9e0549c3bc82ce436
      https://github.com/zanata/zanata-client/commit/5e30fc97234c66d1f024ddd9e0549c3bc82ce436
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  rhbz1124630 - need to add header for all requests


  Commit: 69bb0eab286c3bf4e88004bade27e08732878150
      https://github.com/zanata/zanata-client/commit/69bb0eab286c3bf4e88004bade27e08732878150
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java

  Log Message:
  -----------
  set project type when selecting version in zanata init


  Commit: 5b902fd37cd7cf0064f197f72cb66aa9608fdfb2
      https://github.com/zanata/zanata-client/commit/5b902fd37cd7cf0064f197f72cb66aa9608fdfb2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    M zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java

  Log Message:
  -----------
  Merge pull request #43 from zanata/fix-jersey-change

rhbz1124630 - need to add header for all requests


  Commit: 259510ced07390eb38bd830651cddf1a75954ed4
      https://github.com/zanata/zanata-client/commit/259510ced07390eb38bd830651cddf1a75954ed4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M pom.xml
    A stub-server/pom.xml
    A stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourceUtil.java
    A stub-server/src/main/java/org/zanata/rest/service/MockResourcesApplication.java
    A stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    A stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    A stub-server/src/main/java/org/zanata/rest/service/StubbingServerRule.java
    M zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java
    M zanata-client-commands/pom.xml
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptions.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/gettext/PublicanUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/InitCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectIterationPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/ProjectPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/init/TransConfigPrompt.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/AbstractGettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/GettextPushStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/OfflinePoStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java
    M zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestProjectGenerator.java
    M zanata-client-commands/src/test/java/org/zanata/client/TestUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/HTTPMockContainer.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/InitCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectIterationPromptTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PublicanPullCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/GettextDirStrategyTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PublicanPushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/XliffPushStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullFileProjectITCase.java
    M zanata-client-commands/src/test/java/org/zanata/client/integraion/PushPullGettextITCase.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    R zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    M zanata-rest-client/pom.xml
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AcceptTypeFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AccountClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderDecorator.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ApiKeyHeaderFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CacheResponseFilter.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtil.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/FileResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/GlossaryClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ITranslationResourcesFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectIterationClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/ProjectsClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/RestClientFactory.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/SourceDocResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugFilter.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java
    A zanata-rest-client/src/main/java/org/zanata/rest/client/TransDocResourceClient.java
    R zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AccountClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderFilterTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/AsyncProcessClientTest.java
    R zanata-rest-client/src/test/java/org/zanata/rest/client/ClientUtilityTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/CopyTransClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/FileResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/GlossaryClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/MockServerTestUtil.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectIterationClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/ProjectsClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/RestClientFactoryTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/SourceDocResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    A zanata-rest-client/src/test/java/org/zanata/rest/client/TransDocResourceClientTest.java
    A zanata-rest-client/src/test/resources/test-odt.odt
    A zanata-rest-client/src/test/resources/zh-CN/test-odt.odt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into fix-formatting

Conflicts:
	zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
	zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
	zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java
	zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java


Compare: https://github.com/zanata/zanata-client/compare/fdbdd25198f8...259510ced073


More information about the zanata-commits mailing list