[zanata/zanata-client] 380b09: Update zanata-common version for: https://bugzilla...

GitHub noreply at github.com
Wed Jan 2 01:19:03 UTC 2013 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-client
  Commit: 380b098a77a8e2d16cfbe6eadfeba601b36608e7
      https://github.com/zanata/zanata-client/commit/380b098a77a8e2d16cfbe6eadfeba601b36608e7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-01 (Tue, 01 Jan 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-common version for: https://bugzilla.redhat.com/show_bug.cgi?id=785046


  Commit: 987e35d9cb2ccd063865c3eaf3a5cfd54171bdb2
      https://github.com/zanata/zanata-client/commit/987e35d9cb2ccd063865c3eaf3a5cfd54171bdb2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-01 (Tue, 01 Jan 2013)

  Changed paths:
    M .gitignore
    M pom.xml
    A zanata-cli/etc/scripts/zanataj
    A zanata-cli/pom.xml
    A zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
    A zanata-cli/src/main/resources/log4j.xml
    A zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java
    R zanata-client-ant-po/.gitignore
    R zanata-client-ant-po/eclipse/DownloadPoTask --help.launch
    R zanata-client-ant-po/eclipse/DownloadPoTask.launch
    R zanata-client-ant-po/eclipse/UploadPoTask --help.launch
    R zanata-client-ant-po/eclipse/UploadPoTask localhost.launch
    R zanata-client-ant-po/flies-ant-demo/build.xml
    R zanata-client-ant-po/flies-ant-demo/pom.xml
    R zanata-client-ant-po/flies-ant-demo/taskdefs.xml
    R zanata-client-ant-po/flies-ant-demo/test1/foo/foo.properties
    R zanata-client-ant-po/flies-ant-demo/test1/foo/foo_de.properties
    R zanata-client-ant-po/flies-ant-demo/test1/test.properties
    R zanata-client-ant-po/flies-ant-demo/test1/test_fr.properties
    R zanata-client-ant-po/pom.xml
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateIterationTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/CreateProjectTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/PutUserTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/UploadPoTask.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/Utility.java
    R zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ZanataTask.java
    R zanata-client-ant-po/src/main/resources/org/zanata/client/ant/po/antlib.xml
    R zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/AbstractBuildTest.java
    R zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
    R zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/RemoteTest.java
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/taskdefs.xml
    R zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
    R zanata-client-ant-po/src/test/resources/test-input/en-US/Book_Info.xml
    R zanata-client-ant-po/src/test/resources/test-input/ja-JP/Book_Info.po
    R zanata-client-ant-po/src/test/resources/test-input/ja-JP/RPM.po
    R zanata-client-ant-po/src/test/resources/test-input/pot/RPM.pot
    R zanata-client-ant-po/src/test/resources/test-input/publican.cfg
    R zanata-client-ant-properties/.gitignore
    R zanata-client-ant-properties/README-TESTING.txt
    R zanata-client-ant-properties/pom.xml
    R zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BasePropertiesSelector.java
    R zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/BaseTask.java
    R zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Docs2PropsTask.java
    R zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Props2DocsTask.java
    R zanata-client-ant-properties/src/main/java/org/zanata/client/ant/properties/Utility.java
    R zanata-client-ant-properties/src/main/resources/org/zanata/client/ant/properties/antlib.xml
    R zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/AbstractBuildTest.java
    R zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
    R zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/RemoteTest.java
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/roundtrip.xml
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/taskdefs.xml
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo.properties
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/foo/foo_de.properties
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test.properties
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test1/test_fr.properties
    R zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
    R zanata-client-ant-properties/zanata-ant-demo/build.xml
    R zanata-client-ant-properties/zanata-ant-demo/pom.xml
    R zanata-client-ant-properties/zanata-ant-demo/taskdefs.xml
    R zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo.properties
    R zanata-client-ant-properties/zanata-ant-demo/test1/foo/foo_de.properties
    R zanata-client-ant-properties/zanata-ant-demo/test1/test.properties
    R zanata-client-ant-properties/zanata-ant-demo/test1/test_fr.properties
    R zanata-client-commands/.gitignore
    M zanata-client-commands/pom.xml
    R zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ArgsUtil.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/BasicOptions.java
    A zanata-client-commands/src/main/java/org/zanata/client/commands/BooleanValueHandler.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteOptionsImpl.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/PublicanPullOptionsImpl.java
    M 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
    A zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullType.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractGettextPullStrategy.java
    A zanata-client-commands/src/main/java/org/zanata/client/commands/pull/AbstractPullStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.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/PullOptions.java
    A zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptionsImpl.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.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/pull/UTF8PropertiesStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
    M zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.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/PushOptions.java
    A zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptionsImpl.java
    R zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushPullType.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/GetStatisticsOptionsImpl.java
    A zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCache.java
    A zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheCollection.java
    A zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheEntry.java
    A zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheReaderWriter.java
    M zanata-client-commands/src/main/java/org/zanata/client/util/ConsoleUtils.java
    R zanata-client-commands/src/test/java/org/zanata/client/ZanataClientTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PropertiesPullStrategyTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    R zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
    M zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
    A zanata-client-commands/src/test/java/org/zanata/client/etag/ETagCacheTest.java
    A zanata-client-commands/src/test/resources/etagcache/etag-cache.xml
    R zanata-client-commands/src/test/resources/log4j.xml
    R zanata-maven-plugin/.gitignore
    M zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
    M zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
    M zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
    R zanata-rest-client/.gitignore
    M zanata-rest-client/pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata-client into integration/master

Conflicts:
	pom.xml


Compare: https://github.com/zanata/zanata-client/compare/46aebd3c3fdf...987e35d9cb2c

More information about the zanata-commits mailing list