[zanata/zanata-server] 2d6183: Ensure Lucene indexing in CopyTransServiceImplTest

[GitHub]

  Branch: refs/heads/rhbz1077439
  Home:   https://github.com/zanata/zanata-server
  Commit: 2d6183641e739b00e3d25c54d0d35f4d5cd95d3e
      https://github.com/zanata/zanata-server/commit/2d6183641e739b00e3d25c54d0d35f4d5cd95d3e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Ensure Lucene indexing in CopyTransServiceImplTest


  Commit: 81afeb074023673c49e9cb3d590db3cab4842c7e
      https://github.com/zanata/zanata-server/commit/81afeb074023673c49e9cb3d590db3cab4842c7e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M .gitattributes
    M branch-release.sh
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/FillInTranslationGap.groovy
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/rhbz1077439' into rhbz1077439

Conflicts:
	zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
	zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java


Compare: https://github.com/zanata/zanata-server/compare/ea1069b752b3...81afeb074023