[MMBASE CVS] applications/scan/src/org/mmbase/module TransactionHandler.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/scan/src/org/mmbase/module
In directory james.mmbase.org:/tmp/cvs-serv28903

Modified Files:
        TransactionHandler.java 
Log Message:
Just made the 'User' object implement security.UserContext. This makes at least 
Scan not an obstacle to change some prototypes in TransactionManager to 
something more sensible


See also: http://cvs.mmbase.org/viewcvs/applications/scan/src/org/mmbase/module


Index: TransactionHandler.java
===================================================================
RCS file: 
/var/cvs/applications/scan/src/org/mmbase/module/TransactionHandler.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- TransactionHandler.java     25 Mar 2008 21:00:25 -0000      1.65
+++ TransactionHandler.java     22 Dec 2008 18:00:10 -0000      1.66
@@ -61,7 +61,7 @@
         upload = (Upload)getModule("upload");
         sessions = (sessionsInterface)getModule("SESSION");
         transactionManager = TransactionManager.getInstance();
-        tmpObjectManager = transactionManager.getTemporaryNodeManager();
+        tmpObjectManager = TemporaryNodeManager.getInstance();
         //JB key test initializatioon
         needs_key = (getInitParameter("keycode") != null);
         securityMode = getInitParameter("security");
@@ -670,7 +670,7 @@
     private synchronized String uniqueId() {
         try {
             Thread.sleep(1); // A bit paranoid, but just to be sure that not 
two threads steal the same millisecond.
-        } catch (Exception e) {
+        } catch (InterruptedException e) {
             log.debug("What's the reason I may not sleep?");
         }
         return "ID" + java.lang.System.currentTimeMillis();
@@ -680,7 +680,7 @@
      * Dummy User object, this object needs to be replace by
      * the real User object (when that is finished)
      */
-    class User {
+    class User implements org.mmbase.security.UserContext {
         private String name;
 
         public User(String name) {
@@ -692,6 +692,26 @@
             String tempname = "TR" + name.substring(length - 8, length);
             return tempname;
         }
+        public String getIdentifier() {
+            return name;
+        }
+
+        public org.mmbase.security.Rank getRank() {
+            return org.mmbase.security.Rank.BASICUSER;
+        }
+
+
+        public boolean isValid() {
+            return true;
+        }
+        public String getOwnerField() {
+            return "default";
+        }
+
+        public String getAuthenticationType() {
+            return "scan";
+        }
+
     }
 
     /** 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs