[zanata/zanata] 302a8e: Single line change to enable Google open id instea...

GitHub noreply at github.com
Wed Sep 5 23:07:27 UTC 2012 

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 302a8e00c4a8022e9de72340ee3d30c27dd0368d
      https://github.com/zanata/zanata/commit/302a8e00c4a8022e9de72340ee3d30c27dd0368d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  Single line change to enable Google open id instead of fedora.


  Commit: 0bba4e1a141d26b4b18b14e9ffc1ca557b288942
      https://github.com/zanata/zanata/commit/0bba4e1a141d26b4b18b14e9ffc1ca557b288942
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    A zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderFactory.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderType.java
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/login/google.xhtml

  Log Message:
  -----------
  rhbz844821 - Add prototype Google authentication.


  Commit: 6ac6251ddf48a75b2ee6e5480bf806700fb66424
      https://github.com/zanata/zanata/commit/6ac6251ddf48a75b2ee6e5480bf806700fb66424
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    A zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    A zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderFactory.java
    R zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderType.java
    M zanata-war/src/main/java/org/zanata/service/RegisterService.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  rhbz844821 - Add HCredentials class.

This class will hold external system credentials. Also add the backing infrastructure to support this new entity.


  Commit: e06293d8e54dddf9c44e34a0096e122dea658cba
      https://github.com/zanata/zanata/commit/e06293d8e54dddf9c44e34a0096e122dea658cba
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    A 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/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    R zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderFactory.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderManager.java
    M zanata-war/src/main/java/org/zanata/service/RegisterService.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    A zanata-war/src/main/resources/images/openid/google.png
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/login/google.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  rhbz844821 - Make open id authentication work with the HCredentials entity.


  Commit: 1cd7645a6187bf54949aed240418abb01ac8d3b0
      https://github.com/zanata/zanata/commit/1cd7645a6187bf54949aed240418abb01ac8d3b0
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/webapp/profile/view.xhtml

  Log Message:
  -----------
  rhbz844821 - Add needed columns/constraints to HCredentials entity/table.


  Commit: 92df92d7b583f3a73db89b52509a608c083b3e2a
      https://github.com/zanata/zanata/commit/92df92d7b583f3a73db89b52509a608c083b3e2a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    A zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    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/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/MyOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthCallback.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    R zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderManager.java
    A zanata-war/src/main/java/org/zanata/security/openid/YahooOpenIdProvider.java
    A zanata-war/src/main/resources/images/openid/fedora.png
    A zanata-war/src/main/resources/images/openid/myopenid.png
    A zanata-war/src/main/resources/images/openid/openid.png
    A zanata-war/src/main/resources/images/openid/yahoo.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/profile/add_identity.xhtml
    A zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  rhbz844821 - Add yahoo Open Id provider.


  Commit: 267b80be7e3a4113a28dbe3c67143882ad742a83
      https://github.com/zanata/zanata/commit/267b80be7e3a4113a28dbe3c67143882ad742a83
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthCallback.java
    M zanata-war/src/main/resources/images/openid/myopenid.png
    M zanata-war/src/main/resources/images/openid/openid.png
    M zanata-war/src/main/resources/images/openid/yahoo.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml

  Log Message:
  -----------
  rhbz844821 - Open Id navigation changes.

Breadcrumbs, navigation after authorizing a new set of credentials.


  Commit: d0cd8e8514ea471bb91deab34b9b0c30541c916c
      https://github.com/zanata/zanata/commit/d0cd8e8514ea471bb91deab34b9b0c30541c916c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml

  Log Message:
  -----------
  rhbz844821 - Implement rewritten urls for Identity management pages.


  Commit: 00e077a2625b9e214e7c2a971c4b63718789cbd9
      https://github.com/zanata/zanata/commit/00e077a2625b9e214e7c2a971c4b63718789cbd9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/GenericOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/MyOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/security/openid/YahooOpenIdProvider.java

  Log Message:
  -----------
  rhbz844821 - Implement custom attribute fetching for OpenId email address.

