[zanata/zanata-server] 2a1334: Warn on startup if EAP/WildFly too old

GitHub noreply at github.com
Wed Jan 21 06:16:20 UTC 2015


  Branch: refs/heads/cdi-prep
  Home:   https://github.com/zanata/zanata-server
  Commit: 2a133440d53e182c13ff0fc6f792609547283165
      https://github.com/zanata/zanata-server/commit/2a133440d53e182c13ff0fc6f792609547283165
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Warn on startup if EAP/WildFly too old


  Commit: ea7dafb01881c2b02a95bd012f3d6b66128b681a
      https://github.com/zanata/zanata-server/commit/ea7dafb01881c2b02a95bd012f3d6b66128b681a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

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

  Log Message:
  -----------
  rhbz1174071 - add validation failure result in translation results


  Commit: 56b631eab28a83b2424e689517a2078806aaae73
      https://github.com/zanata/zanata-server/commit/56b631eab28a83b2424e689517a2078806aaae73
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Use example.com instead of test.com for tests


  Commit: 92f33ee740e085eaa940b75409bfa2d6767d1875
      https://github.com/zanata/zanata-server/commit/92f33ee740e085eaa940b75409bfa2d6767d1875
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #654 from zanata/use-example-com

Use example.com instead of test.com for tests


  Commit: 0cdb13e01d4153884e3283e43f52ae4697473225
      https://github.com/zanata/zanata-server/commit/0cdb13e01d4153884e3283e43f52ae4697473225
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    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
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java

  Log Message:
  -----------
  Remove hard-coded thread pool size for Async tasks.

Pull Request: https://github.com/zanata/zanata-server/pull/643
Squashed commit of the following:

commit a772b78b841a7ec374d4ee9674510b3d73e6e3db
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Dec 8 16:35:45 2014 +1000

    Code review changes.

commit d43bb366ed753b960374b3bbd565638e10a34aed
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Dec 3 17:09:39 2014 +1000

    Remove hard-coded thread pool size for Async tasks.

    Made it configurable via system properties, and added some infrastructure classes to implement different types of configuration stores. All configuration stores should migrate to this design in the future.


  Commit: 42433bf0b329eeef7caa6356e53b8febce43d037
      https://github.com/zanata/zanata-server/commit/42433bf0b329eeef7caa6356e53b8febce43d037
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java

  Log Message:
  -----------
  Email address is not part of the role changes message


  Commit: 9db1ceae3da15de96c53276b2a1d11e02172d8be
      https://github.com/zanata/zanata-server/commit/9db1ceae3da15de96c53276b2a1d11e02172d8be
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java

  Log Message:
  -----------
  Merge pull request #656 from zanata/fix-language-join-test

Email address is not part of the role changes message


  Commit: b17e4e8c9d835a20f15cbdac83df71863e5676a7
      https://github.com/zanata/zanata-server/commit/b17e4e8c9d835a20f15cbdac83df71863e5676a7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.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/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.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/SortingType.java
    M 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/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.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
    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/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.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
    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/pages.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/language.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/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/glossary/view.xhtml
    R zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/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/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Update admin pages

https://bugzilla.redhat.com/show_bug.cgi?id=1162383

Squashed commit of the following:

commit a4b0b39ab1905dd7b11f8bdfdb82fae775a8d4f1
Merge: e271951 9db1cea
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jan 5 11:28:47 2015 +1000

    Merge branch 'integration/master' into admin-page

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    	functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    	zanata-war/src/main/java/org/zanata/action/SendEmailAction.java

commit e271951bead7d242b51458ec18e4ae28f1bbc234
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Dec 9 11:08:15 2014 +1000

    Fix add new language

commit bb1c9b388f7ba6762fc06a577aa54f538d01fef1
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Dec 8 11:24:19 2014 +1000

    Fix underscore new language

commit ef168a1ea94617781f112132b114181a99407c4b
Merge: 8fd3612 0b1c0c6
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Dec 8 07:32:50 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 8fd361270a82b9662e86117eb06a862fb1d1a390
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Nov 30 20:10:47 2014 +1000

    Allow new arbitrary language

