[zanata/zanata] 370e3c: rhbz844821 - Implement Open Id account merge.

[GitHub]

  Branch: refs/heads/openid
  Home:   https://github.com/zanata/zanata
  Commit: 370e3c04cc51e73e2d279909c134627d8c96e6cd
      https://github.com/zanata/zanata/commit/370e3c04cc51e73e2d279909c134627d8c96e6cd
  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
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/AccountMergeAction.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/AccountDAO.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
    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
    A zanata-war/src/main/java/org/zanata/util/ZanataMessages.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/resources/security.drl
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    A zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  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.