Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
In directory james.mmbase.org:/tmp/cvs-serv14282
Modified Files:
Actions.java Contexts.java
Log Message:
Actions.java
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders
Index: Actions.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Actions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Actions.java 12 Apr 2008 14:30:37 -0000 1.1
+++ Actions.java 7 Aug 2008 20:01:51 -0000 1.2
@@ -9,6 +9,7 @@
*/
package org.mmbase.security.implementation.cloudcontext.builders;
+import org.mmbase.security.implementation.cloudcontext.User;
import org.mmbase.framework.*;
import java.util.*;
import org.mmbase.module.core.*;
@@ -24,7 +25,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: Actions.java,v 1.1 2008/04/12 14:30:37 michiel Exp $
+ * @version $Id: Actions.java,v 1.2 2008/08/07 20:01:51 michiel Exp $
* @since MMBase-1.7
*/
public class Actions extends MMObjectBuilder {
@@ -45,12 +46,10 @@
try {
NodeSearchQuery query = new NodeSearchQuery(this);
query.setMaxNumber(1);
- StepField componentField =
query.getField(getField(FIELD_COMPONENT));
- BasicFieldValueConstraint constraint1 = new
BasicFieldValueConstraint(componentField, component.getName());
- StepField actionField =
query.getField(getField(FIELD_ACTION));
- BasicFieldValueConstraint constraint2 = new
BasicFieldValueConstraint(actionField, action.getName());
-
- query.setConstraint(new
BasicCompositeConstraint(CompositeConstraint.LOGICAL_AND, constraint1,
constraint2));
+ query.setConstraint(new
BasicCompositeConstraint(CompositeConstraint.LOGICAL_AND,
+ new
BasicFieldValueConstraint(query.getField(getField(FIELD_COMPONENT)),
component.getName()),
+ new
BasicFieldValueConstraint(query.getField(getField(FIELD_ACTION)),
action.getName())
+ ));
List<MMObjectNode> resultList = getNodes(query);
if (resultList.size() == 0) {
log.service("No node found for action " + action + "
creating one now");
@@ -68,6 +67,14 @@
return true;
}
+ public static Actions getBuilder() {
+ return (Actions) MMBase.getMMBase().getBuilder("mmbaseactions");
+ }
+
+ public boolean check(User user, Action ac, Parameters parameters) {
+ return ac.getDefault().check(user, ac, parameters);
+ }
+
}
Index: Contexts.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/builders/Contexts.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Contexts.java 25 Mar 2008 21:00:24 -0000 1.55
+++ Contexts.java 7 Aug 2008 20:01:51 -0000 1.56
@@ -35,7 +35,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Contexts.java,v 1.55 2008/03/25 21:00:24 nklasens Exp $
+ * @version $Id: Contexts.java,v 1.56 2008/08/07 20:01:51 michiel Exp $
* @see org.mmbase.security.implementation.cloudcontext.Verify
* @see org.mmbase.security.Authorization
*/
@@ -957,25 +957,13 @@
}
} else if (function.equals("parentsallow")) { // 'ALLOW' argument
would be more logical, but don't when because of the extra argument (practical
can use several functions with same arguments list)
Parameters a = Functions.buildParameters(PARENTSALLOW_PARAMETERS,
args);
- if (parentsAllow(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)))) {
- return Boolean.TRUE;
- } else {
- return Boolean.FALSE;
- }
+ return parentsAllow(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)));
} else if (function.equals("grant")) {
Parameters a = Functions.buildParameters(GRANT_PARAMETERS, args);
- if (grant(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)),
getUserNode((UserContext) a.get("user")))) {
- return Boolean.TRUE;
- } else {
- return Boolean.FALSE;
- }
+ return grant(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)),
getUserNode((UserContext) a.get("user")));
} else if (function.equals("revoke")) {
Parameters a = Functions.buildParameters(REVOKE_PARAMETERS, args);
- if (revoke(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)),
getUserNode((UserContext) a.get("user")))) {
- return Boolean.TRUE;
- } else {
- return Boolean.FALSE;
- }
+ return revoke(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)),
getUserNode((UserContext) a.get("user")));
} else if (function.equals("maygrant")) {
Parameters a = Functions.buildParameters(MAYGRANT_PARAMETERS,
args);
if (mayGrant(node, getGroupOrUserNode(a),
Operation.getOperation(a.getString(PARAMETER_OPERATION)),
getUserNode((UserContext) a.get("user")))) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
