[zanata/zanata] abd4a6: WIP: add search-replace view to translation editor...

Wed Apr 18 03:45:43 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: abd4a64b94ba5ea358399ac0014058f6bd3eafdf
      https://github.com/zanata/zanata/commit/abd4a64b94ba5ea358399ac0014058f6bd3eafdf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  WIP: add search-replace view to translation editor, yet to add content

  Commit: 48b07290c17a5690b63e67352a7d5b02e0a3e652
      https://github.com/zanata/zanata/commit/48b07290c17a5690b63e67352a7d5b02e0a3e652
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java

  Log Message:
  -----------
  add search and project search strings to history

  Commit: 8e8ccda2b7a2214f6af2bc6ff83aec5d44800665
      https://github.com/zanata/zanata/commit/8e8ccda2b7a2214f6af2bc6ff83aec5d44800665
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  update app presenter test to expect search page presenter

  Commit: 054f9936e1ac5cdb20588cac32665aee6e62b47d
      https://github.com/zanata/zanata/commit/054f9936e1ac5cdb20588cac32665aee6e62b47d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java

  Log Message:
  -----------
  add gwt rpc method with rough implementation to search all targets in a project

  Commit: 2335474e2463f16583b6afdfa4e4f5131c8fbb25
      https://github.com/zanata/zanata/commit/2335474e2463f16583b6afdfa4e4f5131c8fbb25
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  add history behaviour for project search

  Commit: de83f432023661d4fac880068bb64d0dab4591c8
      https://github.com/zanata/zanata/commit/de83f432023661d4fac880068bb64d0dab4591c8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  add simple display for project-wide search results

  Commit: 7c794c79aaf20d7b893c974a021602db901bcce5
      https://github.com/zanata/zanata/commit/7c794c79aaf20d7b893c974a021602db901bcce5
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  add button to replace matches in individual targets

