[zanata/zanata] 9b12ba: Merge branch '1.4'

noreply at github.com noreply at github.com
Tue Dec 20 02:09:18 UTC 2011 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: 9b12ba801d89ea8c1b5267d5ed860ff623c1d295
      https://github.com/zanata/zanata/commit/9b12ba801d89ea8c1b5267d5ed860ff623c1d295
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	client/zanata-adapter-properties/pom.xml
                Resloved easily, 2 dependencies added in one branch, 1 in another - kept all.

	client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
		logger getter clashed due to class name change, added import lines showed as conflicted but were not

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

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

	common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
		Used renaming from 1.4 branch, had to disable some glossary tests, will fix in future commit

	server/zanata-war/pom.xml
		Some duplicated dependencies, did not seem to be causing problems in 1.5 so kept all


  Commit: 4580bd887d2874113e22bc290c967115e03928a1
      https://github.com/zanata/zanata/commit/4580bd887d2874113e22bc290c967115e03928a1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'merging'


  Commit: f4d73c634bc15f147db68cc4bd0078dbf8780400
      https://github.com/zanata/zanata/commit/f4d73c634bc15f147db68cc4bd0078dbf8780400
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java

  Log Message:
  -----------
  fix typo


Compare: https://github.com/zanata/zanata/compare/d4e942d...f4d73c6

More information about the zanata-commits mailing list