Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory james.mmbase.org:/tmp/cvs-serv4088
Modified Files:
Authenticate.java BasicContextProvider.java User.java
Log Message:
several details, like @Override annotations
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
Index: Authenticate.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Authenticate.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Authenticate.java 10 Mar 2009 08:58:19 -0000 1.35
+++ Authenticate.java 28 Apr 2009 08:35:09 -0000 1.36
@@ -11,7 +11,6 @@
import java.util.*;
import java.io.*;
-import org.mmbase.security.implementation.cloudcontext.builders.*;
import org.mmbase.security.*;
import org.mmbase.module.core.*;
import org.mmbase.security.SecurityException;
@@ -31,7 +30,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Authenticate.java,v 1.35 2009/03/10 08:58:19 michiel Exp $
+ * @version $Id: Authenticate.java,v 1.36 2009/04/28 08:35:09 michiel Exp $
*/
public class Authenticate extends CloudContextAuthentication {
private static final Logger log =
Logging.getLoggerInstance(Authenticate.class);
@@ -65,7 +64,8 @@
/**
* {...@inheritdoc}
*/
- @Override protected void load() throws SecurityException {
+ @Override
+ protected void load() throws SecurityException {
attributes.put(STORES_CONTEXT_IN_OWNER, Boolean.TRUE);
UserProvider users = getUserProvider();
if (users == null) {
@@ -114,16 +114,15 @@
<tr><td>encoded</td><th>plain</td><td>name/encodedpassword</td><td></td></tr>
</table>
*/
- @Override public User login(String type, Map<String, ?> map, Object
aobj[]) throws SecurityException {
+ @Override
+ public User login(String type, Map<String, ?> map, Object[] parameters)
throws SecurityException {
if (log.isTraceEnabled()) {
log.trace("login-module: '" + type + "'");
}
MMObjectNode node = null;
UserProvider users = getUserProvider();
if (users == null) {
- String msg = "builders for security not installed, if you are
trying to install the application belonging to this security, please restart
the application after all data has been imported)";
- log.fatal(msg);
- throw new SecurityException(msg);
+ throw new SecurityException("builders for security not installed,
if you are trying to install the application belonging to this security, please
restart the application after all data has been imported");
}
allowEncodedPassword =
org.mmbase.util.Casting.toBoolean(users.getUserBuilder().getInitParameter("allowencodedpassword"));
if ("anonymous".equals(type)) {
@@ -136,8 +135,8 @@
return new LocalAdmin("anonymous", type,
Rank.getRank("anonymous"));
}
} else if ("name/password".equals(type)) {
- String userName = (String)map.get("username");
- String password = (String)map.get("password");
+ String userName = (String) map.get("username");
+ String password = (String) map.get("password");
if(userName == null || password == null) {
throw new SecurityException("Expected the property 'username'
and 'password' with login. But received " + map);
}
Index: BasicContextProvider.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- BasicContextProvider.java 2 Mar 2009 17:28:35 -0000 1.10
+++ BasicContextProvider.java 28 Apr 2009 08:35:09 -0000 1.11
@@ -35,7 +35,7 @@
* This is a basic implemention of {...@link ContextProvider} that implements
all the methods in a default way.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicContextProvider.java,v 1.10 2009/03/02 17:28:35 michiel
Exp $
+ * @version $Id: BasicContextProvider.java,v 1.11 2009/04/28 08:35:09 michiel
Exp $
* @since MMBase-1.9.1
*/
public class BasicContextProvider implements ContextProvider {
@@ -343,8 +343,8 @@
MMObjectNode source = getNode(node.getIntValue("snumber"));
MMObjectNode destination = getNode(node.getIntValue("dnumber"));
- if
(Authenticate.getInstance().getUserBuilder().getClass().isInstance(source.getBuilder())
&& destination.getBuilder() instanceof Ranks) {
-
+ if
(Authenticate.getInstance().getUserBuilder().getClass().isInstance(source.getBuilder())
+ && Ranks.class.isInstance(destination.getBuilder())) {
// forbid hackery
if (operation == Operation.WRITE || operation ==
Operation.CHANGE_RELATION) {
return false;
Index: User.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/User.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- User.java 10 Mar 2009 17:11:20 -0000 1.27
+++ User.java 28 Apr 2009 08:35:09 -0000 1.28
@@ -28,10 +28,10 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: User.java,v 1.27 2009/03/10 17:11:20 michiel Exp $
+ * @version $Id: User.java,v 1.28 2009/04/28 08:35:09 michiel Exp $
* @see org.mmbase.security.implementation.cloudcontext.builders.Users
*/
-public class User extends BasicUser implements WeakNodeEventListener {
+public class User extends BasicUser implements UserContext,
WeakNodeEventListener {
private static final Logger log = Logging.getLoggerInstance(User.class);
private static final long serialVersionUID = 1L;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
