Console Output

+ git merge --ff appng-authentication-1.14.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 .mvn/jvm.config                                    |   7 +
 README.adoc                                        |   4 +-
 application-home/application.xml                   |   5 +
 application-home/conf/datasources.xml              |   1 +
 .../dictionary/authentication-messages.properties  |   2 +
 license-header.txt                                 |   2 +-
 pom.xml                                            |  69 +++--
 .../application/authentication/AbstractLogon.java  |  26 +-
 .../application/authentication/BeanConfig.java     |  22 ++
 .../authentication/digest/DigestLogin.java         |   2 +-
 .../application/authentication/ntlm/NtlmLogin.java |   2 +-
 .../authentication/saml/SamlController.java        | 300 +++++++++++++++++++++
 .../authentication/webform/EditProfile.java        |   2 +-
 .../authentication/webform/LoginData.java          |   4 +-
 .../authentication/webform/LoginForm.java          |  16 +-
 .../authentication/webform/LoginUser.java          |   2 +-
 .../authentication/webform/LogoutUser.java         |   9 +-
 .../authentication/webform/PasswordChange.java     |   2 +-
 .../authentication/webform/PasswordReset.java      |  18 +-
 .../application/authentication/BaseLoginTest.java  |  18 +-
 .../authentication/digest/DigestLoginTest.java     |   2 +-
 .../authentication/digest/Digestgenerator.java     |   2 +-
 .../authentication/ntlm/NtlmLoginTest.java         |  13 +-
 .../webform/AuthenticationTestDataProvider.java    |   2 +-
 .../authentication/webform/EditProfileTest.java    |   2 +-
 .../authentication/webform/LoginFormTest.java      |  31 ++-
 .../authentication/webform/LoginUserTest.java      |   2 +-
 .../authentication/webform/LogoutUserTest.java     |   2 +-
 .../authentication/webform/PasswordChangeTest.java |   2 +-
 .../authentication/webform/PasswordResetTest.java  |   2 +-
 .../xml/LoginUserTest-testLoginNoData.xml          |   4 +
 .../resources/xml/LoginUserTest-testLoginOK.xml    |   4 +
 .../xml/LoginUserTest-testLoginWrongPassword.xml   |   4 +
 33 files changed, 489 insertions(+), 96 deletions(-)
 create mode 100644 .mvn/jvm.config
 create mode 100644 src/main/java/org/appng/application/authentication/BeanConfig.java
 create mode 100644 src/main/java/org/appng/application/authentication/saml/SamlController.java