You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2025/11/14 13:59:24 UTC
(turbine-archetypes) branch master updated (da940a6 -> fef16e7)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
from da940a6 update firstname position
new 6cf3c6c Add java builder to eclipse project and nae it generic turbine-webapp-archetype; todo: put into .project into .gitignore?
new e8b2207 Use more general phrase in READme.md
new fef16e7 Fix resetting of user data in FluxLogut (assuming unintendedly) by check in FluxUserAction update method
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.project | 9 +++++++--
README.md | 2 +-
.../main/java/flux/modules/actions/user/FluxUserAction.java | 12 ++++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
(turbine-archetypes) 02/03: Use more general phrase in READme.md
Posted by gk...@apache.org.
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 e8b220712a98214ab8c56b7e96b24642e222d04e
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Nov 14 14:55:57 2025 +0100
Use more general phrase in READme.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 63a99cd..a40d908 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# turbine-webapp-7.0
-* Maven Archetype to generate a webapp utilizing Turbine 7.0 and Torque 6.0 (and later Torque 7.0)
+* Maven Archetype to generate a webapp utilizing Turbine 7.0 (or later) and Torque 6.0 (or later)
* Java 17 JDK or later since Turbine 7.0
# turbine-webapp-6.0
(turbine-archetypes) 01/03: Add java builder to eclipse project and nae it generic turbine-webapp-archetype; todo: put into .project into .gitignore?
Posted by gk...@apache.org.
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 6cf3c6cd12e5194c3528d322a008d7d73faccc9f
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Nov 14 14:52:43 2025 +0100
Add java builder to eclipse project and nae it generic turbine-webapp-archetype; todo: put into .project into .gitignore?
---
.project | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.project b/.project
index 9c0b14b..3b2724d 100644
--- a/.project
+++ b/.project
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>turbine-webapp-6.0</name>
- <comment>This archetype sets up a web application project based on Apache Turbine 6.0 and Torque 5.1. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <name>turbine-webapp-archetype</name>
+ <comment>This archetype sets up a web application project based on Apache Turbine and Torque. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
(turbine-archetypes) 03/03: Fix resetting of user data in FluxLogut (assuming unintendedly) by check in FluxUserAction update method
Posted by gk...@apache.org.
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 fef16e77ac510860465855b6069185a454b98f43
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Nov 14 14:57:18 2025 +0100
Fix resetting of user data in FluxLogut (assuming unintendedly) by check in FluxUserAction update method
---
.../main/java/flux/modules/actions/user/FluxUserAction.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
index 0a8afb7..594254e 100644
--- a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
+++ b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
@@ -134,6 +134,18 @@ public class FluxUserAction extends FluxAction
data.getParameters().setProperties(user);
user.setPassword(tmp_user.getPassword());
security.saveUser(user);
+
+ // check, if current user is updated, then update session user except the password.
+ // This is, because in FlixLogout when logging out
+ // security.saveUser(user); is called with the current user from the session
+ // and the data would be resetted
+ if (data.getUser().getName().equals( username )) {
+ log.info( "Updating: Update session user as well to not reset data after logout (except password)." );
+ User userFromSession = data.getUserFromSession();
+ data.getParameters().setProperties(userFromSession);
+ userFromSession.setPassword(tmp_user.getPassword());
+ data.setUser( userFromSession );
+ }
// Test if Admin provided new password
String password = data.getParameters().getString("password");