[zanata/zanata-server] 7213fb: Merge branch 'integration/master' into rhbz983373

GitHub noreply at github.com
Mon Jul 15 05:25:56 UTC 2013 

  Branch: refs/heads/rhbz983373
  Home:   https://github.com/zanata/zanata-server
  Commit: 7213fb28f30fbb372de12543184451189d24d46c
      https://github.com/zanata/zanata-server/commit/7213fb28f30fbb372de12543184451189d24d46c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A 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/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/resources/TableEditorMessages.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/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
    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/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    A 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/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
	zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
	zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java

More information about the zanata-commits mailing list