[zanata/zanata-server] 0462d3: Clean up type warnings

GitHub noreply at github.com
Thu Apr 3 06:19:59 UTC 2014


  Branch: refs/heads/rhbz1077439
  Home:   https://github.com/zanata/zanata-server
  Commit: 0462d3acd1eccec6763a4d9e5c8ca7ba2d6ded0d
      https://github.com/zanata/zanata-server/commit/0462d3acd1eccec6763a4d9e5c8ca7ba2d6ded0d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java

  Log Message:
  -----------
  Clean up type warnings


  Commit: 29d10f47bb70cadefafb38a570e7f16cf9eed6dd
      https://github.com/zanata/zanata-server/commit/29d10f47bb70cadefafb38a570e7f16cf9eed6dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java

  Log Message:
  -----------
  Fix findbugs warning


  Commit: 535b2e704a161e43d27d12f050409fd15eb9a5c6
      https://github.com/zanata/zanata-server/commit/535b2e704a161e43d27d12f050409fd15eb9a5c6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

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

  Log Message:
  -----------
  Sort by percent approved as double, not int


  Commit: 68bf66992d02688c98642a3386c697c8a54ee2dc
      https://github.com/zanata/zanata-server/commit/68bf66992d02688c98642a3386c697c8a54ee2dc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Fix findbugs warning


  Commit: 256e4db337adbe312914c46586bc9a82d2628ef3
      https://github.com/zanata/zanata-server/commit/256e4db337adbe312914c46586bc9a82d2628ef3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java

  Log Message:
  -----------
  Fix findbugs warnings


  Commit: 8c5e2095d3304cdcc314f28542f3f3f6494fe528
      https://github.com/zanata/zanata-server/commit/8c5e2095d3304cdcc314f28542f3f3f6494fe528
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java

  Log Message:
  -----------
  Fix findbugs warnings


  Commit: f01da83e2eea3add8d8d112b043ee3d9e542d328
      https://github.com/zanata/zanata-server/commit/f01da83e2eea3add8d8d112b043ee3d9e542d328
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    R functional-test/src/main/java/org/zanata/page/account/GoogleAccountPage.java
    R functional-test/src/main/java/org/zanata/page/account/GooglePermissionsPage.java
    R functional-test/src/main/java/org/zanata/page/account/OpenIDPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    A functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    A functional-test/src/main/java/org/zanata/page/googleaccount/GoogleManagePermissionsPage.java
    A functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    A functional-test/src/main/java/org/zanata/workflow/GoogleWorkFlow.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/AccountTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/account/OpenIDTest.java
    A functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    A functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/AccountKeyBase.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NotificationEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/keys/ShortcutContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationDetailListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.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/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/validation_options.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java

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

