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

GitHub noreply at github.com
Mon Apr 7 06:27:56 UTC 2014


  Branch: refs/heads/rate-limit
  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: c826b1dd0d5c681d6c568f48d0ea44335cb46cd2
      https://github.com/zanata/zanata-server/commit/c826b1dd0d5c681d6c568f48d0ea44335cb46cd2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  rhbz1074365 Ensure that GWT listeners are stopped on redeploy


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  rhbz1074365 Add ClassLoaderLeakPreventor


  Commit: 3089cb61e0bd4bead7f1a3c0a4c563d2aa3827b2
      https://github.com/zanata/zanata-server/commit/3089cb61e0bd4bead7f1a3c0a4c563d2aa3827b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  rhbz1074365 Remove redundant shutdown hook


  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
    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

  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: ac00fcbfaea8896f7a834b4e5724ce55847696ad
      https://github.com/zanata/zanata-server/commit/ac00fcbfaea8896f7a834b4e5724ce55847696ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  Switch to LeakListener, which logs via JDK instead of stdout/stderr


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java

  Log Message:
  -----------
  Reduce logging for GWT file uploads


  Commit: de74ede32a1cf080a19630593a934c5366dfdcc3
      https://github.com/zanata/zanata-server/commit/de74ede32a1cf080a19630593a934c5366dfdcc3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M 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/resources/messages.properties

  Log Message:
  -----------
  Show SCM id instead of build timestamp; refactor extraction of build metadata


  Commit: 0cde1f28f01e6b93e493f776cd8013e238e3a169
      https://github.com/zanata/zanata-server/commit/0cde1f28f01e6b93e493f776cd8013e238e3a169
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade groovy.eclipse.compiler.version in newCompiler profile


  Commit: f7a5fb8ecc86a785685d0811f4e9eee19dbd2320
      https://github.com/zanata/zanata-server/commit/f7a5fb8ecc86a785685d0811f4e9eee19dbd2320
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java

  Log Message:
  -----------
  Change REST compat tests to get URLs from class annotations to suit apicompat upgrade


  Commit: 6724cf16b81581fe82fa2c7348c49316588edb17
      https://github.com/zanata/zanata-server/commit/6724cf16b81581fe82fa2c7348c49316588edb17
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  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/resources/messages.properties
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java

  Log Message:
  -----------
  Merge pull request #402 from zanata/gitDescribe

Show SCM id instead of build timestamp; refactor extraction of build met...


  Commit: cf45e0f3c7711b5d92344e25a719ce23d7259c43
      https://github.com/zanata/zanata-server/commit/cf45e0f3c7711b5d92344e25a719ce23d7259c43
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add gitDescribe to zanata war manifest


  Commit: 2b5a5af32af12303dd62d4297f419d6d2939dc26
      https://github.com/zanata/zanata-server/commit/2b5a5af32af12303dd62d4297f419d6d2939dc26
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java

  Log Message:
  -----------
  Merge pull request #401 from zanata/reduce-upload-logging

Reduce logging for GWT file uploads


  Commit: b5a6257299ae13ea924ba0a95d9c86bdb523bd74
      https://github.com/zanata/zanata-server/commit/b5a6257299ae13ea924ba0a95d9c86bdb523bd74
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #403 from zanata/gitDescribe

Add gitDescribe to zanata war manifest


  Commit: 469fb24c15b81e98d0c2ee359d83d05881dca305
      https://github.com/zanata/zanata-server/commit/469fb24c15b81e98d0c2ee359d83d05881dca305
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  Merge pull request #388 from zanata/rhbz1074365

rhbz1074365 Prevent thread leaks on redeploy


  Commit: 4347931e8fb3d727aafa9878a736890f268402ad
      https://github.com/zanata/zanata-server/commit/4347931e8fb3d727aafa9878a736890f268402ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.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/UpdateTransUnitHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  rhbz1077439 Rename SecurityService.checkPermission to checkWorkspaceAction


  Commit: a8fc51228bad9d56daf81f25d28fb7481a877141
      https://github.com/zanata/zanata-server/commit/a8fc51228bad9d56daf81f25d28fb7481a877141
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.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/UpdateTransUnitHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Merge pull request #404 from zanata/rhbz1077439

rhbz1077439 Rename SecurityService.checkPermission to checkWorkspaceAction


  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: d95e40c40fc1bd5c11516947515b81a1177eb9a4
      https://github.com/zanata/zanata-server/commit/d95e40c40fc1bd5c11516947515b81a1177eb9a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

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

  Log Message:
  -----------
  Add AssertJ and fix broken unit test


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

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

  Log Message:
  -----------
  Merge pull request #407 from zanata/use-assertj

Add AssertJ and fix broken unit test


  Commit: bafd0d2ca5c3f982a75ffc1f9c84f9e6ffb6c5f3
      https://github.com/zanata/zanata-server/commit/bafd0d2ca5c3f982a75ffc1f9c84f9e6ffb6c5f3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M .gitattributes
    M branch-release.sh
    M pom.xml
    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/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/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/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/LeakListener.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/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.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/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

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

Conflicts:
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/bfe70c8f9d9d...bafd0d2ca5c3


More information about the zanata-commits mailing list