Author: michiel
Date: 2009-05-14 13:37:14 +0200 (Thu, 14 May 2009)
New Revision: 35165
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
Log:
added a constructor, javadoc
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-14 11:09:26 UTC (rev 35164)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2009-05-14 11:37:14 UTC (rev 35165)
@@ -106,6 +106,9 @@
}
+ /**
+ * @param node User node
+ */
public String getContext(MMObjectNode node) throws SecurityException {
MMObjectNode contextNode = getContextNode(node);
return
contextNode.getStringValue(getContextNameField(contextNode.getBuilder().getTableName()));
Modified:
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2009-05-14 11:09:26 UTC (rev 35164)
+++
mmbase/trunk/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2009-05-14 11:37:14 UTC (rev 35165)
@@ -51,6 +51,11 @@
if (ub == null) throw new IllegalArgumentException();
userBuilder = ub;
}
+ public BasicUserProvider(String b) {
+ if (b == null) throw new IllegalArgumentException();
+ userBuilder = MMBase.getMMBase().getBuilder(b);
+ if (userBuilder == null) throw new IllegalArgumentException();
+ }
public MMObjectNode getAnonymousUser() throws SecurityException {
@@ -346,11 +351,15 @@
/**
* @see org.mmbase.security.implementation.cloudcontext.User#getOwnerField
+ * @param node User node
*/
public String getDefaultContext(MMObjectNode node) {
if (node == null) return "system";
MMObjectNode contextNode = node.getNodeValue(getDefaultContextField());
- return contextNode == null ? null : contextNode.getStringValue("name");
+ if (contextNode == null) {
+ log.warn("Node " + node + " has no default context ( " +
getDefaultContextField() + " is null). Returning system. " +
Verify.getInstance().getContextProvider());
+ }
+ return contextNode == null ? "system" :
Verify.getInstance().getContextProvider().getContext(contextNode);
}
public boolean isOwnNode(User user, MMObjectNode node) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
