[zanata/zanata-server] e22728: Emulate CDI events with Seam Events
GitHub
noreply at github.com
Wed Apr 1 00:18:49 UTC 2015
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: e22728b9dbfcc8f53b240580fc7095bb72372f4c
https://github.com/zanata/zanata-server/commit/e22728b9dbfcc8f53b240580fc7095bb72372f4c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
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/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
A zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
A zanata-war/src/main/java/org/zanata/events/Logout.java
A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/Event.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
Log Message:
-----------
Emulate CDI events with Seam Events
Commit: d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
https://github.com/zanata/zanata-server/commit/d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Change explode profile.
Some problems with the touching of the dodeploy file and made sure the profile can be activated via a property.
Commit: e239f214029fbbcda7bd03ac49e29763c0999133
https://github.com/zanata/zanata-server/commit/e239f214029fbbcda7bd03ac49e29763c0999133
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
Log Message:
-----------
Replace the use of seam's jsf messages wrapper.
Create Zanata's own wrapper, which may be replaced later with a CDI extension if needed.
Commit: 8cad539f4700d4cbdcd87170d9331effa5c8f683
https://github.com/zanata/zanata-server/commit/8cad539f4700d4cbdcd87170d9331effa5c8f683
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.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/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.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/TranslationMemoryAction.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/ValidateEmailAction.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/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
Log Message:
-----------
Replace all uses of Seam's FacesMessages.
Use Zanata's own FacesMessages class instead.
Commit: d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
https://github.com/zanata/zanata-server/commit/d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
Fix messages not appearing when ending conversations.
Implement a 'cache' of messages that gets transfered to the FacesContext using a jsf phase listener. Preety much what Seam does.
Commit: 01e5b601b95b2e525efc735f24f9098610ce61bd
https://github.com/zanata/zanata-server/commit/01e5b601b95b2e525efc735f24f9098610ce61bd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
Log Message:
-----------
Fix some functional tests.
The new messages phase listener was acting at the wrong time and causing Seam to re-create some page scoped beans.
Commit: 72fce56b7041e8cec9aa61d1633950b020d1328b
https://github.com/zanata/zanata-server/commit/72fce56b7041e8cec9aa61d1633950b020d1328b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
Log Message:
-----------
Add unit tests to satisfy coverage requirements.
Commit: 5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
https://github.com/zanata/zanata-server/commit/5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
Log Message:
-----------
Update code formatting to match checkstyle rules
Commit: bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
https://github.com/zanata/zanata-server/commit/bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M functional-test/pom.xml
R functional-test/src/etc/wildflyModules.groovy
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.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/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
A functional-test/src/test/java/org/zanata/util/TestLogger.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M pom.xml
M zanata-model/pom.xml
M zanata-overlay/build.gradle
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/messages_af.properties
A zanata-war/src/main/resources/messages_am.properties
A zanata-war/src/main/resources/messages_ar.properties
A zanata-war/src/main/resources/messages_as.properties
A zanata-war/src/main/resources/messages_ast.properties
A zanata-war/src/main/resources/messages_az.properties
A zanata-war/src/main/resources/messages_bg.properties
A zanata-war/src/main/resources/messages_bn_BD.properties
A zanata-war/src/main/resources/messages_bn_IN.properties
M zanata-war/src/main/resources/messages_br.properties
A zanata-war/src/main/resources/messages_brx.properties
A zanata-war/src/main/resources/messages_bs.properties
A zanata-war/src/main/resources/messages_ca.properties
M zanata-war/src/main/resources/messages_cs.properties
A zanata-war/src/main/resources/messages_cy.properties
A zanata-war/src/main/resources/messages_da.properties
A zanata-war/src/main/resources/messages_de.properties
A zanata-war/src/main/resources/messages_de_CH.properties
A zanata-war/src/main/resources/messages_de_DE.properties
A zanata-war/src/main/resources/messages_el.properties
A zanata-war/src/main/resources/messages_en_GB.properties
A zanata-war/src/main/resources/messages_eo.properties
A zanata-war/src/main/resources/messages_es.properties
A zanata-war/src/main/resources/messages_es_ES.properties
A zanata-war/src/main/resources/messages_es_MX.properties
A zanata-war/src/main/resources/messages_et.properties
A zanata-war/src/main/resources/messages_eu.properties
A zanata-war/src/main/resources/messages_fa.properties
A zanata-war/src/main/resources/messages_fi.properties
M zanata-war/src/main/resources/messages_fr.properties
A zanata-war/src/main/resources/messages_ga.properties
A zanata-war/src/main/resources/messages_gl.properties
A zanata-war/src/main/resources/messages_gu.properties
A zanata-war/src/main/resources/messages_he.properties
A zanata-war/src/main/resources/messages_hi.properties
A zanata-war/src/main/resources/messages_hr.properties
M zanata-war/src/main/resources/messages_hu.properties
A zanata-war/src/main/resources/messages_id.properties
A zanata-war/src/main/resources/messages_is.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
A zanata-war/src/main/resources/messages_ka.properties
A zanata-war/src/main/resources/messages_kn.properties
A zanata-war/src/main/resources/messages_ko.properties
A zanata-war/src/main/resources/messages_ky.properties
A zanata-war/src/main/resources/messages_la.properties
A zanata-war/src/main/resources/messages_lt.properties
A zanata-war/src/main/resources/messages_lv.properties
A zanata-war/src/main/resources/messages_mai.properties
A zanata-war/src/main/resources/messages_ml.properties
A zanata-war/src/main/resources/messages_mn.properties
A zanata-war/src/main/resources/messages_mr.properties
A zanata-war/src/main/resources/messages_ms.properties
A zanata-war/src/main/resources/messages_nb.properties
A zanata-war/src/main/resources/messages_nds.properties
A zanata-war/src/main/resources/messages_nl.properties
A zanata-war/src/main/resources/messages_nn.properties
A zanata-war/src/main/resources/messages_or.properties
A zanata-war/src/main/resources/messages_pa.properties
A zanata-war/src/main/resources/messages_pl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
A zanata-war/src/main/resources/messages_pt_PT.properties
A zanata-war/src/main/resources/messages_ro.properties
A zanata-war/src/main/resources/messages_ru.properties
A zanata-war/src/main/resources/messages_si.properties
A zanata-war/src/main/resources/messages_sk.properties
A zanata-war/src/main/resources/messages_sl.properties
A zanata-war/src/main/resources/messages_sq.properties
A zanata-war/src/main/resources/messages_sr_Cyrl.properties
A zanata-war/src/main/resources/messages_sr_Latn.properties
A zanata-war/src/main/resources/messages_sv.properties
A zanata-war/src/main/resources/messages_ta.properties
A zanata-war/src/main/resources/messages_ta_IN.properties
A zanata-war/src/main/resources/messages_te.properties
A zanata-war/src/main/resources/messages_th.properties
A zanata-war/src/main/resources/messages_tl.properties
A zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
A zanata-war/src/main/resources/messages_vi.properties
A zanata-war/src/main/resources/messages_xh.properties
A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/search.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/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
M zanata-war/src/main/webapp/app/translations/de.json
M zanata-war/src/main/webapp/app/translations/fr.json
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/resources/arquillian.xml
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/ServerConfigurationBean.java
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
Commit: 69eb5776d9ca18e1391f7905be5e345d693d8d85
https://github.com/zanata/zanata-server/commit/69eb5776d9ca18e1391f7905be5e345d693d8d85
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/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/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-test-war/pom.xml
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
R zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
R zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
A 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/search_user_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/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/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
R zanata-war/src/main/webapp/admin/language.xhtml
R zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/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/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
Log Message:
-----------
Merge branch 'master' into cdi-prep
Conflicts:
zanata-war/pom.xml
zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
zanata-war/src/main/java/org/zanata/action/LanguageAction.java
zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
Commit: 7f4463714eee3e0fe3957461f3e6b977863b99ad
https://github.com/zanata/zanata-server/commit/7f4463714eee3e0fe3957461f3e6b977863b99ad
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Fix dependency problem
Commit: f258e488784fb1114e8a323803336b0109fa0520
https://github.com/zanata/zanata-server/commit/f258e488784fb1114e8a323803336b0109fa0520
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M .gitignore
M build.sh
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.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/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.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/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M functional-test/src/test/resources/log4j.xml
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
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/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/app/index.html
A zanata-war/src/main/webapp/resources/script/test/finished.js
Log Message:
-----------
Merge branch 'reduce-boms' into cdi-prep
Conflicts:
pom.xml
Commit: 260dfa2fbc0de5500693bdc8b2b273084a77dadc
https://github.com/zanata/zanata-server/commit/260dfa2fbc0de5500693bdc8b2b273084a77dadc
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
A functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A functional-test/src/test/java/org/zanata/util/EmailQuery.java
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.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/ServerConfigurationService.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
R zanata-war/src/main/webapp/help/edit_help_content.xhtml
R zanata-war/src/main/webapp/help/view.xhtml
Log Message:
-----------
Merge branch 'integration/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
Commit: 612ee5db075df5a7f90fd0ae39497c17bd86a509
https://github.com/zanata/zanata-server/commit/612ee5db075df5a7f90fd0ae39497c17bd86a509
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
Log Message:
-----------
Fix FacesMessages display component specific message
Commit: 89ce917d98d414fcc239cae5d9b3bb053d6dae95
https://github.com/zanata/zanata-server/commit/89ce917d98d414fcc239cae5d9b3bb053d6dae95
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
Log Message:
-----------
Fix saving server config event
Commit: 45f7a22b4531bf33124a1862460790f2471e7f7d
https://github.com/zanata/zanata-server/commit/45f7a22b4531bf33124a1862460790f2471e7f7d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
Merge branch 'master' into cdi-prep
Commit: b2e94a8e847f6dee74bb1ce116b394bce3813134
https://github.com/zanata/zanata-server/commit/b2e94a8e847f6dee74bb1ce116b394bce3813134
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A docs/configuration/authentication.md
A docs/configuration/document-storage-directory.md
A docs/configuration/email.md
A docs/configuration/infinispan.md
A docs/configuration/jms-messaging.md
A docs/images/create-project-completed.png
A docs/images/create-project.png
A docs/images/create-version-master.png
A docs/images/create-version.png
A docs/images/project-about-settings.png
A docs/images/project-general-settings.png
A docs/images/project-languages-add.png
A docs/images/project-languages-remove.png
A docs/images/project-languages-settings.png
A docs/images/project-permissions-settings.png
A docs/images/project-settings-button.png
A docs/images/project-translation-settings.png
A docs/images/user-dashboard-create-version.png
A docs/index.md
A docs/release-notes.md
A docs/user-guide/Opening-a-Translation-Project.md
A docs/user-guide/client-configuration.md
A docs/user-guide/contributing-translations.md
A docs/user-guide/joining-a-language-team.md
A docs/user-guide/keyboard-shortcuts.md
A docs/user-guide/project-types.md
A docs/user-guide/projects/create-project.md
A docs/user-guide/projects/create-version.md
A docs/user-guide/projects/project-settings.md
A docs/user-guide/projects/upload-strings.md
A docs/user-guide/translators-new-account.md
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
A functional-test/src/main/java/org/zanata/util/LanguageList.java
R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A mkdocs.yml
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
M zanata-war/src/main/webapp/resources/script/components-script.js
A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/action/VersionHome.java
Commit: 8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
https://github.com/zanata/zanata-server/commit/8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
R CHANGELOG.md
M docs/configuration/authentication.md
M docs/configuration/infinispan.md
A docs/configuration/installation.md
A docs/images/project-view-versions.png
A docs/images/version-merge-trans-cancel.png
A docs/images/version-merge-trans-dialog.png
A docs/images/version-merge-trans-progress.png
A docs/images/version-more-action-menu.png
A docs/images/version-view-languages.png
M docs/index.md
M docs/release-notes.md
A docs/user-guide/client-command-hook.md
M docs/user-guide/client-configuration.md
A docs/user-guide/merge-translations.md
M docs/user-guide/project-types.md
A docs/user-guide/projects/project-view.md
A docs/user-guide/user-profile.md
A docs/user-guide/versions/version-view.md
M etc/scripts/cargowait.sh
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M mkdocs.yml
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.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/view/AppDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/main/webapp/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/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_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/urlrewrite.xml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
A zanata-war/src/main/webapp/profile/home.xhtml
A zanata-war/src/main/webapp/profile/js/bundle.min.js
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
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
Commit: 4b1baa596433b6fa70361b3409645e24621a4a43
https://github.com/zanata/zanata-server/commit/4b1baa596433b6fa70361b3409645e24621a4a43
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M pom.xml
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/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.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/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.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/TranslationMemoryAction.java
M 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/ValidateEmailAction.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/VersionHome.java
A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
A zanata-war/src/main/java/org/zanata/events/Logout.java
A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/Event.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
Log Message:
-----------
Merge pull request #653 from zanata/cdi-prep
Prepare for CDI move
- Convert our Seam events to be closer to CDI events.
- Reimplement FacesMessages to be independent of Seam.
Compare: https://github.com/zanata/zanata-server/compare/1daed2500e28...4b1baa596433
More information about the zanata-commits
mailing list