[zanata/zanata-server] c2e24b: Merge remote-tracking branch 'origin/master' into ...

GitHub noreply at github.com
Tue Sep 29 03:50:52 UTC 2015 

  Branch: refs/heads/replace-seam
  Home:   https://github.com/zanata/zanata-server
  Commit: c2e24b465899ad15e0649f0eb1a9d1a6bbb23427
      https://github.com/zanata/zanata-server/commit/c2e24b465899ad15e0649f0eb1a9d1a6bbb23427
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    M frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    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/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/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.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/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/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.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
    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/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/TranslateOdsTest.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/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.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/ObsoleteTextTest.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/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.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
    M 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/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionSlugTest.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/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.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
    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 zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
    A zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
    A zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/resources/messages.properties
    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
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_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/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.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-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-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/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-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/merge_trans_modal.xhtml
    M 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/layout/version/upload_translation_modal.xhtml
    M 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/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.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/register.xhtml
    M zanata-war/src/main/webapp/admin/home.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
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/home.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/language/language.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
    A zanata-war/src/main/webapp/resources/zanata/field.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    R zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/search.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/create_version_group.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/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java

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


  Commit: 4f837f147e313a5ff63395fc5801bc9f2653f3a7
      https://github.com/zanata/zanata-server/commit/4f837f147e313a5ff63395fc5801bc9f2653f3a7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java

  Log Message:
  -----------
  refactor - replace seam Synchronized annotation


  Commit: eb1b4df8cc17867ab730d2a1072abd1758ac0d1b
      https://github.com/zanata/zanata-server/commit/eb1b4df8cc17867ab730d2a1072abd1758ac0d1b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/RoleSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserSearch.java
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml

  Log Message:
  -----------
  remove seam @DataModel and @DataModelSelection


  Commit: b5ff7086f8d5442c4f7914377288e3df757cbfc0
      https://github.com/zanata/zanata-server/commit/b5ff7086f8d5442c4f7914377288e3df757cbfc0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/exception/LockTimeoutException.java
    A zanata-war/src/main/java/org/zanata/util/SynchronizationInterceptor.java
    A zanata-war/src/main/java/org/zanata/util/Synchronized.java
    M zanata-war/src/main/java/org/zanata/util/SysProperties.java
    A zanata-war/src/test/java/org/zanata/util/SynchronizationTest.java
    A zanata-war/src/test/resources/META-INF/beans.xml

  Log Message:
  -----------
  implement SynchronizationInterceptor for CDI


  Commit: 957dde6032e033a2ef89a818d4687fa06ea2a64c
      https://github.com/zanata/zanata-server/commit/957dde6032e033a2ef89a818d4687fa06ea2a64c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add cdi-unit dependency


  Commit: 92183e258ca9092dafc63885bf51a375d8b87d16
      https://github.com/zanata/zanata-server/commit/92183e258ca9092dafc63885bf51a375d8b87d16
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/SynchronizationInterceptor.java
    M zanata-war/src/main/java/org/zanata/util/Synchronized.java
    M zanata-war/src/test/java/org/zanata/util/SynchronizationTest.java

  Log Message:
  -----------
  Remove support for @Synchronized methods

If only part of an object's state needs synchronisation, it should
probably be split up.


Compare: https://github.com/zanata/zanata-server/compare/e57e3bce3cf9...92183e258ca9

More information about the zanata-commits mailing list