You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/06/20 06:30:28 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine TurbineAuthentication.java TurbinePermissionManagement.java
taylor 2002/06/19 21:30:28
Modified: src/java/org/apache/jetspeed/modules/actions Tag:
security_14 JLogoutUser.java
src/java/org/apache/jetspeed/services/security/turbine Tag:
security_14 TurbineAuthentication.java
TurbinePermissionManagement.java
Log:
Fixed bug with Logout
Revision Changes Path
No revision
No revision
1.5.2.2 +1 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLogoutUser.java
Index: JLogoutUser.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLogoutUser.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- JLogoutUser.java 19 Jun 2002 21:41:23 -0000 1.5.2.1
+++ JLogoutUser.java 20 Jun 2002 04:30:27 -0000 1.5.2.2
@@ -131,6 +131,7 @@
{
JetspeedSecurity.saveUser((JetspeedUser)data.getUser());
}
+
data.setMessage(JetspeedResources.getString(
TurbineConstants.LOGOUT_MESSAGE));
No revision
No revision
1.1.2.12 +5 -7 jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineAuthentication.java
Index: TurbineAuthentication.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbineAuthentication.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- TurbineAuthentication.java 19 Jun 2002 21:41:25 -0000 1.1.2.11
+++ TurbineAuthentication.java 20 Jun 2002 04:30:27 -0000 1.1.2.12
@@ -149,11 +149,7 @@
try
{
user.updateLastLogin();
- JetspeedRunData data = putUserIntoContext(user);
- if (data != null)
- {
- data.save();
- }
+ putUserIntoContext(user);
}
catch (Exception e)
{
@@ -178,6 +174,7 @@
try
{
user = JetspeedUserManagement.getUser(new UserNamePrincipal(anonymousUser));
+ user.setHasLoggedIn(new Boolean(false));
putUserIntoContext(user);
}
@@ -202,7 +199,7 @@
{
try
{
- putUserIntoContext(getAnonymousUser());
+ getAnonymousUser();
}
catch (Exception e)
{
@@ -268,6 +265,7 @@
if (rundata != null)
{
rundata.setUser(user);
+ rundata.save();
}
return rundata;
}
1.1.2.4 +1 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbinePermissionManagement.java
Index: TurbinePermissionManagement.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/Attic/TurbinePermissionManagement.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- TurbinePermissionManagement.java 20 Jun 2002 01:17:39 -0000 1.1.2.3
+++ TurbinePermissionManagement.java 20 Jun 2002 04:30:27 -0000 1.1.2.4
@@ -300,13 +300,11 @@
if(cascadeDelete)
{
- System.out.println("cascadeDelete is true");
// CASCADE to TURBINE_ROLE_PERMISSION
Criteria critRolePerm = new Criteria();
critRolePerm.add(TurbineRolePermissionPeer.PERMISSION_ID, permission.getId());
TurbineRolePermissionPeer.doDelete(critRolePerm, conn);
}
-
TurbinePermissionPeer.doDelete(criteria, conn);
conn.commit();
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>