also includes some styling to show target content state

  Commit: 97230a808bd7f1cb38f193f6efd828d6a15ce372
      https://github.com/zanata/zanata/commit/97230a808bd7f1cb38f193f6efd828d6a15ce372
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  improve project search results layout and add highlighting

  Commit: e531577dda5dfa7ae5c9e27f34478ae6ec240882
      https://github.com/zanata/zanata/commit/e531577dda5dfa7ae5c9e27f34478ae6ec240882
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java

  Log Message:
  -----------
  show changes to trans units in project-wide search results

  Commit: ac91ab08e84f7c035457aec0f4c75dc9d449390f
      https://github.com/zanata/zanata/commit/ac91ab08e84f7c035457aec0f4c75dc9d449390f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
    M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
    A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
    A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
    A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
    A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
    M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch	
    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
    A server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M server/zanata-war/src/main/resources/db/db.changelog.xml
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
    A server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M server/zanata-war/src/test/resources/META-INF/persistence.xml
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'plurals' into search-replace

  Commit: 9d930c3278862b57a8a278ac38288053cbb0571e
      https://github.com/zanata/zanata/commit/9d930c3278862b57a8a278ac38288053cbb0571e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    A server/zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java

  Log Message:
  -----------
  WIP: adding search service within zanata war

  Commit: fc9df3ab3df0fd2dd191b208ab03f1964a849dad
      https://github.com/zanata/zanata/commit/fc9df3ab3df0fd2dd191b208ab03f1964a849dad
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java

  Log Message:
  -----------
  basic implementation of search service for project-wide search

  Commit: 7b830f257902e4bf53040328a0cea33020532ad1
      https://github.com/zanata/zanata/commit/7b830f257902e4bf53040328a0cea33020532ad1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  fix text styling on project-wide search results

  Commit: 61779e186793fee3d5d8ea14c6c61381ceb42fbc
      https://github.com/zanata/zanata/commit/61779e186793fee3d5d8ea14c6c61381ceb42fbc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
    R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
    M server/zanata-war/src/main/resources/db/db.changelog.xml
    M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
    M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
    M server/zanata-war/src/main/webapp/WEB-INF/liquibase
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
    A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
    A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
    M server/zanata-war/src/test/resources/import.sql
    M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'plurals' into search-replace

  Commit: f839f7dc904603a92167235f585746f8551614ba
      https://github.com/zanata/zanata/commit/f839f7dc904603a92167235f585746f8551614ba
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java

  Log Message:
  -----------
  clean up whitespace

  Commit: 1b7b21f88f1545ddaed83b41e6c8f2a8f15944e1
      https://github.com/zanata/zanata/commit/1b7b21f88f1545ddaed83b41e6c8f2a8f15944e1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

  Log Message:
  -----------
  Index HTextFlowTarget for project-wide search & replace

  Commit: 4ee52497198721b6bbc05b72d32347a17097c619
      https://github.com/zanata/zanata/commit/4ee52497198721b6bbc05b72d32347a17097c619
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java

  Log Message:
  -----------
  Use hibernate search query for project-wide search.

  This replaces the inefficient database query implementation.

  Commit: 7b680a50649be919fc2e327827f14ee381370798
      https://github.com/zanata/zanata/commit/7b680a50649be919fc2e327827f14ee381370798
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-model/pom.xml
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ULowerCaseFilter.java

  Log Message:
  -----------
  Use lucene ngram analyzer instead of okapi ngram analyzer

  Commit: b9208076dc3012a4deb2081a4f75791949b90c60
      https://github.com/zanata/zanata/commit/b9208076dc3012a4deb2081a4f75791949b90c60
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java

  Log Message:
  -----------
  add case-sensitive ngram analyzer

  Commit: e4b9970393eaf7d2cbddc43048875a897aa7f236
      https://github.com/zanata/zanata/commit/e4b9970393eaf7d2cbddc43048875a897aa7f236
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java

  Log Message:
  -----------
  add case sensitive indexing for HTextFlowTarget

  Commit: 0be8210b1c33ba94475e00ce8387a8a2c48f844b
      https://github.com/zanata/zanata/commit/0be8210b1c33ba94475e00ce8387a8a2c48f844b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java

  Log Message:
  -----------
  add case sensitive option to project-wide search backend

  Commit: 4010d30003b1b3a40d2f93805c7390e99b6b1174
      https://github.com/zanata/zanata/commit/4010d30003b1b3a40d2f93805c7390e99b6b1174
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  add case sensitive option to UI on project-wide search and replace page

  Commit: e9b415cee88e0c0bc4380b286a4e73ef81dcbaec
      https://github.com/zanata/zanata/commit/e9b415cee88e0c0bc4380b286a4e73ef81dcbaec
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java

  Log Message:
  -----------
  make project wide search results display in correct order

  Commit: b8ff4eeebe45e92240298c1bab1afb68544c0ffe
      https://github.com/zanata/zanata/commit/b8ff4eeebe45e92240298c1bab1afb68544c0ffe
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java

  Log Message:
  -----------
  clean up search results view code

  Commit: 3d4efc16f2f235c25a3682a41d8fb338d7ff284c
      https://github.com/zanata/zanata/commit/3d4efc16f2f235c25a3682a41d8fb338d7ff284c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml

  Log Message:
  -----------
  Merge branch 'plurals' into search-replace

  Commit: 07a778fa48c7aa28ebbc24216dfb3ce09b20268d
      https://github.com/zanata/zanata/commit/07a778fa48c7aa28ebbc24216dfb3ce09b20268d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/PoUtility.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/ContentFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FuzzyFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/OperatorFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/PhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/SourcePhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TargetPhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopySourceEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasSelectableSource.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigationResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    A server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into search-replace

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
	server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
	server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
        one rule in search-replace branch that I don't remember adding, left in

  Commit: 2d5fd89319e11b10ae39a7e74d8aaa53a603af5b
      https://github.com/zanata/zanata/commit/2d5fd89319e11b10ae39a7e74d8aaa53a603af5b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java

  Log Message:
  -----------
  fix incompatible use of TransUnit in search-replace feature

  Commit: 82caa384adcca6a0758da9c066ec878bfef6671a
      https://github.com/zanata/zanata/commit/82caa384adcca6a0758da9c066ec878bfef6671a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java

  Log Message:
  -----------
  minor

  Commit: 8d6362e7f2d8e84e265ff346a33465ce00b3ccdb
      https://github.com/zanata/zanata/commit/8d6362e7f2d8e84e265ff346a33465ce00b3ccdb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
    M common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
    M common/zanata-common-util/src/main/java/org/zanata/util/HashUtil.java
    M common/zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
    M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
    A server/zanata-war/eclipse/org.eclipse.jdt.core.prefs
    M server/zanata-war/pom.xml
    M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
    A server/zanata-war/src/main/java/org/zanata/action/UserSessionAction.java
    M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/PoUtility.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
    A server/zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M server/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/ContentFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterDisabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterEnabledEventHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FilterPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/FuzzyFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/OperatorFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/PhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/SourcePhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TargetPhraseFilter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/HasDocumentId.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopySourceEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEvent.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationWarningsEventHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasSelectableSource.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasUpdateValidationWarning.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/CopyButtonColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelGlossaryColumn.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelGlossaryColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemorySourceColumn.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TransMemoryTargetColumn.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GwtRpcUtil.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigationResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading-lg.gif
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    A server/zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M server/zanata-war/src/main/webapp/account/activate.xhtml
    M server/zanata-war/src/main/webapp/account/changepassword.xhtml
    M server/zanata-war/src/main/webapp/account/login.xhtml
    M server/zanata-war/src/main/webapp/account/login_input.xhtml
    M server/zanata-war/src/main/webapp/account/logout.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset.xhtml
    M server/zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M server/zanata-war/src/main/webapp/account/register.xhtml
    M server/zanata-war/src/main/webapp/account/validate_email.xhtml
    M server/zanata-war/src/main/webapp/admin/glossary.xhtml
    M server/zanata-war/src/main/webapp/admin/home.xhtml
    M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
    M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M server/zanata-war/src/main/webapp/admin/search.xhtml
    M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M server/zanata-war/src/main/webapp/admin/stats.xhtml
    M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
    M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content.xhtml
    M server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M server/zanata-war/src/main/webapp/error.xhtml
    M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
    M server/zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M server/zanata-war/src/main/webapp/help/view.xhtml
    M server/zanata-war/src/main/webapp/home.xhtml
    M server/zanata-war/src/main/webapp/iteration/edit.xhtml
    M server/zanata-war/src/main/webapp/iteration/files.xhtml
    M server/zanata-war/src/main/webapp/iteration/view.xhtml
    M server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M server/zanata-war/src/main/webapp/language/home.xhtml
    M server/zanata-war/src/main/webapp/language/language.xhtml
    M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
    M server/zanata-war/src/main/webapp/profile/edit.xhtml
    M server/zanata-war/src/main/webapp/profile/view.xhtml
    M server/zanata-war/src/main/webapp/project/add_iteration.xhtml
    M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M server/zanata-war/src/main/webapp/project/create_project.xhtml
    M server/zanata-war/src/main/webapp/project/edit.xhtml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
    M server/zanata-war/src/main/webapp/project/project.xhtml
    M server/zanata-war/src/main/webapp/search.xhtml
    M server/zanata-war/src/main/webapp/stylesheet/zanata.css
    M server/zanata-war/src/test/java/org/zanata/ZanataDBUnitSeamTest.java
    M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'search-replace' of github.com:zanata/zanata into upstream/search-replace

  Commit: 8237bac9ff435c1b9e63e6f9a89598f953ed2924
      https://github.com/zanata/zanata/commit/8237bac9ff435c1b9e63e6f9a89598f953ed2924
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.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/SearchResultsView.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  add search replace link and change UI to cater plural

  Commit: 32e74e3e519f2d6000880b3ea1d7517f4efada4f
      https://github.com/zanata/zanata/commit/32e74e3e519f2d6000880b3ea1d7517f4efada4f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  remove dummy test case

  Commit: 410f1519cc052a1e02e2e87c5d9c0b1f118221fa
      https://github.com/zanata/zanata/commit/410f1519cc052a1e02e2e87c5d9c0b1f118221fa
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceTextResult.java

  Log Message:
  -----------
  replace text on server side - 1. create TranslationService and RPC handler

  Commit: d24060079f831e55fd268d502c93c9bb2c477086
      https://github.com/zanata/zanata/commit/d24060079f831e55fd268d502c93c9bb2c477086
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java

  Log Message:
  -----------
  index plural contents for HTextFlowTarget (add string list bridge)

  Commit: 7c0e70d9899989a57007b00e8d5be74115ffb446
      https://github.com/zanata/zanata/commit/7c0e70d9899989a57007b00e8d5be74115ffb446
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java

  Log Message:
  -----------
  code formatting

  Commit: 1087a7f28d05f14ffabc974b8a6aae2bd2b7533e
      https://github.com/zanata/zanata/commit/1087a7f28d05f14ffabc974b8a6aae2bd2b7533e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java

  Log Message:
  -----------
  update search service to use first content field. Does not yet use additional contents.

  Commit: 48326a1a6fc03c25fcddc4d85a53a5e6296f6408
      https://github.com/zanata/zanata/commit/48326a1a6fc03c25fcddc4d85a53a5e6296f6408
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

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

  Log Message:
  -----------
  update TODO comments for project-wide search service

  Commit: 0881607008e457dff5da8d9042973a72c1fb378b
      https://github.com/zanata/zanata/commit/0881607008e457dff5da8d9042973a72c1fb378b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java

  Log Message:
  -----------
  Merge branch 'search-replace-indexing' into search-replace

  Commit: aa4f0978326119fe54f58ba708b2a36baa215c38
      https://github.com/zanata/zanata/commit/aa4f0978326119fe54f58ba708b2a36baa215c38
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java

  Log Message:
  -----------
  replace text on server side - 2. make UpdateTransUnitHandler to user TranslationService

  Commit: 2f9d0733dc4bafcd5114eadcba932272e4512d33
      https://github.com/zanata/zanata/commit/2f9d0733dc4bafcd5114eadcba932272e4512d33
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java

  Log Message:
  -----------
  simplify and standardize lucene index names for HTextFlowTarget

  Commit: c4b98dce9954124e0b4741f63af939718724f8a4
      https://github.com/zanata/zanata/commit/c4b98dce9954124e0b4741f63af939718724f8a4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java

  Log Message:
  -----------
  search multiple target content fields in project-wide search

  Commit: 09f08d2deca810e2080dcfc36177c4d0ffd7ff39
      https://github.com/zanata/zanata/commit/09f08d2deca810e2080dcfc36177c4d0ffd7ff39
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java

  Log Message:
  -----------
  Merge branch 'search-replace' of github.com:zanata/zanata into search-replace

  Commit: c1222d4befee7f804a8a24cd694897df51553e99
      https://github.com/zanata/zanata/commit/c1222d4befee7f804a8a24cd694897df51553e99
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

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

  Log Message:
  -----------
  UpdateTransUnitHandler to use translation service

  Commit: 91a690dc9c3599924a843343e84edeaa3bbf83f9
      https://github.com/zanata/zanata/commit/91a690dc9c3599924a843343e84edeaa3bbf83f9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml

  Log Message:
  -----------
  use label onclick to change to search-page

  Commit: 1805a20efabe69c12bfe14de5273f8ee4eca6899
      https://github.com/zanata/zanata/commit/1805a20efabe69c12bfe14de5273f8ee4eca6899
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  test search page link

  Commit: b160cf8b0bfd6639cf8f0a2d7a257756c04741e9
      https://github.com/zanata/zanata/commit/b160cf8b0bfd6639cf8f0a2d7a257756c04741e9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  move search replace logic on server with new RPC call

  Commit: 52ee33977f94c5b58d3ed6ece79ef019d949c90e
      https://github.com/zanata/zanata/commit/52ee33977f94c5b58d3ed6ece79ef019d949c90e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Merge branch 'search-replace' of github.com:zanata/zanata into search-replace

  Commit: 59d60db912794ba7bf0a06def8860d41372688d4
      https://github.com/zanata/zanata/commit/59d60db912794ba7bf0a06def8860d41372688d4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceTextResult.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Search and Replace RPC handler

  Commit: a9640c4a2dcc58ca6aa9d2500b86f88e5ca95681
      https://github.com/zanata/zanata/commit/a9640c4a2dcc58ca6aa9d2500b86f88e5ca95681
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  refactor to use TransUnitBuilder and add more tests for ReplaceTextHandler

  Commit: 11f96c14667ecef521913f9748d1beeff9daa06d
      https://github.com/zanata/zanata/commit/11f96c14667ecef521913f9748d1beeff9daa06d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  add selection checkboxes and replace-checked feature to project-wide search results

  Commit: 2601668394dfd4c7b3d7afb955dddd43bbb0d433
      https://github.com/zanata/zanata/commit/2601668394dfd4c7b3d7afb955dddd43bbb0d433
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  Merge branch 'search-replace' of github.com:zanata/zanata into search-replace

  Commit: 37650f5e4283fc745ed81e4eb0b307d4c377d941
      https://github.com/zanata/zanata/commit/37650f5e4283fc745ed81e4eb0b307d4c377d941
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  refactor to use TransUnit Builder where possible

  Commit: 8b78408d419891048567f602039d24ed69967c8c
      https://github.com/zanata/zanata/commit/8b78408d419891048567f602039d24ed69967c8c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml

  Log Message:
  -----------
  Merge branch 'search-replace' of github.com:zanata/zanata into search-replace

  Commit: 59a51815678a07bc3a6848b09d14449a8ea9ac03
      https://github.com/zanata/zanata/commit/59a51815678a07bc3a6848b09d14449a8ea9ac03
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  prevent double state bars on project-wide search results

  Commit: 3cb236bb9d54f877635670ead31c8da96b0cfa4c
      https://github.com/zanata/zanata/commit/3cb236bb9d54f877635670ead31c8da96b0cfa4c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-model/pom.xml
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/CaseSensitiveNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    A server/zanata-model/src/main/java/org/zanata/hibernate/search/ULowerCaseFilter.java
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A server/zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    A server/zanata-war/src/main/java/org/zanata/service/TextFlowSearchService.java
    A server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    A server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.ui.xml
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitLists.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectTransUnitListsResult.java
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
    M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
    A server/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  Merge branch 'search-replace' into integration/master

  Commit: 54df7f5c29b121cbb39ceb6c58ac2e6ba405080b
      https://github.com/zanata/zanata/commit/54df7f5c29b121cbb39ceb6c58ac2e6ba405080b
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java

  Log Message:
  -----------
  rhbz812205 - Change function that determines a translation unit's state.

This change will fix a backward incompatibility with previous server versions.

  Commit: 36a92dccfc5f7b364bc6b5f957f4bf00d206e913
      https://github.com/zanata/zanata/commit/36a92dccfc5f7b364bc6b5f957f4bf00d206e913
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java

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

  Commit: 38156bcfb0d5a0c249377938a3db46a5b71de4e3
      https://github.com/zanata/zanata/commit/38156bcfb0d5a0c249377938a3db46a5b71de4e3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-17 (Tue, 17 Apr 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java

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

Compare: https://github.com/zanata/zanata/compare/67f79b3...38156bc