[MMBASE CVS] contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security SecurityUtil.java ThreadLocalAuthenticate.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security
In directory 
james.mmbase.org:/tmp/cvs-serv1717/cmsc/security/src/java/com/finalist/cmsc/security

Modified Files:
        SecurityUtil.java ThreadLocalAuthenticate.java 
Log Message:
CMSC-1330 Upgrade CMSc to use MMBase 1.9
CMSC-215 Upgrade from Maven 1 to Maven 2
Upgrade mmbase-1.8.7-20090402


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security
See also: http://www.mmbase.org/jira/browse/CMSC-1330
See also: http://www.mmbase.org/jira/browse/CMSC-215


Index: SecurityUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/SecurityUtil.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SecurityUtil.java   31 Dec 2008 10:26:43 -0000      1.15
+++ SecurityUtil.java   14 Apr 2009 10:22:54 -0000      1.16
@@ -11,16 +11,17 @@
 
 import java.util.*;
 
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.mmbase.bridge.*;
 import org.mmbase.bridge.util.SearchUtil;
+import org.mmbase.security.implementation.cloudcontext.builders.Contexts;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
 
 import com.finalist.cmsc.mmbase.TreePathComparator;
 import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.security.builders.Contexts;
 import com.finalist.cmsc.util.NameUtil;
 
 
@@ -465,7 +466,7 @@
     }
 
     public static Node getContext(Cloud cloud) {
-        int newContext = ((Contexts) 
Contexts.getBuilder()).getDefaultContextNode().getNumber();
+        int newContext = 
Contexts.getBuilder().getDefaultContextNode().getNumber();
         Node newContextNode = cloud.getNode(newContext);
         return newContextNode;
     }


Index: ThreadLocalAuthenticate.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/ThreadLocalAuthenticate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ThreadLocalAuthenticate.java        16 May 2008 11:46:34 -0000      1.4
+++ ThreadLocalAuthenticate.java        14 Apr 2009 10:22:54 -0000      1.5
@@ -1,9 +1,9 @@
 package com.finalist.cmsc.security;
 
 import org.mmbase.security.implementation.cloudcontext.Authenticate;
+
 import org.mmbase.security.implementation.cloudcontext.User;
 import org.mmbase.security.implementation.cloudcontext.builders.Users;
-import org.mmbase.security.*;
 import org.mmbase.security.SecurityException;
 import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.util.logging.Logger;
@@ -21,7 +21,7 @@
 
 
    @Override
-   public UserContext login(String moduleName, Map loginInfo, Object[] 
parameters)
+   public User login(String moduleName, Map loginInfo, Object[] parameters)
          throws org.mmbase.security.SecurityException {
       MMObjectNode node = null;
       Users users = Users.getBuilder();
@@ -39,7 +39,7 @@
          return node == null ? null : new User(node, getKey(), moduleName);
       }
 
-      return super.login(moduleName, loginInfo, parameters);
+      return (User) super.login(moduleName, loginInfo, parameters);
    }
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs