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

Tue Mar 17 05:28:16 UTC 2015

  Branch: refs/heads/update-join-language-page
  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: d801ade2fa49c9c4981607e23aff4701c2464206
      https://github.com/zanata/zanata-server/commit/d801ade2fa49c9c4981607e23aff4701c2464206
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Remove reference of helpContent

  Commit: 4236d988e25e4e65de4044df1b3ad6fb7fdef29f
      https://github.com/zanata/zanata-server/commit/4236d988e25e4e65de4044df1b3ad6fb7fdef29f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Add plural forms for Sanskrit and Konkani

  Commit: 3572d8d8e54be1aeb07b40162b425ebf751b37f9
      https://github.com/zanata/zanata-server/commit/3572d8d8e54be1aeb07b40162b425ebf751b37f9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

  Log Message:
  -----------
  Update send email id to fix functional test

  Commit: ca23afa754d1533d709f6c4286e4b17b0f86a7e6
      https://github.com/zanata/zanata-server/commit/ca23afa754d1533d709f6c4286e4b17b0f86a7e6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Terms of use settings test

  Commit: 56ed1381417771e6fc6114fac243388c5bc72762
      https://github.com/zanata/zanata-server/commit/56ed1381417771e6fc6114fac243388c5bc72762
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java

  Log Message:
  -----------
  Merge pull request #710 from zanata/fix-functional-test

Update send email id to fix functional test

  Commit: bcb2e36ef8cd3847b3f54836addcd07ec28d7d75
      https://github.com/zanata/zanata-server/commit/bcb2e36ef8cd3847b3f54836addcd07ec28d7d75
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    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
    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/VersionHome.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/impl/ConfigurationServiceImpl.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/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    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
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    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

  Log Message:
  -----------
  Squashed commit of adding locale aliases and updating locale config tabs:

Squashed the following commits:

commit f89db686d7a9a0bcdd1965795cf35b4a7455f518
Author: David Mason <drdmason at gmail.com>
Date:   Wed Mar 4 10:27:52 2015 +1000

    Prevent superfluous update success messages

commit 65d9f6d9e7c75962ae8ce4032a22f591a0b16526
Author: David Mason <drdmason at gmail.com>
Date:   Wed Mar 4 10:23:06 2015 +1000

    Ensure that aliases can be removed when locales are inherited from the server.

commit 6bea61b88232e7a4c1167aaf22395d464c486efb
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 3 22:20:45 2015 +1000

    Ensure that removal of locale aliases works in all cases.

    Aliases were not being removed correctly when removing an alias should
    have caused a version to stop overriding the project locales.

commit dc01901aab5bf501f4c9775ca39950c1776bb9e2
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 15:29:23 2015 +1000

    Do not include locales in generated config file.

commit 5e58e90d520267b2ccb7b1d2cad7b00ccc199fa0
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 14:49:43 2015 +1000

    Show a single message when removing multiple locale aliases in version.

commit 3c86d09eac9a573ed25bb47f5723741d07bae1d1
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 14:27:34 2015 +1000

    Show a single message when enabling multiple locales in version.

commit 16279763d6e9cc87e525905e9c87c9a44b4c3e59
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 12:02:24 2015 +1000

    Show a single message for disabling multiple locales in a version.

    Also overrides updatedMessage() to prevent the printing of an unwanted
    "successfully updated" message.

commit 9806e3bb6493f9c8659091fa1b6534126e4aaefb
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 23 09:10:02 2015 +1000

    Show a single message when removing multiple locale aliases in project.

commit a87fadbe3c123f0c6fb050c2cf8897bd219b76fc
Author: David Mason <drdmason at gmail.com>
Date:   Sat Feb 21 23:07:06 2015 +1000

    Show a single message when enabling multiple locales in project.

    Also eliminates some repeated code.

commit 555214d6c9d314b4d7a12867f9e2f11693572b17
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 19:27:41 2015 +1000

    Show a single message when disabling multiple locales.

    Also changes the message for disabling a single locale, and arranges
    code in ProjectHome.

commit e4fa655e2b385d6660dd3cae6e8ab457dcb6e0a6
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 14:32:41 2015 +1000

    Move empty languages search message.

    Language search message was above the table, now moved below the table
    heading to appear where the search results would be.

    This also incluldes a style improvement on the empty search results
    message and on the messages about empty lists.

commit a7151d93e6658629d458b8387debf40d11689658
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 13:53:05 2015 +1000

    Change text on language inherit button for project-version.

    Was using text from project language settings, which was not a good
    match for the operation in version.

commit 6054a507ee7cb7cf632fb79c805dda6f21d7ee3c
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 13:38:06 2015 +1000

    Change headings in language settings to be consistent.

    There was a mix of terminology with "available", "enabled", "enable",
    "disable". Changed to use "enabled" and "disabled", "enable" and
    "disable" consistently.

commit a8cd77f61b34d091e61849ff1bf471e655ca85c4
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 20 12:12:00 2015 +1000

    Change locale alias tooltip to be more accurate.

    Previous tooltip did not indicate where the locale alias applies,
    and erroneously implied that the alias was interchangable with
    the standard locale code.

commit 62d38a91eea769c00d690fcc9241140d60071b06
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:57:50 2015 +1000

    Use standard function to detect enter key in project settings tab script.

commit 30410ccef14ed82422c18bd1a3631ea7866c16a4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:47:58 2015 +1000

    Move more language settings helper functions to components-script

commit 7a5e9df378a99b728822f7df99178b792f6123eb
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:18:32 2015 +1000

    Move more javascript form locale settings template to script file.

commit b07f562e5a207e23aee6cb30e6229c586b2fe50e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 15:17:12 2015 +1000

    Remove unused functions from language settings code.

commit 13a1a0d0e9a748ea165c55d36a8b94bfc3fccc9b
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 10:02:49 2015 +1000

    Move locale settings javascript to a separate script file.

commit c22a52ddc541f3ef9731cceb59b0dc0971f6344d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 19 09:36:26 2015 +1000

    Move language settings helper functions to components script.

commit 4cf44b9dd105d126950c876a672748d06dbf56c0
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:31:48 2015 +1000

    Extract isEscapeKey() function to components-script.js

commit c89199d47a6ba05e8d45fcc8292b90441b48c60e
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:07:45 2015 +1000

    Use function from components-script in project and version language settings.

commit fdd36b75a65fdf82e7b45e70f18d2a536e761b28
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 15:06:30 2015 +1000

    Refactor components-script.js

    The script had inconsistent use of semicolons, and some needless
    repetition which is better removed.

commit b81018847ebc03f4facba1909a6159a7f424a818
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 14:34:17 2015 +1000

    Prevent type coersion in components script.

    I found numerous uses of == comparison in components-script.js. Use
    of == is error-prone as it can coerce types implicitly, leading to
    unexpected results and unnoticed errors. Use of === is preferred for
    this reason.

commit e354027483bea14a4df9d5e35481789aacb9d95c
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 18 11:30:57 2015 +1000

    Only try to initialize entered locale aliases for existing versions.

    This was causing a null pointer exception when creating a new version,
    which does not need to use any of the locale functionality.

    The new-version template should really use a different action since
    its concerns are so much more limited than the version page.

commit fb17ceaf8bf384c7ead8e25d37f37000f287e5f2
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 16:06:55 2015 +1000

    Remove jsf-impl dependency.

    This was causing a dependency checker error, and removing it does not
    appear to cause any issues.

commit eaf0141c2a2f0a5e4a865c9c23cb8197d5f38ae1
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 15:27:35 2015 +1000

    Fix checkstyle violations.

commit 37bd7b3ed4a783ca94f3f2efb3f0ee75851cbdd1
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 13:40:23 2015 +1000

    Add REST endpoint for version locale list.

    Added a common parent for both the project and version locales endpoint
    to avoid duplicating the code for formatting the locale list response
    entity. This could have been done with a static method on one or the
    other class, or on a utility class. I may yet change to one of those
    approaches.

    Adds a helper method in LocaleServiceImpl to determine whether to get
    the project or version locale aliases, to be consistent with how the
    locale list is similarly differentiated.

commit 7c8f805d3405ee12ebdead2d85a8a3b7e324d59a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 17 09:58:40 2015 +1000

    Refactor project and version home actions.

    Just some renames, removal of dead code and preventing a few compiler
    warnings.

commit 48c58d97b31928ffedf3197fde2b874bc692fdaa
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 16:03:13 2015 +1000

    SQUASH: inline some stuff and remove some dead code

commit 88d6f1e4c3306ff1c47b9771d6686b65a2fd89d1
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 13:44:45 2015 +1000

    SQUASH: add restrictions and remove dead code

commit 5f018a8e88e82feff676fa9ef1a61b1fda8f35d8
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 16 12:27:06 2015 +1000

    SQUASH: getting overrides working properly for locales in VersionHome

    Yet to do:

     - success messages
     - security restrictions
     - variable for text on 'defaults' button
     - make sure values in API are consistent with UI
       (i.e. if !isOverrideLocales() use values from project).

