You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by wg...@apache.org on 2007/03/14 21:57:04 UTC
svn commit: r518323 - in
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine:
om/security/ services/security/torque/
Author: wglass
Date: Wed Mar 14 13:57:02 2007
New Revision: 518323
URL: http://svn.apache.org/viewvc?view=rev&rev=518323
Log:
make Group/Role/Permission serializable (paralleling User). Fix problem where TorqueUser only partially serializes by making superclass TorqueObject serializable. The result: if a user is logged in when a server restarts, he can stay logged in. (session is serialized). Fixes TRB-41.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Group.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Permission.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Role.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorquePermission.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueRole.java
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Group.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Group.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Group.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Group.java Wed Mar 14 13:57:02 2007
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.Serializable;
+
import org.apache.turbine.util.security.RoleSet;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -29,7 +31,7 @@
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public interface Group extends SecurityEntity
+public interface Group extends SecurityEntity, Serializable
{
/**
* The name of the <a href="#global">global group</a>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Permission.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Permission.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Permission.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Permission.java Wed Mar 14 13:57:02 2007
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.Serializable;
+
import org.apache.turbine.util.security.TurbineSecurityException;
/**
@@ -30,7 +32,7 @@
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public interface Permission extends SecurityEntity
+public interface Permission extends SecurityEntity, Serializable
{
/**
* Makes changes made to the Permission attributes permanent.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Role.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Role.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Role.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/Role.java Wed Mar 14 13:57:02 2007
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.Serializable;
+
import org.apache.turbine.util.security.PermissionSet;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -29,7 +31,7 @@
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public interface Role extends SecurityEntity
+public interface Role extends SecurityEntity, Serializable
{
/**
* Returns the set of Permissions associated with this Role.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueGroup.java Wed Mar 14 13:57:02 2007
@@ -53,6 +53,10 @@
implements Group,
Comparable
{
+
+ /** Serial Version UID */
+ private static final long serialVersionUID = -2034684697021752888L;
+
/**
* Constructs a new Group.
*/
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java Wed Mar 14 13:57:02 2007
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import java.io.Serializable;
+
import java.sql.Connection;
import org.apache.torque.om.ObjectKey;
@@ -36,8 +38,12 @@
public abstract class TorqueObject
implements SecurityEntity,
Comparable,
- Persistent
+ Persistent,
+ Serializable
{
+
+ static final long serialVersionUID = 5619862273774652856L;
+
/** The underlying database Object which is proxied */
protected Persistent obj = null;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorquePermission.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorquePermission.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorquePermission.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorquePermission.java Wed Mar 14 13:57:02 2007
@@ -40,6 +40,9 @@
implements Permission,
Comparable
{
+
+ private static final long serialVersionUID = -5524685597021445523L;
+
/**
* Constructs a Permission
*/
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueRole.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueRole.java?view=diff&rev=518323&r1=518322&r2=518323
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueRole.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueRole.java Wed Mar 14 13:57:02 2007
@@ -44,6 +44,9 @@
implements Role,
Comparable
{
+
+ private static final long serialVersionUID = -7774684697021445523L;
+
/** The permissions for this role. */
private PermissionSet permissionSet = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org