Different providers use different specs for retreiving emails, so customized each provider for that.


  Commit: 7e094e7eb26267be2cdade8e9ecdadb9d7da7bad
      https://github.com/zanata/zanata/commit/7e094e7eb26267be2cdade8e9ecdadb9d7da7bad
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    A zanata-model/src/main/java/org/zanata/model/validator/Unique.java
    A zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rhbz844821 - Add Unique validator annotation.

This validation is used when database constraints cannot be used. In this specific instance, HCredentials.user is a long text field which cannot be indexed at the db level.


  Commit: a34c1fbebc8e951a357e1c457863e8a3279f2524
      https://github.com/zanata/zanata/commit/a34c1fbebc8e951a357e1c457863e8a3279f2524
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    A zanata-model/src/main/java/org/zanata/model/type/RoleTypeType.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    A zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.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/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  rhbz844821 - Add Project security based on Roles.

Add a Role type for non-deletable roles.
Add a set of roles allowed for a project. Only users that belong to these roles will have access to the project.
Add auto-created roles for the OpenId instances.


  Commit: 8272b6248bc791800a23591494fc6242a802d6d6
      https://github.com/zanata/zanata/commit/8272b6248bc791800a23591494fc6242a802d6d6
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    A zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  rhbz844821 - Fix issue with login redirections for non OpenId instances.


  Commit: b31a2757e998618ce5c5f4711b020dcad28d1181
      https://github.com/zanata/zanata/commit/b31a2757e998618ce5c5f4711b020dcad28d1181
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M pom.xml
    R zanata-war/eclipse/launch/debug-jboss-zanata (1).launch
    M zanata-war/etc/gui-preview/template.xhtml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    A zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    R zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.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/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    A zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    A zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/HasPageNavigation.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/CancelCallback.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditorTextArea.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationCacheCallback.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingTableModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableConstants.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/EditTransUnitEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/EditTransUnitEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/LoadingEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/LoadingEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageChangeEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageChangeEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageCountChangeEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageCountChangeEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/RequestValidationEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TableRowSelectedEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TableRowSelectedEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DashboardPresenter.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/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutSelection.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.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/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/rpc/AbstractAsyncCallback.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/rpc/NoOpAsyncCallback.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/SinglePageDataModelImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitNavigationService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingPanel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/OptionsPanelView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/OptionsPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    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
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/HasTransUnitId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitId.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitProvidesKey.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/FindByTransUnitIdPredicate.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicate.java
    R zanata-war/src/main/resources/images/banner_bg.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    R zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png
    A zanata-war/src/main/resources/images/fontello/LICENSE.txt
    A zanata-war/src/main/resources/images/fontello/README.txt
    A zanata-war/src/main/resources/images/fontello/config.json
    A zanata-war/src/main/resources/images/fontello/css/fontello-codes.css
    A zanata-war/src/main/resources/images/fontello/css/fontello-ie7-codes.css
    A zanata-war/src/main/resources/images/fontello/css/fontello-ie7.css
    A zanata-war/src/main/resources/images/fontello/css/fontello.css
    A zanata-war/src/main/resources/images/fontello/demo.html
    A zanata-war/src/main/resources/images/fontello/font/fontello.eot
    A zanata-war/src/main/resources/images/fontello/font/fontello.svg
    A zanata-war/src/main/resources/images/fontello/font/fontello.ttf
    A zanata-war/src/main/resources/images/fontello/font/fontello.woff
    A zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/x.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/ban.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/chevron-down.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/chevron-right.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/cross.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/edit.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/eye-open.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/file.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/house.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/lock.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/search.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/signin.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/signout.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/tick.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/user.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/WebTransStyles.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html
    A zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-compressed.js
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.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
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    R zanata-war/src/main/webapp/admin/glossary.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    A zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/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/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/stylesheet/base.css
    A zanata-war/src/main/webapp/stylesheet/menu.css
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TransUnitsModelUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/LICENSE.txt
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/README.txt
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/config.json
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-codes.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-ie7-codes.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-ie7.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/demo.html
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.eot
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.svg
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.ttf
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.woff
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into openid