Conflicts:
	zanata-model/src/main/java/org/zanata/model/HTermComment.java


  Commit: 8f1a1e0742190239edaa86077ff21ff190402900
      https://github.com/zanata/zanata-server/commit/8f1a1e0742190239edaa86077ff21ff190402900
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Isolate tests and run them in parallel


  Commit: 4466a157f86d96f292f892a403bd8e7224f1f980
      https://github.com/zanata/zanata-server/commit/4466a157f86d96f292f892a403bd8e7224f1f980
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M .gitattributes
    M .travis.yml
    A branch-release.sh
    M functional-test/pom.xml
    M functional-test/sample-projects/plural/pl/test.po
    M functional-test/sample-projects/plural/pom.xml
    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/WebDriverFactory.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/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    A functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.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/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    A functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/Checkbox.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
    A functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/main/java/org/zanata/util/ScreenshotDirForTest.java
    A functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    R functional-test/src/main/java/org/zanata/workflow/ClientPushWorkFlow.java
    A functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    A functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    A functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    A functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.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/misc/ContactAdminTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    A functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditValidationsTest.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
    A functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    A functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    A functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    A functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    R functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
    A functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/NoScreenshot.java
    R functional-test/src/test/java/org/zanata/util/ResetDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/RetryRule.java
    A functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    A functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    A functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java
    A functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/as7module/sun/module.xml
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryDelete.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/conf/standalone.xml
    R functional-test/src/test/resources/create_admin_user.sql
    R functional-test/src/test/resources/create_translator_user.sql
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    M functional-test/src/test/resources/readme.txt
    M functional-test/src/test/resources/setup.properties
    A functional-test/src/test/resources/test-idml.idml
    A functional-test/src/test/resources/test-odg.odg
    A functional-test/src/test/resources/test-odp.odp
    A functional-test/src/test/resources/test-ods.ods
    A functional-test/src/test/resources/test-odt.odt
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/AccountKeyBase.java
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-model/src/main/java/org/zanata/model/HAccountOption.java
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
    M zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    M zanata-model/src/main/java/org/zanata/model/StatusCount.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
    M zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/model/type/ConditionRuleActionType.java
    M zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    A zanata-war/.gitignore
    M zanata-war/eclipse/code_templates_code.xml
    M zanata-war/pom.xml
    A zanata-war/src/etc/FillInTranslationGap.groovy
    A zanata-war/src/etc/PrepareGWTI18NProperties.groovy
    R zanata-war/src/etc/zanata-defaultconfig.properties
    R zanata-war/src/etc/zanata.properties
    A zanata-war/src/main/groovy/org/zanata/adapter/TranslatableSeparator.groovy
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
    A zanata-war/src/main/java/org/zanata/ServerConstants.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    A zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    A zanata-war/src/main/java/org/zanata/action/AbstractSortAction.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/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.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/LanguageManagerAction.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
    A zanata-war/src/main/java/org/zanata/action/NewProfileAction.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/ProjectCopyTransOptionsAction.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/ProjectSearch.java
    A zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    A zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    R zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    R 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
    A zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    R 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/adapter/DTDAdapter.java
    R zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/HTMLAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java
    A 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/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/TaskExecutor.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/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    A zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.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/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.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/ProjectIterationService.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/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    A zanata-war/src/main/java/org/zanata/security/negotiation/CustomNegotiationAuthenticator.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    A zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    A zanata-war/src/main/java/org/zanata/service/VersionLocaleKey.java
    A zanata-war/src/main/java/org/zanata/service/VersionStateCache.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/ConfigurationServiceImpl.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/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.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/TranslationStateCacheImpl.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/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    A zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java
    A zanata-war/src/main/java/org/zanata/ui/StatisticBar.java
    A zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    A zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    A zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    A zanata-war/src/main/java/org/zanata/webtrans/ApplicationI18n.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentChangedEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentChangedEventHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.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
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/RefreshProjectStatsEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.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/DocumentListPresenter.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/NotificationDetailListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.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/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.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/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.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/DiffColorLegendPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    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
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourceContentWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextAreaWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/TextFormatUtil.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
    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/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.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/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.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/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/server/HibernateIntegrator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.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
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.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/java/org/zanata/webtrans/shared/model/DocumentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentStatus.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/AddReviewComment.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/java/org/zanata/webtrans/shared/rpc/ReplaceText.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    A zanata-war/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.1.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1a.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.2.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.3.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    A zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Dummy.html
    R zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-compressed.js
    R zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    A zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror/README-codemirror-updates.txt
    A zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror/codemirror-3.21.cache.css
    A zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror/codemirror-compressed-3.21.cache.js
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/validation_options.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    R zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/WEB-INF/web.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/account/register.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R zanata-war/src/main/webapp/legal.html
    A zanata-war/src/main/webapp/profile/create_user.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    R zanata-war/src/main/webapp/resources/css/jsf-skin.css
    R zanata-war/src/main/webapp/resources/css/menu.css
    A zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    A zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    A zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    A zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    R zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    R zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    A zanata-war/src/test/groovy/org/zanata/adapter/TranslatableSeparatorTest.groovy
    R zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    R zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.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/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/VersionRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.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/service/impl/TranslationStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.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/DocumentListPresenterTest.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/NotificationPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.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/AddReviewCommentHandlerTest.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
    A 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
    A 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
    M zanata-war/src/test/resources/arquillian/standalone.xml
    R zanata-war/src/test/resources/arquillian/zanata.properties
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/org/zanata/test/model/GroupsTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml
    R zanata-war/src/test/resources/zanata-defaultconfig.properties
    R zanata-war/src/test/resources/zanata.properties
    R zanata-war/sync_gwt_messages.sh
    A zanata-war/zanata.xml

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

Conflicts:
	zanata-model/src/main/java/org/zanata/model/HTermComment.java
	zanata-war/pom.xml
	zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java


  Commit: 6ee37fa12f25d77468f56b4191edffdfb155b94e
      https://github.com/zanata/zanata-server/commit/6ee37fa12f25d77468f56b4191edffdfb155b94e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java

  Log Message:
  -----------
  Use input parameter instead of ignoring it; check for null locale again


  Commit: 70f14acba9a21c24797b5e9ad6082ff9a569cff3
      https://github.com/zanata/zanata-server/commit/70f14acba9a21c24797b5e9ad6082ff9a569cff3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

  Log Message:
  -----------
  Fix lists and sets to use guava library rather than testNG lib


  Commit: e7211973badf38fa5061d9c2d8a1857a45da5e0e
      https://github.com/zanata/zanata-server/commit/e7211973badf38fa5061d9c2d8a1857a45da5e0e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

  Log Message:
  -----------
  Merge pull request #406 from zanata/fixBuild

Fix lists and sets to use guava library rather than testNG lib


  Commit: 1f3f7bf8159ee893da460e63a1cfe678be783b55
      https://github.com/zanata/zanata-server/commit/1f3f7bf8159ee893da460e63a1cfe678be783b55
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M .gitattributes
    M branch-release.sh
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/FillInTranslationGap.groovy
    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/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Merge pull request #212 from zanata/cleanup-warnings

WIP: Clean up some findbugs warnings


  Commit: 623024015a89def4df0117170be9205d67239832
      https://github.com/zanata/zanata-server/commit/623024015a89def4df0117170be9205d67239832
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java

  Log Message:
  -----------
  WIP: include project, document and resId condition in TM query


  Commit: ea1b06681070e3fc964ccb6cc12b0d6b9bab0403
      https://github.com/zanata/zanata-server/commit/ea1b06681070e3fc964ccb6cc12b0d6b9bab0403
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M .gitattributes
    M branch-release.sh
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/FillInTranslationGap.groovy
    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/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp/resources/script/components-script.js

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java


  Commit: 790c9426102d730a47103fec8c9c3ac9aa224c0c
      https://github.com/zanata/zanata-server/commit/790c9426102d730a47103fec8c9c3ac9aa224c0c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.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

  Log Message:
  -----------
  WIP: copytrans


Compare: https://github.com/zanata/zanata-server/compare/27194111bb95...790c9426102d


More information about the zanata-commits mailing list