commit a81ed306b02901ef49d5a336c5a5006ec62593e9
Merge: 5acf197 aec1b31
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Nov 30 19:23:46 2014 +1000

    Merge branch 'integration/master' into admin-page

    Conflicts:
    	zanata-war/src/main/webapp/admin/languagemanager.xhtml
    	zanata-war/src/main/webapp/admin/search.xhtml
    	zanata-war/src/main/webapp/admin/usermanager.xhtml
    	zanata-war/src/main/webapp/language/home.xhtml
    	zanata-war/src/main/webapp/tm/home.xhtml

commit 5acf197f2c50f9fe8bf8b265c781d1c5290110a1
Author: Damian Jansen <djansen at redhat.com>
Date:   Wed Nov 26 14:27:00 2014 +1000

    Fix tests and bugs in admin UI update

    - Many tests had to be updated for the new UI
    - Fix bug where Clear / Delete TM options were not visible
    - Fix bug where max file uploads was saved in max api requests config

commit 988755bc4af794167e2b6f4ae8fcfc0093c576c2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 24 08:47:20 2014 +1000

    Update help page and contact admin page

commit 2cb23f9388ae3664ad085f87f24f100ca64ac352
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Nov 21 14:52:36 2014 +1000

    Update contact coordinator page

commit 9f30ff7795fb0967394c750e7707d0279c84e1b8
Merge: 50abdf9 9e86c7d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Nov 20 15:56:44 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 50abdf9be986450470373222098fb75bc98fcd20
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 18 15:31:28 2014 +1000

    Update tm page

commit 90c09820897e8c65c70058089f8c080d81344449
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 18 11:20:19 2014 +1000

    Update TM page

commit 75c69bd3524b66f3f5371f6ac184b0e4d9065efd
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 17 08:25:47 2014 +1000

    Update search and process manager page

commit 05771828d55f9b688b89496140b14325d1efe4b6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 11 15:32:43 2014 +1000

    Update process manager page