commit 6ad0e68d43d09784ba223f83467359efa788a289
Author: David Mason <drdmason at gmail.com>
Date:   Fri Feb 13 12:07:45 2015 +1000

    Implement HasLanguageSettings in VersionHome.

    Yet to add appropriate restrictions to all operations, or remove
    functions that are no longer called.

commit f5c802f9ff51673395bf75def1a0b230c98a38c9
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 14:04:52 2015 +1000

    Cleanup markdown for project language settings.

commit 2c8303cf020ebcf53ef2c02db04bd98c1de1aa04
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 09:54:09 2015 +1000

    SQUASH: just adding settings-tab-languages and importing it.

commit 80ce815a0c9dd20a8beb0362bb459f6d6b055182
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 12 09:52:39 2015 +1000

    OVERWRITE: just stubs of HasLanguageSettings in VersionHome.java

commit 8f5551e60126e49933df9917423e497deb5abac2
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 11 14:00:10 2015 +1000

    SQUASH remove use of instance

commit 03a8fda447839703167223831d6f42485f786939
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 11 13:31:46 2015 +1000

    Add interface for language list settings backend.

    The interface is not strictly necessary at this point, but it provides
    a compile-time check that an action bean provides everything needed by
    the template, rather than having to deal with runtime errors.

    The interface can also provide a basis for splitting the language
    settings code into separate classes to reduce duplication and move
    closer to a single responsibility per class.

commit 69b5a30bfe7900905ddca88578016112b9512d9d
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 15:42:43 2015 +1000

    Refactor methods in projectHome to be consistent.

    Mainly renaming, with a little tweaking of parameters.
    This change is in preparation for defining a sensible
    interface for language settings interactions.

commit 25a8206b29b7368e408b030f6a40831212c85597
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 14:42:22 2015 +1000

    Add hasLocaleAlias to project home.

    This allows some less semantically meaningful EL expressions to be
    replaced.

commit d1cee94766b7e89cab7a901d226b53dc8e6c3168
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 12:48:05 2015 +1000

    Add override locales property to projectHome.

    The overrideLocales property was being accessed indirectly in several
    locations and from the JSF template. By making it a direct property
    some duplication is removed and the interface to support language
    settings is simplified.

commit 2c3f70279030329bc7de25ae8902a5709c26d69f
Author: David Mason <drdmason at gmail.com>
Date:   Tue Feb 10 12:38:57 2015 +1000

    Add locale aliases property to projectHome.

    The locale aliases were being accessed indirectly on the JSF page,
    which complicated the interface for language settings. This change
    simplifies the interface for supporting language settings.

commit f2a560d0a47fcad8ed88a18e172148f523555a7d
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 15:49:30 2015 +1000

    Use translatable string for language enable button text.

commit 4da24e05db90d1e5e37c768cdcc65fa29514b3d2
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 15:14:05 2015 +1000

    Close the locale edit form when the user presses Escape.

commit 0ba1fbfe59b9ff0c2986d7128cc25d9f435f2800
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 11:54:46 2015 +1000

    Show messages when locale aliases are modified.

    This includes when a locale alias is added, changed or removed,
    and when aliases are removed in bulk operations.

commit c4eb669914a0bfc0f6eb7df97c9e7a2a4f70bc6e
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 9 11:14:22 2015 +1000

    Show messges when languages are added or removed.

commit 4c15332488a7186813941c6f3ad5a6816f198771
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 15:28:09 2015 +1000

    Move language lists to separate file.

    This moves the main content of the language lists to a separate file
    with the language list filter and other related components.

    The language-list-specific scripts are not yet moved to the separate file.

commit 0615a6e141b5d078c0437936930a81cf72040496
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 12:24:01 2015 +1000

    Move empty language list placeholder to separate file.

    This removes more duplication from settings-tab-languages.xhtml

commit e1848fa4ac3be12d6026813809e377620d8b6347
Author: David Mason <drdmason at gmail.com>
Date:   Thu Feb 5 11:51:57 2015 +1000

    Move language list headings and filters to separate file.

    Initial step in removing duplication in language lists.

    Some parameters will become unnecessary when the lists themselves are moved
    into the language list file.

commit e1ed5a658f75815cf7d656ccb2a383472d37b79d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 16:56:04 2015 +1000

    Move project settings languages tab to separate code file.

commit d35ecabe08f3762d34e54cc9528739b6152241dc
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 16:15:06 2015 +1000

    Remove unused buttons for filter textbox clearing

commit d5bbf053a0a2247db280c0526174bb7396421eb7
Author: David Mason <drdmason at gmail.com>
Date:   Wed Feb 4 13:02:13 2015 +1000

    Ensure that non-typed changes to filter text trigger filter.

    Changes such as cut or paste with the mouse or drag-and-drop were not
    triggering filter, since they do not involve a key press. The event
    'oninput' appears to be designed for exactly our purpose: to respond
    to changes in input text value regardless how the value was changed.

    Includes a fallback to respond to typing for browsers that do not
    support 'oninput'.

commit 05e91a7586ce9674f94ff2a819bb40d074436f33
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 17:09:06 2015 +1000

    Ensure locales are enabled when their enable button is clicked.

    This fixes a couple of bugs:

     - The wrong variable was being used, so that locales were not added
    when the enable button was clicked.
     - There was a mistake in how custom locales were initiated when going
    from global default locales to a custom list - the wrong method was
    used so that all locales were added, rather than just the
    enabled-by-default locales.

commit da25b8987fe52b2277cb20b97f83ee206b4bb857
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 16:33:48 2015 +1000

    Ensure list operations are visible when appropriate.

    It was possible to have a language selected in one of the language
    lists, but not see the available operations. This was caused when
    the lists and buttons are updated by ajax but the button visibility
    code has not run. Fixed by triggering a change event on the two
    lists, which causes button visibility to be evaluated and updated.

commit 493f26813146d00d43ee2d3d611db005a46c55ac
Author: David Mason <drdmason at gmail.com>
Date:   Mon Feb 2 16:01:35 2015 +1000

    Filter available locales in the browser.

    This replaces the ajax-based filtering, which had high latency and cleared
    selections.

    This also replaces some optional rendered elements with always-rendered
    elements that are sometimes hidden, so that events can be properly attached.

commit 958d5f5224dd49adebdbb1b1866324f86834fae2
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 17:03:53 2015 +1000

    Move language list UI refresh script to end of language list panel.

    The script is placed at the end of the panel so that it will run after the DOM
    for the panel has been built, so all elements will definitely be available.

    The target element for the checkbox refresh is also changed to be the entire
    panel, since it was missing the select-all checkboxes when being run on only
    the two lists separately.

commit dcf9dce3c70c94245ed28503ba45ec0d1815c024
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 16:53:24 2015 +1000

    Move checkbox reload script to end of reloaded panel.

    This is necessary to ensure that all checkboxes have their facades
    properly refreshed. In the previous position it was missing the
    select-all checkboxes. This is probably also because the selector
    was too specific, specifying only the language items rather than the
    whole area.

commit c1e687b9e52314d7b2ed3af72400ce9107b5412f
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jan 28 12:41:42 2015 +1000

    Filter active locale list as filter text changes.
   This performs a 'live' filter which shows and hides locales in the active list
  as the user types in the filter textbox.
  A placeholder message is shown when no items match the filter text.
   The selection state of each language is maintained when it is hidden. This is
  done on purpose since we considered it better for usability if a language is
  not de-selected unless the user performs an operation that visibly de-selects
  it. This was a little complicated since hidden rows should not be treated as
  selected when they are submitted, and I was not able to clear their selection
  state on submit. Instead, when a selected row is hidden, I clear the check
  state and add the data 'checked-when-visible=true' to the checkbox element. When
  a row is shown and the data is present, the check state is restored and the
  data is cleared.

commit 66fcdca7f6d202efd828f284d93ce1800a57a625
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 15 15:12:57 2015 +1000

    Add component for select all checkbox functionality.

commit 237d9a250ab15581d3583ba4215d21a877b8b41a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 15 13:52:46 2015 +1000

    Add improvements for language project settings page.

commit 6a87a2a9e8308bc11748fe3289a888223ba3a562
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 16:31:23 2015 +1000

    Improve text search component to use newest assets script.

commit 601adede3b1e3ea081a7d22cd7b98bb0d301b9e7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:50:18 2015 +1000

    Finish reworking the locale selection screen.

commit 4ce8df997d5e225667b31e681cc7d69f12a1857d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:49:30 2015 +1000

    Use the new text input component and renderer.

commit 9eb079049c5855c49e01e7c6d25a9ad658fa0fc6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:46:38 2015 +1000

    Add a custom Ajax search component.

    This component allows triggering a JSF action and refreshing an area for performing searches.

