[zanata/zanata-server] a9be4c: rhbz980658 separate blob creation into separate me...

GitHub noreply at github.com
Wed Jul 24 06:07:56 UTC 2013 

  Branch: refs/heads/dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: a9be4c35a570466d7a2045cde89662943cf8a379
      https://github.com/zanata/zanata-server/commit/a9be4c35a570466d7a2045cde89662943cf8a379
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java

  Log Message:
  -----------
  rhbz980658 separate blob creation into separate methods


  Commit: 82271ba62297385e4b786a0b95449557c2a54236
      https://github.com/zanata/zanata-server/commit/82271ba62297385e4b786a0b95449557c2a54236
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java

  Log Message:
  -----------
  rhbz980658 move blob methods to separate services


  Commit: 8f83014600d6eec47d19613f6d7f00958b5b6dba
      https://github.com/zanata/zanata-server/commit/8f83014600d6eec47d19613f6d7f00958b5b6dba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  rhbz986145 Check for IO error after each write


  Commit: 184dfa488385d80fb56c587ea94be902205e2c37
      https://github.com/zanata/zanata-server/commit/184dfa488385d80fb56c587ea94be902205e2c37
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  rhbz980658 move code that accesses blobs into blob services


  Commit: 44d2c2381ae4dad609604aff24931b1fb4870bfd
      https://github.com/zanata/zanata-server/commit/44d2c2381ae4dad609604aff24931b1fb4870bfd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java

  Log Message:
  -----------
  Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/okapi/issues/detail?id=342


  Commit: 6b66c90de43b7ff08d99e5f0e7a23002001ba38b
      https://github.com/zanata/zanata-server/commit/6b66c90de43b7ff08d99e5f0e7a23002001ba38b
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

  Log Message:
  -----------
  Merge pull request #61 from zanata/rhbz986145

rhbz986145 Check for IO error after each write


  Commit: aa5f15ef4796c064da335ca3457c07051a75a8d1
      https://github.com/zanata/zanata-server/commit/aa5f15ef4796c064da335ca3457c07051a75a8d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Fix reviewer role checked issue: https://bugzilla.redhat.com/show_bug.cgi?id=986722


  Commit: 916c899d0359240f2aadf429ba12936b4273557c
      https://github.com/zanata/zanata-server/commit/916c899d0359240f2aadf429ba12936b4273557c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java

  Log Message:
  -----------
  Merge pull request #62 from zanata/okapi-0.22

Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/o...


  Commit: 0d3615ae2ecde89c82c742a3bf2e41c3652baa98
      https://github.com/zanata/zanata-server/commit/0d3615ae2ecde89c82c742a3bf2e41c3652baa98
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Merge pull request #63 from zanata/rhbz986722

Fix user checked as reviewer even they are not: https://bugzilla.redhat.com/show_bug.cgi?id=986722


  Commit: 9414b3b773933ff31f7c473b57f730ba9dfb3c24
      https://github.com/zanata/zanata-server/commit/9414b3b773933ff31f7c473b57f730ba9dfb3c24
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  rhbz986785 Ensure that each <tu> has a srclang


  Commit: 81583983d079566b5f6b0c18c7c028e4aef59c77
      https://github.com/zanata/zanata-server/commit/81583983d079566b5f6b0c18c7c028e4aef59c77
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Merge pull request #65 from zanata/rhbz986785

