This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit 6b1d3b7b7d910f9e0909c523b0ca967ca4def1ff Merge: 5f0afbd 8e5db34 Author: Georg Kallidis <[email protected]> AuthorDate: Fri Mar 29 08:24:35 2019 +0100 Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes src/main/resources/archetype-resources/pom.xml | 34 +-- .../main/java/flux/modules/actions/FluxAction.java | 17 +- .../main/java/flux/modules/actions/FluxLogin.java | 4 +- .../main/java/flux/modules/actions/FluxLogout.java | 11 +- .../java/flux/modules/actions/SecureAction.java | 11 +- .../modules/actions/group/FluxGroupAction.java | 10 +- .../actions/permission/FluxPermissionAction.java | 10 +- .../flux/modules/actions/role/FluxRoleAction.java | 15 +- .../flux/modules/actions/user/FluxUserAction.java | 17 +- .../main/java/flux/modules/screens/FluxError.java | 2 +- .../main/java/flux/modules/screens/FluxIndex.java | 5 +- .../main/java/flux/modules/screens/FluxScreen.java | 16 +- .../java/flux/modules/screens/group/Default.java | 2 +- .../flux/modules/screens/permission/Default.java | 2 +- .../java/flux/modules/screens/role/Default.java | 2 +- .../java/flux/modules/screens/user/Default.java | 2 +- .../src/main/java/flux/tools/FluxTool.java | 28 ++- .../java/modules/actions/ChangePasswordAction.java | 93 ++++---- .../src/main/java/modules/actions/LoginUser.java | 2 +- .../main/java/modules/actions/LoginUserIntake.java | 249 ++++++++++----------- .../src/main/java/modules/actions/LogoutUser.java | 7 +- .../main/java/modules/actions/SecureAction.java | 146 ++++++------ .../src/main/java/modules/actions/ShowRecords.java | 2 +- .../src/main/java/modules/screens/Index.java | 2 +- .../main/java/modules/screens/SecureScreen.java | 104 ++++----- .../src/main/java/wrapper/TurbineUserWrapper.java | 2 +- .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 7 +- 27 files changed, 381 insertions(+), 421 deletions(-)
