[zanata/zanata] 6a579f: Fix Kerberos login issue: user can login even acco...

Wed Feb 13 03:09:26 UTC 2013

  Branch: refs/heads/seam230final
  Home:   https://github.com/zanata/zanata
  Commit: 6a579fa1235307bda8ca747adbdfee018105ed14
      https://github.com/zanata/zanata/commit/6a579fa1235307bda8ca747adbdfee018105ed14
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

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

  Log Message:
  -----------
  Fix Kerberos login issue: user can login even account is disabled


  Commit: 6bff073d61dce1d69319e1df28068b3370b47af3
      https://github.com/zanata/zanata/commit/6bff073d61dce1d69319e1df28068b3370b47af3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-2.1.2


  Commit: 9e6087910dfef70e36b01f65304b7aaa64b69c94
      https://github.com/zanata/zanata/commit/9e6087910dfef70e36b01f65304b7aaa64b69c94
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 446f04a0d05037ad8ef0efa5bf015fe903ec89a3
      https://github.com/zanata/zanata/commit/446f04a0d05037ad8ef0efa5bf015fe903ec89a3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

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

  Log Message:
  -----------
  fix copy trans not using latest translation: https://bugzilla.redhat.com/show_bug.cgi?id=896332


  Commit: 27a5bbe6ddd3bbe337fe33da4831ebdd0686439a
      https://github.com/zanata/zanata/commit/27a5bbe6ddd3bbe337fe33da4831ebdd0686439a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'release' of github.com:zanata/zanata into release


  Commit: 1d0fcd558fd00d5da0f42f83e25af13426149867
      https://github.com/zanata/zanata/commit/1d0fcd558fd00d5da0f42f83e25af13426149867
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

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

  Log Message:
  -----------
  fix copy trans not using latest translation: https://bugzilla.redhat.com/show_bug.cgi?id=896332


  Commit: 87cb339e07ab0caa2ed1a1f1cc188a92ef482723
      https://github.com/zanata/zanata/commit/87cb339e07ab0caa2ed1a1f1cc188a92ef482723
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-2.1.3


  Commit: 4cad3372b0b2d8e999f0fc6807a8e6a385430f49
      https://github.com/zanata/zanata/commit/4cad3372b0b2d8e999f0fc6807a8e6a385430f49
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 094bf70a2d864fff9467ab494a6cf63f9d50f202
      https://github.com/zanata/zanata/commit/094bf70a2d864fff9467ab494a6cf63f9d50f202
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    A zanata-war/src/main/java/org/zanata/action/ValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Work in progress: implement persist validation against projecty


  Commit: a9a1105ad35a7b166783b1a49d63af3a7c54d1b8
      https://github.com/zanata/zanata/commit/a9a1105ad35a7b166783b1a49d63af3a7c54d1b8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    M zanata-war/src/main/java/org/zanata/action/ValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Implement validation persist in project level


  Commit: 9958b3e95c2a54103901b7c80a10928df3929ced
      https://github.com/zanata/zanata/commit/9958b3e95c2a54103901b7c80a10928df3929ced
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    A zanata-war/src/main/java/org/zanata/action/ProjectValidationOptionsAction.java
    R zanata-war/src/main/java/org/zanata/action/ValidationOptionsAction.java
    A zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ActivateWorkspaceResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java

  Log Message:
  -----------
  work in progress: implement persist validation in Version


  Commit: 00776ca6d9152bfd4824bcd4749c35da7dc06e90
      https://github.com/zanata/zanata/commit/00776ca6d9152bfd4824bcd4749c35da7dc06e90
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Clean up duplicate dependencies


  Commit: 0007884fa73f72faf5296c2ff78ea13803e65de7
      https://github.com/zanata/zanata/commit/0007884fa73f72faf5296c2ff78ea13803e65de7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

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

  Log Message:
  -----------
  disable server side logging to avoid email bombing


  Commit: a780a7cfc9639a9434a9d5ac498fd7d587586fae
      https://github.com/zanata/zanata/commit/a780a7cfc9639a9434a9d5ac498fd7d587586fae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

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

