[zanata/zanata-server] 110239: rhbz1023247 Prevent concurrent updates to Activity...

GitHub noreply at github.com
Mon Nov 18 02:31:11 UTC 2013


  Branch: refs/heads/rhbz991336
  Home:   https://github.com/zanata/zanata-server
  Commit: 110239a04c6801824578ec7715fb42adab743586
      https://github.com/zanata/zanata-server/commit/110239a04c6801824578ec7715fb42adab743586
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  rhbz1023247 Prevent concurrent updates to Activity entities


  Commit: a54dc5c334f12a55f7e8764eb009172734dfbf53
      https://github.com/zanata/zanata-server/commit/a54dc5c334f12a55f7e8764eb009172734dfbf53
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A 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/MyAccountPage.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/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.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/AggregateTestSuite.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
    A functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.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/RegisterAction.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/main/java/org/zanata/rest/service/TranslatedDocResourceService.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
    A zanata-war/src/main/java/org/zanata/ui/StatisticBar.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.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/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/TextFormatUtil.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/legal.html
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/quartz165' into rhbz1023247

Conflicts:
	pom.xml


  Commit: e2e7aab78942af32b6fcc1f8c959ddf83373f4b9
      https://github.com/zanata/zanata-server/commit/e2e7aab78942af32b6fcc1f8c959ddf83373f4b9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/seam/ComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/Child.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildAutoCreate.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildBroken.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildWithCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithChildCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredAutoCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredNoCreateChild.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java

  Log Message:
  -----------
  Update SeamAutowire to check required/create/AutoCreate


  Commit: 49e9f16b3d42da9fc316adf4cac4650a62e1ed54
      https://github.com/zanata/zanata-server/commit/49e9f16b3d42da9fc316adf4cac4650a62e1ed54
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java

  Log Message:
  -----------
  Fix lock-handling in ActivityServiceImpl


  Commit: c607f2a14c2b14881cc3907f98cc8d53766bdf51
      https://github.com/zanata/zanata-server/commit/c607f2a14c2b14881cc3907f98cc8d53766bdf51
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

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

  Log Message:
  -----------
  rhbz1026155 - fix NPE


  Commit: 60c0482475be7652bd80440b5b040e0965d1bb5b
      https://github.com/zanata/zanata-server/commit/60c0482475be7652bd80440b5b040e0965d1bb5b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Inject authenticatedUser into REST tests


  Commit: 9a56e29621cb77ef500302d21338cb1a27bd4934
      https://github.com/zanata/zanata-server/commit/9a56e29621cb77ef500302d21338cb1a27bd4934
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Auto-create stateless components in SeamAutowire


  Commit: 4780722255ddce453ccf25a8bc34884764d52f63
      https://github.com/zanata/zanata-server/commit/4780722255ddce453ccf25a8bc34884764d52f63
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java

  Log Message:
  -----------
  Mark TranslationStateCacheImpl as @AutoCreate; Reset SeamAutowire between tests


  Commit: bff0b12574f653bfaa7e85fa2d8c78412b57d33a
      https://github.com/zanata/zanata-server/commit/bff0b12574f653bfaa7e85fa2d8c78412b57d33a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/eclipse/code_templates_code.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.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/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.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/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
    M zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.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/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.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
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReferenceVisibleEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReferenceVisibleEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.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/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/IdForLocale.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/Locale.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TextFlowTarget.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TextFlowTargetId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetLocaleList.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetLocaleListResult.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTargetForLocale.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTargetForLocaleResult.java
    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/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/account/kloginform.jsp
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    R zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java


  Commit: 9949045c98d32ab3149b59da5afe77554081d1a4
      https://github.com/zanata/zanata-server/commit/9949045c98d32ab3149b59da5afe77554081d1a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java

  Log Message:
  -----------
  Reset SeamAutowire before tests


  Commit: 515f8b1d1ce1344a62a49f6b4880cbfee164f2a9
      https://github.com/zanata/zanata-server/commit/515f8b1d1ce1344a62a49f6b4880cbfee164f2a9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M 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/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Give meaningful names to async tasks


  Commit: 64d446224ef9e98d9a5963e4eb791dc46f48e5f8
      https://github.com/zanata/zanata-server/commit/64d446224ef9e98d9a5963e4eb791dc46f48e5f8
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.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/view/SourceContentsView.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/seam/ComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/Child.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildAutoCreate.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildBroken.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildWithCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithChildCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredAutoCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredNoCreateChild.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java

  Log Message:
  -----------
  Merge pull request #247 from zanata/rhbz1023247

rhbz1023247 Prevent concurrent updates to Activity entities


  Commit: 617d40e671d80a5da31ff4080de9a504a18bb730
      https://github.com/zanata/zanata-server/commit/617d40e671d80a5da31ff4080de9a504a18bb730
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M 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/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Merge pull request #272 from zanata/async-task-names

Give meaningful names to async tasks


  Commit: 1a5546bbec5fa83924ec5da289e74069c156d53e
      https://github.com/zanata/zanata-server/commit/1a5546bbec5fa83924ec5da289e74069c156d53e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #270 from zanata/rhbz1026155

rhbz1026155 - fix NPE


  Commit: f6fc82caec7788da10a37a66e6884eb316652f42
      https://github.com/zanata/zanata-server/commit/f6fc82caec7788da10a37a66e6884eb316652f42
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

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

  Log Message:
  -----------
  Add missing injection of Authenticated account when starting an async task.


  Commit: 63d14dfb203381d095bde851efd40a1340638b55
      https://github.com/zanata/zanata-server/commit/63d14dfb203381d095bde851efd40a1340638b55
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  rhbz1030732 - Change copy trans to load document entity within the spawned transaction.


  Commit: 28670c8d8b1752bb380be0356ad2fe82558a6dcb
      https://github.com/zanata/zanata-server/commit/28670c8d8b1752bb380be0356ad2fe82558a6dcb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #275 from zanata/rhbz1030732

rhbz1030732 - Change copy trans to load document entity within the spawned transaction.


  Commit: e08eedc0aeb440688465360e570433177a64ca9b
      https://github.com/zanata/zanata-server/commit/e08eedc0aeb440688465360e570433177a64ca9b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/seam/ComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
    A zanata-war/src/test/java/org/zanata/seam/test/Child.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildAutoCreate.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildBroken.java
    A zanata-war/src/test/java/org/zanata/seam/test/ChildWithCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithChildCycle.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithNonRequiredChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredAutoCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredBrokenChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredCreateChild.java
    A zanata-war/src/test/java/org/zanata/seam/test/ComponentWithRequiredNoCreateChild.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicChildComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/CyclicParentComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/TestComponent.java
    R zanata-war/src/test/java/org/zanata/seam/test/UnbuildableTestComponent.java
    M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/SaveOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransUnitEditHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz991336

Conflicts:
	zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
	zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
	zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java


Compare: https://github.com/zanata/zanata-server/compare/eb3b69fdbf16...e08eedc0aeb4


More information about the zanata-commits mailing list