[cvs] expresso commit by lhamel: put back a deprecated SUPER_USER
which is
JCorporate Ltd
jcorp at jcorporate.com
Sun Jun 19 17:35:21 UTC 2005
Log Message:
-----------
put back a deprecated SUPER_USER which is used in some legacy
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security:
SuperUser.java
Revision Data
-------------
Index: SuperUser.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/SuperUser.java
@@ -67,12 +67,11 @@
/**
* This is a user that represents a SuperUser. A SuperUser User has an
- * is == SecuredDBObject.SYSTEM_ACCOUNT, but is encapulated in the Expresso
+ * id == SecuredDBObject.SYSTEM_ACCOUNT, but is encapulated in the Expresso
* User object. It is mainly used while systems are setting up so that
* no arg dbobjects can be constructed before the registry can be truly set.
*
* @author Michael Rimov
- * @version 1.0
*/
final public class SuperUser extends User {
@@ -84,15 +83,21 @@
public static final User INSTANCE;
/**
+ * @deprecated 4/05 v.5.6 use INSTANCE instead
+ */
+ public static final User SUPER_USER;
+
+
+
+ /**
* The System Uid. Used to be Securable.SYSTEM_ACCOUNT
*/
public static final int SYSTEM_UID = -1;
/**
- * Private Constructor -- do not call.
+ * Private Constructor -- use INSTANCE instead.
*/
private SuperUser() {
- super();
}
@@ -107,6 +112,8 @@
INSTANCE.setAccountStatus(User.INACTIVE_ACCOUNT_STATUS);
INSTANCE.setDisplayName("System Account");
INSTANCE.setEmail("noname at example.org");
+
+ SUPER_USER = INSTANCE;
} catch (DBException ex) {
throw new RuntimeException("Error setting up super user");
}
More information about the cvs
mailing list