Console Output

+ git merge --ff appng-authentication-1.13.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 application-home/conf/datasources.xml              | 27 ++++++++++-
 application-home/conf/ev-form-auth.xml             | 14 +++++-
 .../dictionary/authentication-messages.properties  |  2 +
 .../authentication-messages_de.properties          |  2 +
 pom.xml                                            |  2 +-
 .../application/authentication/AbstractLogon.java  |  2 +-
 .../authentication/digest/DigestLogin.java         |  2 +-
 .../application/authentication/ntlm/NtlmLogin.java |  2 +-
 .../authentication/webform/EditProfile.java        |  2 +-
 .../authentication/webform/LoginData.java          |  9 +++-
 .../authentication/webform/LoginForm.java          |  2 +-
 .../authentication/webform/LoginUser.java          |  2 +-
 .../authentication/webform/LogoutUser.java         |  2 +-
 .../authentication/webform/PasswordChange.java     |  2 +-
 .../authentication/webform/PasswordReset.java      |  2 +-
 .../application/authentication/BaseLoginTest.java  |  2 +-
 .../authentication/digest/DigestLoginTest.java     |  2 +-
 .../authentication/digest/Digestgenerator.java     |  2 +-
 .../authentication/ntlm/NtlmLoginTest.java         |  2 +-
 .../webform/AuthenticationTestDataProvider.java    |  2 +-
 .../authentication/webform/EditProfileTest.java    |  2 +-
 .../authentication/webform/LoginFormTest.java      |  2 +-
 .../authentication/webform/LoginUserTest.java      | 24 +++++++++-
 .../authentication/webform/LogoutUserTest.java     |  2 +-
 .../authentication/webform/PasswordChangeTest.java |  2 +-
 .../authentication/webform/PasswordResetTest.java  |  2 +-
 .../xml/LoginUserTest-testLoginNoData.xml          | 56 ++++++++++++++++++++++
 .../resources/xml/LoginUserTest-testLoginOK.xml    | 52 ++++++++++++++++++++
 .../xml/LoginUserTest-testLoginWrongPassword.xml   | 50 +++++++++++++++++++
 29 files changed, 250 insertions(+), 26 deletions(-)
 create mode 100644 src/test/resources/xml/LoginUserTest-testLoginNoData.xml
 create mode 100644 src/test/resources/xml/LoginUserTest-testLoginOK.xml
 create mode 100644 src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml