[zanata/zanata-server] c51355: Use a jndi configured infinispan cache instead of ...

GitHub noreply at github.com
Thu Mar 12 04:32:58 UTC 2015


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: c513552187f78dcf7db96af66c6f2b6236c85a71
      https://github.com/zanata/zanata-server/commit/c513552187f78dcf7db96af66c6f2b6236c85a71
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.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/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Use a jndi configured infinispan cache instead of ehcahce.

Need to add this to standalone.xml’s infinispan cache container:
jndi-name="java:jboss/infinispan/container/hibernate" start="EAGER"


  Commit: ada124a6af46f1a3cbd6d9f42594b51812590dd8
      https://github.com/zanata/zanata-server/commit/ada124a6af46f1a3cbd6d9f42594b51812590dd8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  Use infinispan as the hibernate search backend.

This revision handles the whole index in memory.


  Commit: 925f1ded6ae0ab2abc8f9f56e405399ee8c98c50
      https://github.com/zanata/zanata-server/commit/925f1ded6ae0ab2abc8f9f56e405399ee8c98c50
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  WIP: Adding infinispan-backed hibernate search.


  Commit: 9f474f60268e7ed29742407eee135066f4fcf4a4
      https://github.com/zanata/zanata-server/commit/9f474f60268e7ed29742407eee135066f4fcf4a4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Re-instate Lucene version property.


  Commit: 004e10460dd1dab37c1301e30ea77f218510cad4
      https://github.com/zanata/zanata-server/commit/004e10460dd1dab37c1301e30ea77f218510cad4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java

  Log Message:
  -----------
  Change explicit uses of EhCache for Infinispan.

Implement an infinispan cache wrapper.


  Commit: 15ec25329b0728de0d46f37b2f9e7f32c00080ef
      https://github.com/zanata/zanata-server/commit/15ec25329b0728de0d46f37b2f9e7f32c00080ef
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java

  Log Message:
  -----------
  Use injection for the Infinispan cache manager.


  Commit: e6adcdbe401a5d50d72515fe08004ce25a872c50
      https://github.com/zanata/zanata-server/commit/e6adcdbe401a5d50d72515fe08004ce25a872c50
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade hibernate and fix infinispan dependency.

Using hibernate dependency as specified by the JBoss AS 7 bom.


  Commit: cb7e3303b54cfbb30a3a13486107a1fa16b7b19b
      https://github.com/zanata/zanata-server/commit/cb7e3303b54cfbb30a3a13486107a1fa16b7b19b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Add test cache container to unit tests.

This is a memory-only Infinispan cache container.


  Commit: 0fa0a8ea34fe1a5c6463daa29f70f081748df0e4
      https://github.com/zanata/zanata-server/commit/0fa0a8ea34fe1a5c6463daa29f70f081748df0e4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Configure Arquillian integration tests to use Infinispan.

Configuration is kept to in-memory at all times, since persistence should not be needed for integration tests.


  Commit: f1a16afa548e0337514d5a093cf8d6938f08c234
      https://github.com/zanata/zanata-server/commit/f1a16afa548e0337514d5a093cf8d6938f08c234
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  Ammend functional test container configuration to use Infinispan.

Using the same configuration as in integration tests in this revision. It could be adapted to use more production-level settings like cache persistence if so required.


  Commit: 737b8dc0e93e41f63965914dd04c8101456d70a4
      https://github.com/zanata/zanata-server/commit/737b8dc0e93e41f63965914dd04c8101456d70a4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Code review updates for Infinispan caches.


  Commit: f245c4a6c664c6aca687c09c7550a60683fdb8da
      https://github.com/zanata/zanata-server/commit/f245c4a6c664c6aca687c09c7550a60683fdb8da
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M .gitignore
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/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/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/account/changepassword.xhtml
    A zanata-war/src/main/webapp/app/config.json
    A zanata-war/src/main/webapp/app/css/app.css
    A zanata-war/src/main/webapp/app/css/libs.css
    A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
    A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    A zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/app/js/app.js
    A zanata-war/src/main/webapp/app/js/libs.js
    A zanata-war/src/main/webapp/app/js/templates.js
    A zanata-war/src/main/webapp/app/maps/app.js.map
    A zanata-war/src/main/webapp/app/maps/libs.js.map
    A zanata-war/src/main/webapp/app/translations/de.json
    A zanata-war/src/main/webapp/app/translations/fr.json
    A zanata-war/src/main/webapp/app/translations/locales
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

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


  Commit: 71204e9496c71bf6e07f23180c6276bba4f2c694
      https://github.com/zanata/zanata-server/commit/71204e9496c71bf6e07f23180c6276bba4f2c694
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

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

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

Conflicts:
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java


  Commit: db35acc7ba385a9c9d4b6abd22fe674861adce09
      https://github.com/zanata/zanata-server/commit/db35acc7ba385a9c9d4b6abd22fe674861adce09
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/async/Async.java
    A zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskResult.java
    R zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
    R zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    A zanata-war/src/main/java/org/zanata/async/ContainsAsyncMethods.java
    R zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    R zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    R zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    R zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    A zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    A zanata-war/src/main/java/org/zanata/service/TranslationArchiveService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    R zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    A zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
	zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java


  Commit: 7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
      https://github.com/zanata/zanata-server/commit/7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Rollback changes for hibernate search on top of Infinispan.

