[zanata/zanata] f79d7b: AS7 compatibility changes

Thu Aug 23 06:10:52 UTC 2012

  Branch: refs/heads/rhbz845904
  Home:   https://github.com/zanata/zanata
  Commit: f79d7b1ed1177ec1248545fceecaea39d9f5834b
      https://github.com/zanata/zanata/commit/f79d7b1ed1177ec1248545fceecaea39d9f5834b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  AS7 compatibility changes

Most AS7-specific changes are controlled by the jboss7 Maven profile, but
some are not.  See the AS7 comments in jboss-web.xml and faces-config.xml.

  Commit: 613541cef364035537f5d22e0c4299f9762eb29b
      https://github.com/zanata/zanata/commit/613541cef364035537f5d22e0c4299f9762eb29b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

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

  Log Message:
  -----------
  Fix component name for EventServiceConnectedHandler

  Commit: e9ccd3126c018c29686864433637113644ade477
      https://github.com/zanata/zanata/commit/e9ccd3126c018c29686864433637113644ade477
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.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/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    A zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/stylesheet/2.0.css
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

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

Conflicts:
	pom.xml

  Commit: 8e878c096e5e827e73b6e65bbd3fe5f014db49fa
      https://github.com/zanata/zanata/commit/8e878c096e5e827e73b6e65bbd3fe5f014db49fa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
    M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
    A zanata-war/src/main/java/org/zanata/service/SearchService.java
    A zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java

  Log Message:
  -----------
  Merge remote branch 'origin/integration/master' into integration/master

  Commit: 20faa436b0c80eac01d77cdd99b9e2d9138a460e
      https://github.com/zanata/zanata/commit/20faa436b0c80eac01d77cdd99b9e2d9138a460e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix bad merge

  Commit: ac1ab45615a6042bc17475b90fd02eb0125d91d1
      https://github.com/zanata/zanata/commit/ac1ab45615a6042bc17475b90fd02eb0125d91d1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Update PU names to match AS7 changes

  Commit: 0c549aa710d0c5e3a810d1fadeecf787cb0e0363
      https://github.com/zanata/zanata/commit/0c549aa710d0c5e3a810d1fadeecf787cb0e0363
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java

  Log Message:
  -----------
  Fix stats.xhtml with empty content document

  Commit: 17b988655033f233f3710b74336205bf951ad1c9
      https://github.com/zanata/zanata/commit/17b988655033f233f3710b74336205bf951ad1c9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    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
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

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

  Commit: be5bc1c7317c8ce383c7cb79fad32df6f85f5486
      https://github.com/zanata/zanata/commit/be5bc1c7317c8ce383c7cb79fad32df6f85f5486
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  Fix GWT DevMode

  Commit: d7b541319e811926598814bbf491df4767690d99
      https://github.com/zanata/zanata/commit/d7b541319e811926598814bbf491df4767690d99
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java

  Log Message:
  -----------
  Translation Memory: add column for number of instances, show "Searching..." message when loading

  Commit: 3d105cdd0198f8ae695ca9d16803e3cd84da060b
      https://github.com/zanata/zanata/commit/3d105cdd0198f8ae695ca9d16803e3cd84da060b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml

  Log Message:
  -----------
  Leave more room for Term columns in Glossary View

  Commit: 2a0edae6fcb9b5f069634a73b1a2ffefe8503d4b
      https://github.com/zanata/zanata/commit/2a0edae6fcb9b5f069634a73b1a2ffefe8503d4b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.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
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java

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

  Commit: e13f2ab0aa676a3f37d9fea1d55382dccc49d90a
      https://github.com/zanata/zanata/commit/e13f2ab0aa676a3f37d9fea1d55382dccc49d90a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.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/UiMessages.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/LoadingListDataProvider.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz845904

  Commit: e0cfe434cc53d2b261398355b9ad3f4ac0d69533
      https://github.com/zanata/zanata/commit/e0cfe434cc53d2b261398355b9ad3f4ac0d69533
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Moved options panel to right with icon

  Commit: 61d51328edf66a729b0c788a1ddda282d7cb1b2c
      https://github.com/zanata/zanata/commit/61d51328edf66a729b0c788a1ddda282d7cb1b2c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java

  Log Message:
  -----------
  Work in progress: relocating workspace user into side menu

Compare: https://github.com/zanata/zanata/compare/1bbcee4e06ea...61d51328edf6