commit 372f1694732bb9b9e69140d9466b2838d8f26603
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 13 11:45:21 2015 +1000

    Add a custom input text component.

    Override the default JSF text input renderer so that it allows for extra attributes (placeholder is the only supported extra attribute at this moment)

commit d11b1957e157a012c4ae7ae49788a0011bb4df7d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 8 11:50:07 2015 +1000

    Finish add and remove language functionality.

commit 3a1371cf8e595607dda115229d3e86cd33a35bbc
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jan 8 10:56:41 2015 +1000

    Create new command button custom component.

    This custom component behaves the same as a4j:commandButton, but it's rendered as an html button instead of a link or input element.

commit 6d43203eda7c78bb05421254f535d2289e033c52
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 6 16:42:07 2015 +1000

    Add a custom component for ajax buttons.

    These new components will take care of rendering a loading indicator as well as offer additional options.
    This initial implementation has the very basic options to generate a command link.
    Note: This initial implementation uses JQuery id selectors, which might make it less efficient than other options.

commit 704eb7efe09eef827ad22a90ab40ca02966bd47a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jan 6 13:53:13 2015 +1000

    Add a custom component for ajax links.

    These new components will take care of rendering a loading indicator as well as offer additional options.
    This initial implementation has the very basic options to generate a command link.

commit bcbaf5083e30c8ed3a2808cf8a5dcffe526d47b8
Author: David Mason <drdmason at gmail.com>
Date:   Sun Jan 4 21:40:13 2015 +1000

    BROKEN: attempting to get selection checkbox state visible from ProjectHome

commit 6f11407e89c89b861f78ee530fabd4551d975e3d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 15:35:16 2014 +1000

    WIP: the delete alias button works now

commit e11f4e758d85dafe684ee3f7798ef878495472db
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 15:25:07 2014 +1000

    WIP: disable button is working

commit 8fc00dbd0ef1210a4ebc0e7f44c31682639f5143
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 11:28:10 2014 +1000

    SQUASH: cleaned up and made sure checkboxes come back on refresh

commit da4eb992397fa2fc3db7c488e7991dbc74a893b8
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 24 10:46:23 2014 +1000

    WIP, CLEANUP: select-all checkbox working

commit 8259d0f4bf9a003b493066e4d6f6d77bb471b225
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 18:43:40 2014 +1000

    WIP: did big cleanup on the new script, should be good now. Still should check for those now-unused classes in the elements

commit 7dd248d83a6e559a3587ebb5b77760588ee3a268
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 14:00:25 2014 +1000

    WIP, CLEANUP: working toggle display of buttons and headings on active locales list

commit 6d833fac1ff8b4f650b8c37b78f95b4c8eac75e7
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 13:48:46 2014 +1000

    WIP: script is successfully triggering recheck, just that recheck seems to do nothing

commit 0230642622c169ba80827ca4c85c5e18e9a18770
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 23 12:23:18 2014 +1000

    WIP: wrap final column of enabled languages properly

commit 30a3a95200bb0568efa90bd9eb9bced21c2f602a
Author: David Mason <drdmason at gmail.com>
Date:   Mon Dec 22 15:02:38 2014 +1000

    WIP: show loader and cancel button, move alias input to new layout, remove old layout for enabled languages

commit cb176b916c532fe0715f6c242865cdfac3aebbd3
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 14:50:34 2014 +1000

    WIP: show and hide inline buttons on enabled languages at appropriate times

commit c7b4e34804af171edf3c390f9ff3f5d50c8387cb
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 12:40:54 2014 +1000

    WIP: implementing new design for project language settings tab

commit d8d81d36236e3d79d8d12df1a340ef983c90550a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 18 11:24:14 2014 +1000

    Update to assets version needed for project language settings page

commit 7536e00a9bc09ec36643af52a57c5cfdcefd7e9a
Author: David Mason <drdmason at gmail.com>
Date:   Wed Dec 17 17:12:06 2014 +1000

    Change label on button for using server default languages in a project

commit 37307a28fd8b982ba67e01b1c6a0a5fa96b2416c
Author: David Mason <drdmason at gmail.com>
Date:   Tue Dec 9 18:29:02 2014 +1000

    Add REST endpoint for project locales

commit 062262cb7ffab2d989038284814438ef69914378
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 11 16:39:17 2014 +1000

    Show and set locale alias on project settings page.

     - Displays alias next to the locale id if it exists.
     - Adds a dropdown menu with option to add a locale alias.
     - Adds a hidden inline form to add a locale alias, shown when the menu
       option is selected.

