[zanata/zanata-server] dfff93: Add form based kerberos authentication settings.

GitHub noreply at github.com
Mon Nov 11 06:13:56 UTC 2013


  Branch: refs/heads/rhbz991336
  Home:   https://github.com/zanata/zanata-server
  Commit: dfff93cd75dbf59bc8e404bb902e3cef4ea38e29
      https://github.com/zanata/zanata-server/commit/dfff93cd75dbf59bc8e404bb902e3cef4ea38e29
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/account/klogin_form.html
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Add form based kerberos authentication settings.


  Commit: 5c5abc6199d32badee0e918707879aaf08993a18
      https://github.com/zanata/zanata-server/commit/5c5abc6199d32badee0e918707879aaf08993a18
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/account/klogin_form.html
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Finalize kerberos form-based authentication.

Add a login page segment specific to kerberos.
Add a web.xml rule that redirects to the login page when ticket authentication fails.


  Commit: af1ec1673d98189cffbe89ae54a26059ef1e2602
      https://github.com/zanata/zanata-server/commit/af1ec1673d98189cffbe89ae54a26059ef1e2602
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js

  Log Message:
  -----------
  Remove carriage return.


  Commit: 90a8b077f9c81a3c858c661442204766e4b6ba4c
      https://github.com/zanata/zanata-server/commit/90a8b077f9c81a3c858c661442204766e4b6ba4c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Form and ticket based kerberos authentication working.

URL Redirects don't work on this revision.


  Commit: 10d965875283232b99e1f389123db447935108be
      https://github.com/zanata/zanata-server/commit/10d965875283232b99e1f389123db447935108be
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/servlet/KerberosLoginFormServlet.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    R zanata-war/src/main/webapp/account/klogin_form.html
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Replace static login form with Servlet.

This way the query string can be preserved.


  Commit: 9dba9c4b516f141e1de7e6c4c09c6fb01a30a004
      https://github.com/zanata/zanata-server/commit/9dba9c4b516f141e1de7e6c4c09c6fb01a30a004
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/etc/zanata-ds.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/ServerConstants.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.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/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    A zanata-war/src/main/java/org/zanata/servlet/MDCInsertingServletFilter.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.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/RefreshProjectStatsEvent.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
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.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/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.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
    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.16.cache.css
    A zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror/codemirror-compressed-3.16.cache.js
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    R zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into kerberos-form-auth


  Commit: 8bdfd01bc6f19d45604429006cd2868304281fb4
      https://github.com/zanata/zanata-server/commit/8bdfd01bc6f19d45604429006cd2868304281fb4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Fix incorrect use of output text.


  Commit: 20cf8048fec041665385ce26def663a4a5ebe5f6
      https://github.com/zanata/zanata-server/commit/20cf8048fec041665385ce26def663a4a5ebe5f6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Remove unnecessary items from login screen on kerberos authentication.

Also make sure some items in the top banner are also not visible in certain cases.


  Commit: 1512db8bd2cdbd59f2a199e45d0da1b79ff70d49
      https://github.com/zanata/zanata-server/commit/1512db8bd2cdbd59f2a199e45d0da1b79ff70d49
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Make sure identity is logged out when cancelling profile editing.

The profile edit screen and login profile edit process need to be separated.


  Commit: eedcf4fd0dc886e1a0526986c93ce218840d9cba
      https://github.com/zanata/zanata-server/commit/eedcf4fd0dc886e1a0526986c93ce218840d9cba
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/servlet/KerberosLoginFormServlet.java

  Log Message:
  -----------
  Correct checkstyle violations.


  Commit: dd5dbef3269db7ef44d1e8f950ca807aa7007568
      https://github.com/zanata/zanata-server/commit/dd5dbef3269db7ef44d1e8f950ca807aa7007568
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Change message label capitalization for uniformity.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
    M zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Switch from Seam Logging to Slf4j


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/legal.html
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    R zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into switch-to-slf4j