Conflicts:
	zanata-war/src/main/webapp/iteration/view.xhtml


  Commit: 4ec218faea9962757ec911a6cdb0c6037f0236f1
      https://github.com/zanata/zanata/commit/4ec218faea9962757ec911a6cdb0c6037f0236f1
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/test/model/AccountData.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

  Log Message:
  -----------
  rhbz844821 - Fix tests by adding values for newly created db columns.


  Commit: 1be597579af051ff49122e5f3a249abad3494bd4
      https://github.com/zanata/zanata/commit/1be597579af051ff49122e5f3a249abad3494bd4
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml

  Log Message:
  -----------
  rhbz844821 - Minor changes to open Id UI. 


  Commit: 7bebd7248c407a7c8539df4f8b285c1108940648
      https://github.com/zanata/zanata/commit/7bebd7248c407a7c8539df4f8b285c1108940648
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    A zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  rhbz844821 - Add message indicating why a user cannot translate a project.


  Commit: 5e81838790944295325c395d3c569eff301e28f1
      https://github.com/zanata/zanata/commit/5e81838790944295325c395d3c569eff301e28f1
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/annotation/EntityRestrict.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    M zanata-war/src/main/java/org/zanata/service/RegisterService.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/identities.xhtml
    A zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  rhbz844821 - Implement Open Id account merge.

Also enriched the SmartEntityListener so that there is more control over what actions are restricted and checked by the rules, and which aren't.


  Commit: 2dfcbde825236533febb53f2ff5823b23ad3509f
      https://github.com/zanata/zanata/commit/2dfcbde825236533febb53f2ff5823b23ad3509f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderType.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  rhbz844821 - General cleanup.

Move the openid login page to its own facelet for easier reuse.
Add the concept of an Open Id provider enum.
Clean up messages.


  Commit: 085fa40f43faa36979269195237584a5de5ffd95
      https://github.com/zanata/zanata/commit/085fa40f43faa36979269195237584a5de5ffd95
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/stylesheet/2.0.css

  Log Message:
  -----------
  Minot UI changes to datascroller style.


  Commit: 0640f6dd71adb6195ed82cf4d39fe7f2b61534c3
      https://github.com/zanata/zanata/commit/0640f6dd71adb6195ed82cf4d39fe7f2b61534c3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/annotation/EntityRestrict.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
    A zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
    A zanata-model/src/main/java/org/zanata/model/type/RoleTypeType.java
    A zanata-model/src/main/java/org/zanata/model/validator/Unique.java
    A zanata-model/src/main/java/org/zanata/model/validator/UniqueValidator.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    A zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    A 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/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.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/AccountRoleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
    M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenId.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    A zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/openid/FedoraOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/GenericOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/GoogleOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/MyOpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthCallback.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdAuthenticationResult.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProvider.java
    A zanata-war/src/main/java/org/zanata/security/openid/OpenIdProviderType.java
    A zanata-war/src/main/java/org/zanata/security/openid/YahooOpenIdProvider.java
    M zanata-war/src/main/java/org/zanata/service/RegisterService.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-2.0.xml
    A zanata-war/src/main/resources/images/openid/fedora.png
    A zanata-war/src/main/resources/images/openid/google.png
    A zanata-war/src/main/resources/images/openid/myopenid.png
    A zanata-war/src/main/resources/images/openid/openid.png
    A zanata-war/src/main/resources/images/openid/yahoo.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/login_provider.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/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    A zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    A zanata-war/src/main/webapp/profile/identities.xhtml
    A zanata-war/src/main/webapp/profile/merge_account.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
    M zanata-war/src/main/webapp/stylesheet/2.0.css
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/AccountData.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

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

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java


Compare: https://github.com/zanata/zanata/compare/7a21233aa732...0640f6dd71ad

More information about the zanata-commits mailing list