Conflicts:
	zanata-war/pom.xml


  Commit: 9c735a19b90c5582498fdf3e5348af06c7700a5f
      https://github.com/zanata/zanata/commit/9c735a19b90c5582498fdf3e5348af06c7700a5f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java

  Log Message:
  -----------
  rhbz908563 - html xml validation causes exception


  Commit: 60d0026eee175680fa49b3a65136067d2acd340c
      https://github.com/zanata/zanata/commit/60d0026eee175680fa49b3a65136067d2acd340c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java

  Log Message:
  -----------
  Merge branch 'release' into work

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml


  Commit: 0dad4407b232eb39def859ebfa1ea11e1efb0fc0
      https://github.com/zanata/zanata/commit/0dad4407b232eb39def859ebfa1ea11e1efb0fc0
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationObject.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Implement validation options persist: https://bugzilla.redhat.com/show_bug.cgi?id=903926


  Commit: 72306246ed39d4837d7216d795c10e30aa2c7eea
      https://github.com/zanata/zanata/commit/72306246ed39d4837d7216d795c10e30aa2c7eea
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    A zanata-war/src/main/java/org/zanata/action/ProjectValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationObject.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ActivateWorkspaceResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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


  Commit: 1987a76264be65dee89213a9b32c4c95e3f57e06
      https://github.com/zanata/zanata/commit/1987a76264be65dee89213a9b32c4c95e3f57e06
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Implement inheritance of validation rules from project when create new version


  Commit: 09c218b246a054d307626a29085b94291619f97d
      https://github.com/zanata/zanata/commit/09c218b246a054d307626a29085b94291619f97d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/InvalidStateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  fix unit test


  Commit: 8de1387662fefeb15cdce725412db838342cca57
      https://github.com/zanata/zanata/commit/8de1387662fefeb15cdce725412db838342cca57
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

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

  Log Message:
  -----------
  Refactor 'copy' of validation rules from Project when create new version


  Commit: 2ffd712a1652af4c797b5e47bb60451ff3303bc5
      https://github.com/zanata/zanata/commit/2ffd712a1652af4c797b5e47bb60451ff3303bc5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml

  Log Message:
  -----------
  Implement 'copy' of projectType from project to version: https://bugzilla.redhat.com/show_bug.cgi?id=909032


  Commit: 4ed20fea576d4dcd959e9a9b29d179442d5ffb0c
      https://github.com/zanata/zanata/commit/4ed20fea576d4dcd959e9a9b29d179442d5ffb0c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

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

  Log Message:
  -----------
  rhbz910216 make statistics service respect word level stats flag


  Commit: 7973d5db338578e89fa6b56576cf9f3b75a2526c
      https://github.com/zanata/zanata/commit/7973d5db338578e89fa6b56576cf9f3b75a2526c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Fix unexpected error when config file download: https://bugzilla.redhat.com/show_bug.cgi?id=909026


  Commit: a5c1837528102d0faea4c4f0dbc6f0d04a666a78
      https://github.com/zanata/zanata/commit/a5c1837528102d0faea4c4f0dbc6f0d04a666a78
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

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

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: 1179a241a5b9532792a4a44bb732b6a7a45b4253
      https://github.com/zanata/zanata/commit/1179a241a5b9532792a4a44bb732b6a7a45b4253
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml

  Log Message:
  -----------
  Minor refactor on email generation for email change confirmation


  Commit: 7ffb578f1cf84eec20857f181f249d0c1e38efee
      https://github.com/zanata/zanata/commit/7ffb578f1cf84eec20857f181f249d0c1e38efee
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    A zanata-war/src/main/java/org/zanata/action/ProjectValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/rest/InvalidStateExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationObject.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ActivateWorkspaceResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: 69ec5c8a5cdb9c3d84407ff294e729a986b858b5
      https://github.com/zanata/zanata/commit/69ec5c8a5cdb9c3d84407ff294e729a986b858b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java

  Log Message:
  -----------
  Revert part of test


  Commit: e833cb4979f1e2348d7f9f15d9d7eccad711dfd5
      https://github.com/zanata/zanata/commit/e833cb4979f1e2348d7f9f15d9d7eccad711dfd5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/Breadcrumbs.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/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.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/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    A zanata-war/src/main/java/org/zanata/security/AuthenticationTypeCallback.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    A zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/ColumnSort.java
    A zanata-war/src/main/java/org/zanata/ui/ColumnSortCompositeComponent.java
    A zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/account/klogin.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/main/webapp/resources/css/jsf-skin.css
    M zanata-war/src/main/webapp/resources/css/zanata.css
    A zanata-war/src/main/webapp/resources/images/asc_sort.gif
    A zanata-war/src/main/webapp/resources/images/desc_sort.gif
    A zanata-war/src/main/webapp/resources/images/unsorted.gif
    A zanata-war/src/main/webapp/resources/richext/columnSorter.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Merge remote branch 'origin/seam230final' into seam230final


  Commit: ccedd5c6f9804ad86a0319712efec1a86feb1cd4
      https://github.com/zanata/zanata/commit/ccedd5c6f9804ad86a0319712efec1a86feb1cd4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    A zanata-war/src/main/java/org/zanata/action/ProjectValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionValidationOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/rest/ConstraintViolationExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/UncaughtExceptionHandlerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationObject.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ActivateWorkspaceResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ValidationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/InvalidStateExceptionMapper.java
	zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
	zanata-war/src/main/webapp/WEB-INF/pages.xml


Compare: https://github.com/zanata/zanata/compare/0d0452509cb5...ccedd5c6f980