[zanata/zanata-server] 805ec4: FAS-only authentication - https://github.com/zanat...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 805ec4487af98f409efdb96015625d8bdc2a24e3
      https://github.com/zanata/zanata-server/commit/805ec4487af98f409efdb96015625d8bdc2a24e3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  FAS-only authentication - https://github.com/zanata/zanata-server/pull/536

Squashed commit of the following:

commit 6b281d9240e9573174329459f6db15ff44a2e480
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 31 15:32:53 2014 +1000

    rhbz1120016 - Organize redirection directives for Open id.

    This was leaving an unused scenario which was causing a blank page.

commit 86d181b0e223a7f7930da94cbe2dab11934397bd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 31 12:32:27 2014 +1000

    rhbz1120016 - Fix missing "Log In" button label.

commit e6333fe01b957ea03512f987d1497375c3dffbb7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Jul 30 15:07:55 2014 +1000

    Code Review fixes.

commit 110db4032685f9e59eb4759602e9e81b25b3eb57
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jul 22 14:41:04 2014 +1000

    rhbz1120016 - Allow single OpenId authentication.

    Offer a configuration setup that allows for just a single open id provider to be configured.


  Commit: 0ae0075ef518fe68b966e459765f6ca929f94470
      https://github.com/zanata/zanata-server/commit/0ae0075ef518fe68b966e459765f6ca929f94470
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

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

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml


Compare: https://github.com/zanata/zanata-server/compare/7da217e3b365...0ae0075ef518