commit 0f395ffdda8100e11eb1dc3c897f3a3d6bfbdee3
Author: David Mason <drdmason at gmail.com>
Date:   Fri Dec 5 11:40:21 2014 +1000

    Add locale aliases to HProjectIteration

commit f4d444a0e98065ec90cdfde9199ee8e8a4b8156e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Dec 4 14:23:35 2014 +1000

    Add locale aliases to HProject

    Adds join table to map locale id to alias string for a project id,
    and updates hibernate entity HProject to use the join table.

  Commit: ed0ebdb26f75f22b559dbf3f5e9288d26643e24b
      https://github.com/zanata/zanata-server/commit/ed0ebdb26f75f22b559dbf3f5e9288d26643e24b
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Ensure that a success message is shown when project about page is updated.

  Commit: bd37a83aeccb5e3f416a5a8f0af5f48fa650f8f9
      https://github.com/zanata/zanata-server/commit/bd37a83aeccb5e3f416a5a8f0af5f48fa650f8f9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #708 from zanata/help-terms-tests

Terms of use settings test

  Commit: 13498ffe650837ab0c06df992f5cc34ec5ce0d45
      https://github.com/zanata/zanata-server/commit/13498ffe650837ab0c06df992f5cc34ec5ce0d45
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Merge pull request #709 from zanata/sa-kok-plurals

Add plural forms for Sanskrit and Konkani

  Commit: c2d1a43810c0923a94a80ef478464e0b2cbe325c
      https://github.com/zanata/zanata-server/commit/c2d1a43810c0923a94a80ef478464e0b2cbe325c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    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
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Fix language tests

Significant changes to language add/remove behaviour in projects.
Moves the test page behaviour to a utility class, as it is shared in
project and version settings.

  Commit: cadeb3d6746d6062780b643f33426b82a48f44dd
      https://github.com/zanata/zanata-server/commit/cadeb3d6746d6062780b643f33426b82a48f44dd
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #713 from zanata/fix-about-message

Ensure that a success message is shown when project about page is updated

  Commit: ec98f244205d9688ed7c8ba904704c7d24c4cf5f
      https://github.com/zanata/zanata-server/commit/ec98f244205d9688ed7c8ba904704c7d24c4cf5f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Merge pull request #707 from zanata/remove-help-content-reference

Remove reference of helpContent

  Commit: 5944a6185c705f80655cee3ee93eae922a448be8
      https://github.com/zanata/zanata-server/commit/5944a6185c705f80655cee3ee93eae922a448be8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 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/configuration/wildfly.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/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
    A mkdocs.yml

  Log Message:
  -----------
  Move documentation to readthedocs.

Move User and Admin manual type documentation to the repository to be built by readthedocs.

  Commit: 979007ba459a36805ef60915630454a0b972e81e
      https://github.com/zanata/zanata-server/commit/979007ba459a36805ef60915630454a0b972e81e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/release-notes/release-notes-3.3.2.md
    A docs/release-notes/release-notes-3.4.md
    A docs/release-notes/release-notes-3.5.md
    A docs/release-notes/release-notes-3.6.md
    M mkdocs.yml

  Log Message:
  -----------
  Add release notes to the docs.

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

  Changed paths:
    M docs/configuration/jms-messaging.md
    R docs/configuration/wildfly.md
    M docs/user-guide/Opening-a-Translation-Project.md
    M docs/user-guide/projects/create-project.md
    M docs/user-guide/projects/create-version.md
    M docs/user-guide/projects/project-settings.md
    M docs/user-guide/projects/upload-strings.md
    M mkdocs.yml

  Log Message:
  -----------
  Documentation fixes.