This will be tackled as a separate pull request, as there are some performance problems with the combination in question that warrant further investigation.


  Commit: 5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
      https://github.com/zanata/zanata-server/commit/5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java

  Log Message:
  -----------
  Make sure Zanata cannot start if the infinispan cache is not configured.


  Commit: b2c6d3b6c833ceed2495701ffca52737a66fea1d
      https://github.com/zanata/zanata-server/commit/b2c6d3b6c833ceed2495701ffca52737a66fea1d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
    M functional-test/src/main/java/org/zanata/util/ScreenshotDirForTest.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/NoScreenshot.java
    M functional-test/src/test/java/org/zanata/util/RetryRule.java
    M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/setup.properties
    A functional-test/src/test/resources/upload-idml.idml
    A functional-test/src/test/resources/upload-odg.odg
    A functional-test/src/test/resources/upload-odp.odp
    A functional-test/src/test/resources/upload-ods.ods
    A functional-test/src/test/resources/upload-odt.odt
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    A zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JSONType.java
    A zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    R zanata-war/src/main/java/org/zanata/ui/ColumnSort.java
    R zanata-war/src/main/java/org/zanata/ui/ColumnSortCompositeComponent.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/fontello/css/fontello.css
    R zanata-war/src/main/webapp/resources/richext/columnSorter.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java


  Commit: 0501b44f5bbb89b6487823d8c5ad064fcf47470c
      https://github.com/zanata/zanata-server/commit/0501b44f5bbb89b6487823d8c5ad064fcf47470c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java

  Log Message:
  -----------
  Refactor initialization logic for cache container.


  Commit: 8d9862f84ceb2824385f4d1c537bd8559336e0d5
      https://github.com/zanata/zanata-server/commit/8d9862f84ceb2824385f4d1c537bd8559336e0d5
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Compilation error fixes.


  Commit: 8dc9f6ceca14e9317da48f9041d5f6e51b307e36
      https://github.com/zanata/zanata-server/commit/8dc9f6ceca14e9317da48f9041d5f6e51b307e36
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    A etc/scripts/cargowait.sh
    A etc/scripts/functional-test-db-snapshot.sh
    A etc/scripts/standalone.cli.messaging.config
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    A functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    R zanata-dist/etc/assembly.xml
    R zanata-dist/etc/sql/config_setup.sql
    R zanata-dist/pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-model/src/test/resources/log4j.xml
    A zanata-overlay/.gitignore
    A zanata-overlay/build.gradle
    A zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    A zanata-overlay/common/bin/zanata-installer/install.bat
    A zanata-overlay/common/bin/zanata-installer/install.sh
    A zanata-overlay/common/bin/zanata-installer/installer.properties
    A zanata-overlay/config/remote-deps.groovy
    A zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    A zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/config/AsyncConfig.java
    A zanata-war/src/main/java/org/zanata/config/ConfigStore.java
    A zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/ksysv.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    R zanata-war/src/main/resources/images/openid/myopenid.png
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    R zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    R zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/test/finished.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/ForceLoadClass.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
    A zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    M zanata-war/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java


  Commit: 17bcbceda57298472cbe470b0d153b528a621023
      https://github.com/zanata/zanata-server/commit/17bcbceda57298472cbe470b0d153b528a621023
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/release-notes.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java
    A mkdocs.yml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/help/edit_help_content.xhtml
    R zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
    A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

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


  Commit: f6bd5b2a61a358a907c8a0fa16d7be3566d60325
      https://github.com/zanata/zanata-server/commit/f6bd5b2a61a358a907c8a0fa16d7be3566d60325
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix maven validation problems.


  Commit: e02cd00544f3f92f4168b80a611000d980f4ec2e
      https://github.com/zanata/zanata-server/commit/e02cd00544f3f92f4168b80a611000d980f4ec2e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java

  Log Message:
  -----------
  Correct checkstyle errors


  Commit: 38cab87c6daee3f3e1230a0ffbfc21d9f153927f
      https://github.com/zanata/zanata-server/commit/38cab87c6daee3f3e1230a0ffbfc21d9f153927f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M docs/release-notes.md
    M mkdocs.yml

  Log Message:
  -----------
  Activate Infinispan configuration documentation.


  Commit: 72a6b50b33e77757c9c46a6016e11669332b5c80
      https://github.com/zanata/zanata-server/commit/72a6b50b33e77757c9c46a6016e11669332b5c80
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Add Infinispan configuration to all standalone.xml instances.


  Commit: 5decdf0ae1656a341f9cc634a0d001b188ae24df
      https://github.com/zanata/zanata-server/commit/5decdf0ae1656a341f9cc634a0d001b188ae24df
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    M docs/release-notes.md
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.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/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #577 from zanata/infinispan

Introduce Infinispan as cache and hibernate back-end

Full functional tests passed. Not attempting a squash merge.


Compare: https://github.com/zanata/zanata-server/compare/8769ce18cded...5decdf0ae165


More information about the zanata-commits mailing list