rhbz986785 Ensure that each <tu> has a srclang


  Commit: 6d9029bbc649dcf23ab08de8d49aef75feeb8bf7
      https://github.com/zanata/zanata-server/commit/6d9029bbc649dcf23ab08de8d49aef75feeb8bf7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  rhbz980658 update GetDocumentListHandler to use moved hasPersistedDocument method


  Commit: f13f2b5ea69a73a9be7d119c85e9c721849f07e6
      https://github.com/zanata/zanata-server/commit/f13f2b5ea69a73a9be7d119c85e9c721849f07e6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

  Log Message:
  -----------
  rhbz982916 - force comment on reject


  Commit: 4211ab38e51e51dad7bd29324b842931b25dd1a4
      https://github.com/zanata/zanata-server/commit/4211ab38e51e51dad7bd29324b842931b25dd1a4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java

  Log Message:
  -----------
  rhbz978666 - fix comment change triggering concurrent edit warning


  Commit: bae49776b0661310807eb92f1367b366dc234173
      https://github.com/zanata/zanata-server/commit/bae49776b0661310807eb92f1367b366dc234173
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  add equals and hashcode to GlobalDocumentId


  Commit: 37074d22a947c606ed22a1b42ce783c33d97fc72
      https://github.com/zanata/zanata-server/commit/37074d22a947c606ed22a1b42ce783c33d97fc72
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  rhbz978666 - prevent blank comment


  Commit: c6b5a5e4e7c347d9d9e279de85ef47ccc9683a17
      https://github.com/zanata/zanata-server/commit/c6b5a5e4e7c347d9d9e279de85ef47ccc9683a17
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java

  Log Message:
  -----------
  rhbz982916 - wording change


  Commit: 9fec98006ad6a90f926ea0203f01e8d77c37a992
      https://github.com/zanata/zanata-server/commit/9fec98006ad6a90f926ea0203f01e8d77c37a992
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store web asset url in jndi


  Commit: c9b1878fd488db600c79873a1b2a281686f2adb6
      https://github.com/zanata/zanata-server/commit/c9b1878fd488db600c79873a1b2a281686f2adb6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  wording change


  Commit: 5f2aabede50fb289bb5cf386d8039db72fc29026
      https://github.com/zanata/zanata-server/commit/5f2aabede50fb289bb5cf386d8039db72fc29026
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  rhbz982916 - prevent rejection when it's already in rejected state


  Commit: 9067f4a67ecddfa5ecfebd80063c4dc5c77407f7
      https://github.com/zanata/zanata-server/commit/9067f4a67ecddfa5ecfebd80063c4dc5c77407f7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge pull request #60 from zanata/force-reject-comment

rhbz982916 - force comment on reject


  Commit: f8683469e3fc1f7e8d34978659cfb8573362b711
      https://github.com/zanata/zanata-server/commit/f8683469e3fc1f7e8d34978659cfb8573362b711
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into isolate-file-storage


  Commit: c1fb7262373812c22599a601e36828b40d936a3c
      https://github.com/zanata/zanata-server/commit/c1fb7262373812c22599a601e36828b40d936a3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store only url base in jndi and externalize web asset version into pom.xml


  Commit: f3c20c94b44914f77f0d8bf2e5d7b19474dbcd1b
      https://github.com/zanata/zanata-server/commit/f3c20c94b44914f77f0d8bf2e5d7b19474dbcd1b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  Merge pull request #64 from zanata/isolate-file-storage

Isolate blob file storage


  Commit: e96107bcca34ff09f8dd1107e9d95ca9c601ddee
      https://github.com/zanata/zanata-server/commit/e96107bcca34ff09f8dd1107e9d95ca9c601ddee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  move zanata assets version to componenet.properties


  Commit: 9e18ad6c9cee8710f6e20c66adb34d6e7084302d
      https://github.com/zanata/zanata-server/commit/9e18ad6c9cee8710f6e20c66adb34d6e7084302d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  fix IT test


  Commit: 3fc3e211e190c8269bc2870c5ecd552f125ba7ad
      https://github.com/zanata/zanata-server/commit/3fc3e211e190c8269bc2870c5ecd552f125ba7ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Add workaround for empty ResultSet


  Commit: 902e80b5e839d7b81c6fb1600bc821acb53f29ed
      https://github.com/zanata/zanata-server/commit/902e80b5e839d7b81c6fb1600bc821acb53f29ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  Merge pull request #66 from zanata/globalid-equals

Add equals and hashcode to GlobalDocumentId


  Commit: 17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
      https://github.com/zanata/zanata-server/commit/17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Merge pull request #70 from zanata/rhbz980271

Add workaround for empty ResultSet


  Commit: 6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
      https://github.com/zanata/zanata-server/commit/6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge pull request #67 from zanata/web-assets-url

store web asset url in jndi


  Commit: 4b0a381397076130e144aa50979e4bdf078e0052
      https://github.com/zanata/zanata-server/commit/4b0a381397076130e144aa50979e4bdf078e0052
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml

  Log Message:
  -----------
  implement readonly, obsolete on dashboard


  Commit: 53e80e078948089a5f6d56f0d8e43e807c1b2646
      https://github.com/zanata/zanata-server/commit/53e80e078948089a5f6d56f0d8e43e807c1b2646
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

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

Conflicts:
	zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml


Compare: https://github.com/zanata/zanata-server/compare/01032e7ac47f...53e80e078948

More information about the zanata-commits mailing list