A few incorrect URLs, and some formatting fixes.

  Commit: 069f6778b461c58533b668afd1d0b0caac5520db
      https://github.com/zanata/zanata-server/commit/069f6778b461c58533b668afd1d0b0caac5520db
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    A docs/release-notes.md
    R docs/release-notes/release-notes-3.3.2.md
    R docs/release-notes/release-notes-3.4.md
    R docs/release-notes/release-notes-3.5.md
    R docs/release-notes/release-notes-3.6.md
    M mkdocs.yml

  Log Message:
  -----------
  Move release notes to a single page.

  Commit: 99d5123707fcdc896ca2dedfa249670ce8b65551
      https://github.com/zanata/zanata-server/commit/99d5123707fcdc896ca2dedfa249670ce8b65551
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-06 (Fri, 06 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
    A mkdocs.yml

  Log Message:
  -----------
  Merge pull request #712 from zanata/readthedocs

Readthedocs

  Commit: 0aadf8c74996d65671aef970dc0513f444aaebc8
      https://github.com/zanata/zanata-server/commit/0aadf8c74996d65671aef970dc0513f444aaebc8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    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
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #714 from zanata/fix-lang-tests

Fix language tests

  Commit: 69ecd10df6e387427c4cc2e5252dd02b73768674
      https://github.com/zanata/zanata-server/commit/69ecd10df6e387427c4cc2e5252dd02b73768674
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Add test for setting a project language alias

  Commit: 0027ae71c4187f8b41119c23a5da1c5b1dffb84e
      https://github.com/zanata/zanata-server/commit/0027ae71c4187f8b41119c23a5da1c5b1dffb84e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #715 from zanata/alias-lang-test

Add test for setting a project language alias

  Commit: 1bab304606750c485c662e6c2d320d3428d4f9b9
      https://github.com/zanata/zanata-server/commit/1bab304606750c485c662e6c2d320d3428d4f9b9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java

  Log Message:
  -----------
  Wait for page silence before and after login

  Commit: 88baf2b754890f1b2248ff21d475a06d84030760
      https://github.com/zanata/zanata-server/commit/88baf2b754890f1b2248ff21d475a06d84030760
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 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/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Reduce unnecessary log warnings

  Commit: f66cff370768e87f71e37b4a0e5c6ffca37562fd
      https://github.com/zanata/zanata-server/commit/f66cff370768e87f71e37b4a0e5c6ffca37562fd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java

  Log Message:
  -----------
  Merge pull request #711 from zanata/wait-around-login

Wait for page silence before and after login

  Commit: 5cf48725f04f8cfb1014daf92babf5ad1ea7187e
      https://github.com/zanata/zanata-server/commit/5cf48725f04f8cfb1014daf92babf5ad1ea7187e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Skip some notifications which have regressed

Error recorded in RHBZ1199852

  Commit: d97eee2537bf1010e46fd21a3c41086fabb63565
      https://github.com/zanata/zanata-server/commit/d97eee2537bf1010e46fd21a3c41086fabb63565
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Merge pull request #718 from zanata/skip-broken-notifications

Skip some notifications which have regressed

  Commit: 9c0e238fb711bbb0fd0f3236f1bde443bbef678e
      https://github.com/zanata/zanata-server/commit/9c0e238fb711bbb0fd0f3236f1bde443bbef678e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update classloader-leak-prevention to 1.12.0

  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: 895a90e27e66c55c861ee3bf8a95a25b4debad64
      https://github.com/zanata/zanata-server/commit/895a90e27e66c55c861ee3bf8a95a25b4debad64
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Administration page settings tests

  Commit: 2838bcf20d960ce9c8153a4ffed64c670328cef3
      https://github.com/zanata/zanata-server/commit/2838bcf20d960ce9c8153a4ffed64c670328cef3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml

  Log Message:
  -----------
  Merge pull request #722 from zanata/admin-page-tests

Administration page settings tests

  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: 1c0294e98365ebcb41e4fc2ef603037cbc203ee2
      https://github.com/zanata/zanata-server/commit/1c0294e98365ebcb41e4fc2ef603037cbc203ee2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Enable reset of the from email and loglevel config options under test

  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: e635b29ddd26ef6ec68d181579df73282089c9b4
      https://github.com/zanata/zanata-server/commit/e635b29ddd26ef6ec68d181579df73282089c9b4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #723 from zanata/allow-logging-config-reset

Enable reset of the from email and loglevel config options under test

  Commit: 76edc6c519aaf5e718f919d73e69472c4f46131b
      https://github.com/zanata/zanata-server/commit/76edc6c519aaf5e718f919d73e69472c4f46131b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java

  Log Message:
  -----------
  rhbz1201080 - when server url is set to empty, it will not reuse previous set value

  Commit: 31ef41ad9828762e7bfb562de6e24e99719a0432
      https://github.com/zanata/zanata-server/commit/31ef41ad9828762e7bfb562de6e24e99719a0432
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  change link in language team permission change email template since we don't have that page anymore

  Commit: 8769ce18cdeda8318c6474a6aa0144f38e015add
      https://github.com/zanata/zanata-server/commit/8769ce18cdeda8318c6474a6aa0144f38e015add
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #725 from zanata/fix-servr-url-bug

Fix servr url bug

  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.

  Commit: b919e90ea615e2443c687216d85934982fc44a7b
      https://github.com/zanata/zanata-server/commit/b919e90ea615e2443c687216d85934982fc44a7b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #720 from zanata/update-leak-prevention

Update classloader-leak-prevention to 1.12.0

  Commit: baef61afe74989d5e2970700c6e10fcfb6efddfb
      https://github.com/zanata/zanata-server/commit/baef61afe74989d5e2970700c6e10fcfb6efddfb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-12 (Thu, 12 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/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #717 from zanata/reduce-logging

Reduce unnecessary log warnings

  Commit: d302e683430b5ecd2ee98279f02ed4b711f04516
      https://github.com/zanata/zanata-server/commit/d302e683430b5ecd2ee98279f02ed4b711f04516
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    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-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Move back to Ehcache for hibernate 2nd level cache.

At least until a solution is found in terms of compatibility between Wildfly (hibernate 4.3, infinispan 6) and EAP (hibernate 4.2, infinispan 5).
Other data caches will still use infinispan.

  Commit: 541fc6c7f37e73a11b23e5c30f8a178d497118a8
      https://github.com/zanata/zanata-server/commit/541fc6c7f37e73a11b23e5c30f8a178d497118a8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md
    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-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Merge pull request #730 from zanata/revert-hibernate-infinispan

Move back to Ehcache for hibernate 2nd level cache.

  Commit: d0b3c45f212b5c7841f1e414e3b807cd9551573e
      https://github.com/zanata/zanata-server/commit/d0b3c45f212b5c7841f1e414e3b807cd9551573e
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md

  Log Message:
  -----------
  Remove some mentions of Hibernate in the docs caches' section.

  Commit: 7f16400f2379acab61ee3af5a0ac990729d9408c
      https://github.com/zanata/zanata-server/commit/7f16400f2379acab61ee3af5a0ac990729d9408c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/infinispan.md

  Log Message:
  -----------
  Merge pull request #731 from zanata/docs-cache-update

Remove some mentions of Hibernate in the docs caches' section.

  Commit: 649a824cb6c6509f75c0b1d0c639be78dbc433b3
      https://github.com/zanata/zanata-server/commit/649a824cb6c6509f75c0b1d0c639be78dbc433b3
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M docs/configuration/authentication.md
    A docs/configuration/installation.md
    A docs/images/project-view-versions.png
    A docs/images/version-view-languages.png
    A docs/user-guide/projects/project-view.md
    A docs/user-guide/versions/version-view.md
    M mkdocs.yml

  Log Message:
  -----------
  Documentation imprevovements.

See Pull Request: https://github.com/zanata/zanata-server/pull/729

Squashed commit of the following:

commit 28f03c1b70c2f4cdeb44a150efb4adb1fefb7885
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Mon Mar 16 08:46:13 2015 +1000

    Documentation spelling errors and other review comments.

commit 2e2bca41c0aef40cd3ab9c3b0d77cc3111f567c1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Mar 12 14:25:36 2015 +1000

    Add installation documentation.

commit add05845332b31b88a1e2158b68169ceb7a45200
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Fri Mar 6 17:49:08 2015 +1000

    Add a project and version view sections.

  Commit: 139982095d4f1aa12ed1913debd2fc0f2e894645
      https://github.com/zanata/zanata-server/commit/139982095d4f1aa12ed1913debd2fc0f2e894645
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-17 (Tue, 17 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/installation.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/project-view-versions.png
    A docs/images/user-dashboard-create-version.png
    A docs/images/version-view-languages.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/project-view.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    A docs/user-guide/versions/version-view.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.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
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.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/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
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    A mkdocs.yml
    M pom.xml
    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-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    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
    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/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    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/config/DatabaseBackedConfig.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/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.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
    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/java/org/zanata/util/ServiceLocator.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/pluralforms.properties
    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/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    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
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/admin/server_configuration.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/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/config/DatabaseBackedConfigTest.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 remote-tracking branch 'origin' into update-join-language-page

  Commit: 1719dfbf5f8c1485822eeb59174d9d8596e43f3e
      https://github.com/zanata/zanata-server/commit/1719dfbf5f8c1485822eeb59174d9d8596e43f3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    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/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Refactor contact admin and coordinator dialog

  Commit: a9d3eac95abcf2b37e55ee0350f5a5475ad1bb6f
      https://github.com/zanata/zanata-server/commit/a9d3eac95abcf2b37e55ee0350f5a5475ad1bb6f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/resources/messages.properties
    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
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Create request join and update role dialog

Compare: https://github.com/zanata/zanata-server/compare/32679e45ff29...a9d3eac95abc