[zanata/zanata] bfd538: Merge branch 'master' into rhbz769471

noreply at github.com noreply at github.com
Mon Jan 2 23:06:03 UTC 2012 

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

  Commit: bfd538e19299ff397b74c799ea945bc5253e8539
      https://github.com/zanata/zanata/commit/bfd538e19299ff397b74c799ea945bc5253e8539
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  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/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/downArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/rightArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/upArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_untranslated.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_untranslated.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  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 'master' into rhbz769471


  Commit: 942b44ce93e958e02afe03bd0e4b31cd95b91a1b
      https://github.com/zanata/zanata/commit/942b44ce93e958e02afe03bd0e4b31cd95b91a1b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  Implement variables validation checks


Compare: https://github.com/zanata/zanata/compare/f768a0d...942b44c

More information about the zanata-commits mailing list