Console Output

+ git merge --ff appng-authentication-1.13.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 application-home/application.xml                   |   2 +-
 application-home/beans.xml                         |   8 -
 application-home/conf/datasources.xml              |  35 +-
 application-home/conf/ev-profile.xml               |  18 +
 application-home/conf/pages.xml                    |   8 +
 .../dictionary/authentication-messages.properties  |  23 +-
 .../authentication-messages_de.properties          |  23 +-
 license-header.txt                                 |   2 +-
 pom.xml                                            |   8 +-
 .../application/authentication/AbstractLogon.java  |  18 +-
 .../authentication/digest/DigestLogin.java         |  12 +-
 .../application/authentication/ntlm/NtlmLogin.java |  12 +-
 .../authentication/webform/EditProfile.java        | 155 ++++++
 .../authentication/webform/LoginData.java          |  31 +-
 .../authentication/webform/LoginForm.java          |   4 +-
 .../authentication/webform/LoginUser.java          |  12 +-
 .../authentication/webform/LogoutUser.java         |  11 +-
 .../authentication/webform/PasswordChange.java     | 113 +++-
 .../authentication/webform/PasswordReset.java      |  37 +-
 .../application/authentication/BaseLoginTest.java  |  23 +-
 .../authentication/digest/DigestLoginTest.java     |   2 +-
 .../authentication/digest/Digestgenerator.java     |   2 +-
 .../authentication/ntlm/NtlmLoginTest.java         |   2 +-
 .../webform/AuthenticationTestDataProvider.java    |  24 +-
 .../authentication/webform/EditProfileTest.java    |  66 +++
 .../authentication/webform/LoginFormTest.java      |  13 +-
 .../authentication/webform/LoginUserTest.java      |   2 +-
 .../authentication/webform/LogoutUserTest.java     |   2 +-
 .../authentication/webform/PasswordChangeTest.java | 148 ++++++
 .../authentication/webform/PasswordResetTest.java  |   4 +-
 .../xml/EditProfileTest-testEditProfile.xml        | 584 +++++++++++++++++++++
 .../xml/PasswordChangeTest-testChangePassword.xml  |  70 +++
 ...asswordChangeTest-testChangePasswordNoMatch.xml |  71 +++
 ...dChangeTest-testChangePasswordVoilatePolicy.xml |  81 +++
 ...sswordChangeTest-testChangePasswordWrongOld.xml |  71 +++
 35 files changed, 1599 insertions(+), 98 deletions(-)
 create mode 100644 application-home/conf/ev-profile.xml
 create mode 100644 src/main/java/org/appng/application/authentication/webform/EditProfile.java
 create mode 100644 src/test/java/org/appng/application/authentication/webform/EditProfileTest.java
 create mode 100644 src/test/java/org/appng/application/authentication/webform/PasswordChangeTest.java
 create mode 100644 src/test/resources/xml/EditProfileTest-testEditProfile.xml
 create mode 100644 src/test/resources/xml/PasswordChangeTest-testChangePassword.xml
 create mode 100644 src/test/resources/xml/PasswordChangeTest-testChangePasswordNoMatch.xml
 create mode 100644 src/test/resources/xml/PasswordChangeTest-testChangePasswordVoilatePolicy.xml
 create mode 100644 src/test/resources/xml/PasswordChangeTest-testChangePasswordWrongOld.xml