commit c742327abf5e3c0641aa5e6642927c55f8c60d48
Merge: 7b91f76 395a7d5
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 10 14:01:24 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 7b91f769abb74666783185bdca7e4b8acac9a0b7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 4 15:44:30 2014 +1000

    Update UI in admin page


  Commit: 3116f95beb3f16ba3e351eece078881d895dada4
      https://github.com/zanata/zanata-server/commit/3116f95beb3f16ba3e351eece078881d895dada4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  rhbz1149968 - record last modified by person from client pushed translation


  Commit: a5dc199a4719ccc73983022060f5a1d94b6d2f0c
      https://github.com/zanata/zanata-server/commit/a5dc199a4719ccc73983022060f5a1d94b6d2f0c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    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/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/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  merge zanata-spa 0.0.6


  Commit: 1bdb99277804f6135355d2459f8ee5a22d081021
      https://github.com/zanata/zanata-server/commit/1bdb99277804f6135355d2459f8ee5a22d081021
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-09 (Fri, 09 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #659 from zanata/rhbz1149968-offline-trans

rhbz1149968 - record last modified by person from client pushed translation


  Commit: a53a419f05fcfdf5719b8fa248d94b947a4b21cb
      https://github.com/zanata/zanata-server/commit/a53a419f05fcfdf5719b8fa248d94b947a4b21cb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/webapp/app/config.json
    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/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/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Merge pull request #648 from zanata/shortcuts

Merge zanata-spa 0.0.6


  Commit: 29df461d37b6bb97d237d1160fa3f0ac5be68dc0
      https://github.com/zanata/zanata-server/commit/29df461d37b6bb97d237d1160fa3f0ac5be68dc0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java

  Log Message:
  -----------
  fix adding custom language in zanata


  Commit: b09e616c452ff4f754a5b98cb6d516a0e55ba46f
      https://github.com/zanata/zanata-server/commit/b09e616c452ff4f754a5b98cb6d516a0e55ba46f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java

  Log Message:
  -----------
  Merge pull request #660 from zanata/fix-custom-language

fix adding arbitrary language in zanata


  Commit: 39ab4495d1d3b58010bd65697aa38e2eec191921
      https://github.com/zanata/zanata-server/commit/39ab4495d1d3b58010bd65697aa38e2eec191921
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge pull request #636 from zanata/eap-version-check

Warn on startup if EAP/WildFly too old


  Commit: 84aca2f2dc1beff8d234897265ee4ab757401b92
      https://github.com/zanata/zanata-server/commit/84aca2f2dc1beff8d234897265ee4ab757401b92
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.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/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/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.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/misc/ContactAdminTest.java

  Log Message:
  -----------
  Fix admin and related tests after UI update


  Commit: f75a66b6146d06a46728bc234db8675c0e6a75b8
      https://github.com/zanata/zanata-server/commit/f75a66b6146d06a46728bc234db8675c0e6a75b8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    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/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.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/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.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/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/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.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/ZanataRestCaller.java
    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/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.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/ProjectIterationZipFileAction.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/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.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/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/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.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/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/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.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/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.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/security/permission/PermissionEvaluatorTest.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/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 46f51a368ab7daf3ca7289cbccfc4c5bd040a625
Merge: a76a174 b09e616
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jan 14 11:14:37 2015 +1000

    Merge remote-tracking branch 'origin/master' into fix-formatting

    Conflicts:
    	functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java

commit a76a1742ebc68da04f1bd7b69da4a56ef4c22986
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 11:43:08 2014 +1000

    Fix formatting


  Commit: 5a031ca53e9c03db916acb1f3cb63e59b86a80d8
      https://github.com/zanata/zanata-server/commit/5a031ca53e9c03db916acb1f3cb63e59b86a80d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/config/AsyncConfig.java

  Log Message:
  -----------
  Fix formatting


  Commit: bdf70b78470f5ecea832d10ec39b11a5bc408168
      https://github.com/zanata/zanata-server/commit/bdf70b78470f5ecea832d10ec39b11a5bc408168
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

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

  Log Message:
  -----------
  Look for chromedriver on the system PATH too

Squashed commit of the following:

commit cf1c1ecd2e05cb8641c253d9a61558e5ae02fedd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jan 13 16:56:33 2015 +1000

    Add suggestions from djansen

commit be3e8a4645b9ae38e7cd47e8e37560a9bc6c67f7
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 19 15:13:58 2014 +1000

    Look for chromedriver on the system PATH too


  Commit: 98d4ddc9c99ff3c41841b7e5acafe3189f7d4d6a
      https://github.com/zanata/zanata-server/commit/98d4ddc9c99ff3c41841b7e5acafe3189f7d4d6a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.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/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/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.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/misc/ContactAdminTest.java

  Log Message:
  -----------
  Merge pull request #661 from zanata/fix-admin-tests

Fix admin and related tests after UI update


  Commit: a22fdd713e91da2ddfbe559e08e265aefe786a96
      https://github.com/zanata/zanata-server/commit/a22fdd713e91da2ddfbe559e08e265aefe786a96
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    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/languages/LanguagesPage.java

  Log Message:
  -----------
  Fix checkstyle errors in Language test pages


  Commit: 2d84f53fad50236d6ddd7f82b93fe80b181d4f5b
      https://github.com/zanata/zanata-server/commit/2d84f53fad50236d6ddd7f82b93fe80b181d4f5b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    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/languages/LanguagesPage.java

  Log Message:
  -----------
  Merge pull request #663 from zanata/fix-checkstyle-admin-ui-test

Fix checkstyle errors in Language test pages


  Commit: e49b08200aab9a7f69c28edf8d6f86bacaeaf913
      https://github.com/zanata/zanata-server/commit/e49b08200aab9a7f69c28edf8d6f86bacaeaf913
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  Fix getContents for plural in zanata-spa


  Commit: e901909fe748080fc42849bb8203b13d4a51c6af
      https://github.com/zanata/zanata-server/commit/e901909fe748080fc42849bb8203b13d4a51c6af
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  Merge pull request #664 from zanata/zanata-spa-plural

Fix getContents for plural in zanata-spa


  Commit: 0e9518c4810f0eaa303db868f46ae04132401143
      https://github.com/zanata/zanata-server/commit/0e9518c4810f0eaa303db868f46ae04132401143
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java

  Log Message:
  -----------
  Fix broken logic of test add/manage language pages


  Commit: 4f25d318bf2e29d7f1c2b6e62cba8beb61903538
      https://github.com/zanata/zanata-server/commit/4f25d318bf2e29d7f1c2b6e62cba8beb61903538
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java

  Log Message:
  -----------
  Merge pull request #665 from zanata/fix-add-language-test

Fix broken logic of test add/manage language pages


  Commit: 1e0115e38d4953364fe64e50dcbbdd137b99c233
      https://github.com/zanata/zanata-server/commit/1e0115e38d4953364fe64e50dcbbdd137b99c233
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/test/resources/log4j.xml
    A zanata-model/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Tweak logging config in tests


  Commit: 0f25bdddbc8eb1cd6c87ebcc478a753f73dd6cdd
      https://github.com/zanata/zanata-server/commit/0f25bdddbc8eb1cd6c87ebcc478a753f73dd6cdd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Only start SMTP server once for all tests


  Commit: 49d2df95a2ed00d88d32a1272131131457099661
      https://github.com/zanata/zanata-server/commit/49d2df95a2ed00d88d32a1272131131457099661
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java

  Log Message:
  -----------
  Log async exceptions as WARN


  Commit: 6c5bb2c943d07d219cdc0be725d314accc0427c3
      https://github.com/zanata/zanata-server/commit/6c5bb2c943d07d219cdc0be725d314accc0427c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    R functional-test/etc/mysql-data.groovy
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    M pom.xml

  Log Message:
  -----------
  Move mysql data (but not socket) back under 'target'


  Commit: 991f9fd77018abc9153182d963e1fcf2ac443cc1
      https://github.com/zanata/zanata-server/commit/991f9fd77018abc9153182d963e1fcf2ac443cc1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    R functional-test/etc/mysql-data.groovy
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/log4j.xml
    M pom.xml
    A zanata-model/src/test/resources/log4j.xml
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Merge pull request #666 from zanata/fix-intermittent-smtp-tests

Fix intermittent smtp tests


  Commit: 038a2616ef6e13e6ea7199e9769d9e05c103e881
      https://github.com/zanata/zanata-server/commit/038a2616ef6e13e6ea7199e9769d9e05c103e881
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade classloader-leak-prevention to 1.11.0


  Commit: 2f9da44beded196ed3a684e73449e6c0eb96443f
      https://github.com/zanata/zanata-server/commit/2f9da44beded196ed3a684e73449e6c0eb96443f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #670 from zanata/classloader-leak-prevention-1-11-0

Upgrade classloader-leak-prevention to 1.11.0


  Commit: cac969ecf184eda72b76fb2cac85f17fa8e6c8ce
      https://github.com/zanata/zanata-server/commit/cac969ecf184eda72b76fb2cac85f17fa8e6c8ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    R functional-test/etc/mysql-data.groovy
    A functional-test/etc/mysql-socket.groovy
    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/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.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/TranslationMemoryPage.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/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/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.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
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.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/administration/AutoRoleAssignmentTest.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/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
    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/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.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/HasEmailRule.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 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/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-model/src/test/resources/log4j.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.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/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.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/SortingType.java
    M 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/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/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    M 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/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/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/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/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/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/webtrans/client/resources/WebTransMessages.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/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    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/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.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
    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/pages.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/language.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/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/config.json
    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/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/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json
    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
    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/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/ForceLoadClass.java
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.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/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    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 cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
	zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
	zanata-war/src/main/java/org/zanata/action/UserAction.java


Compare: https://github.com/zanata/zanata-server/compare/8fe91a8c827e...cac969ecf184


More information about the zanata-commits mailing list