This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch docker in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit 34f7c351f019fbf169dbd27823e61bd57c453abd Merge: 583091d b5b4ce8 Author: Georg Kallidis <[email protected]> AuthorDate: Thu Jul 25 09:55:36 2019 +0200 merged master into docker branch pom.xml | 15 +- .../resources/archetype-resources/docs/README.md | 4 +- src/main/resources/archetype-resources/pom.xml | 44 ++-- .../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 +- .../src/main/webapp/META-INF/context.xml | 2 +- .../WEB-INF/conf/TurbineResources.properties | 13 +- .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 7 +- 31 files changed, 405 insertions(+), 441 deletions(-) diff --cc pom.xml index 2b780d1,b84cc9f..24cc232 --- a/pom.xml +++ b/pom.xml @@@ -37,18 -37,12 +37,19 @@@ <inceptionYear>2011</inceptionYear> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</developerConnection> - <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</url> + <connection>scm:git:https://github.com/apache/turbine-archetypes</connection> + <developerConnection>scm:git:https://github.com/apache/turbine-archetypes</developerConnection> + <url>scm:git:https://github.com/apache/turbine-archetypes</url> </scm> -- ++ + <properties> + <turbine_database_url>jdbc:mysql://localhost:3306/</turbine_database_url> + <docker>false</docker> + <app_volume_local_repo>not_used</app_volume_local_repo> + </properties> - - <build> ++ + <build> ++ <extensions> <extension> <groupId>org.apache.maven.archetype</groupId>