Conflicts:
	zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
	zanata-war/src/main/java/org/zanata/action/RegisterAction.java
	zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java


  Commit: 493a143b6032732e8241f4f6b6c44db82df85550
      https://github.com/zanata/zanata-server/commit/493a143b6032732e8241f4f6b6c44db82df85550
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update groovy.eclipse.batch.version to 2.1.5-03


  Commit: 555c7a84d429c8cc4e11df17663c1e3b1b376c32
      https://github.com/zanata/zanata-server/commit/555c7a84d429c8cc4e11df17663c1e3b1b376c32
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java

  Log Message:
  -----------
  Basic project creation tests

Test basic project, and inactive and obsolete projects.
Add a createProject workflow helper using a project options map.
Add a constant for project types, as it's used in several places.


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

  Changed paths:
    M zanata-war/eclipse/code_templates_code.xml

  Log Message:
  -----------
  Update copyright year in code template


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/StatisticBar.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/TextFormatUtil.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/legal.html
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/master' into kerberos-form-auth

Conflicts:
	zanata-war/src/main/webapp/account/login.xhtml


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

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    R zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java

  Log Message:
  -----------
  Update arquillian to the most recent versions

Arquillian upgraded to 1.1.1.Final
JBoss AS managed container extension upgraded to 7.2.0.Final which brings it in line with EAP 6.1.0
Seam extension updated to 1.0.0.Beta1. This removes the need for a custom class.
We are still using a custom ManagementClient as arquillian hasn't fixed this part. This class has been updated to the same version of Arquillian.
Update the ArquillianSuiteExtension with latest changes from Aslak Knutsen.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    A zanata-war/src/main/java/org/zanata/servlet/KerberosLoginFormServlet.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/login.xhtml

  Log Message:
  -----------
  Merge pull request #244 from zanata/kerberos-form-auth

Kerberos Form based authentication


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

  Changed paths:
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java

  Log Message:
  -----------
  Format externally copied classes to our coding standards.


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add declared used dependency.


  Commit: 265b3703c0d35f671ac34241612e6762475c9a07
      https://github.com/zanata/zanata-server/commit/265b3703c0d35f671ac34241612e6762475c9a07
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    R zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java

  Log Message:
  -----------
  Merge pull request #264 from zanata/arquillian-1.1.1

Update arquillian to the most recent version


  Commit: f140bfdf5bfcf5716b37701427052d2d5cd604b0
      https://github.com/zanata/zanata-server/commit/f140bfdf5bfcf5716b37701427052d2d5cd604b0
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #259 from zanata/groovy.eclipse.batch.version-2.1.5-03

Update groovy.eclipse.batch.version to 2.1.5-03


  Commit: 7a7bdde504f83685755c07db87b1822804e9cafe
      https://github.com/zanata/zanata-server/commit/7a7bdde504f83685755c07db87b1822804e9cafe
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M zanata-war/eclipse/code_templates_code.xml

  Log Message:
  -----------
  Merge pull request #262 from zanata/update-file-header

Update copyright year in code template


  Commit: b5eed805ba64bf41715b8eabc5132165cfaf9f25
      https://github.com/zanata/zanata-server/commit/b5eed805ba64bf41715b8eabc5132165cfaf9f25
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java

  Log Message:
  -----------
  Merge pull request #261 from zanata/project-create-tests

Basic project creation tests


  Commit: c4152ef90609367c870618aee8d49c302619cc40
      https://github.com/zanata/zanata-server/commit/c4152ef90609367c870618aee8d49c302619cc40
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
    M zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Merge pull request #256 from zanata/switch-to-slf4j

Switch from Seam Logging to Slf4j


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    A functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M pom.xml
    M zanata-war/eclipse/code_templates_code.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/H2DocumentHistoryTrigger.java
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/LocaleListAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerAction.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/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
    M zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java
    A zanata-war/src/main/java/org/zanata/servlet/KerberosLoginFormServlet.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/ArquillianSuiteExtension.java
    R zanata-war/src/test/java/org/zanata/arquillian/Seam2ExtendedConfigurationProducer.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupMaintainerAction.java


Compare: https://github.com/zanata/zanata-server/compare/7c40d1c46891...680ae8f9773d


More information about the zanata-commits mailing list