[zanata/zanata] f79d7b: AS7 compatibility changes

[GitHub]

  Branch: refs/heads/integration/master
  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


Compare: https://github.com/zanata/zanata/compare/37042c1dfc15...20faa436b0c8