Author: michiel
Date: 2010-04-13 16:05:25 +0200 (Tue, 13 Apr 2010)
New Revision: 41894
Modified:
mmbase/trunk/applications/cloudcontext/src/main/config/applications/Security.xml
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BuilderNames.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Actions.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Groups.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Ranks.java
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Users.java
Log:
made it compile again
Modified:
mmbase/trunk/applications/cloudcontext/src/main/config/applications/Security.xml
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/config/applications/Security.xml
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/config/applications/Security.xml
2010-04-13 14:05:25 UTC (rev 41894)
@@ -38,12 +38,13 @@
</allowedrelationlist>
<datasourcelist>
+ <datasource builder="mmbasecontexts" path="Security/mmbasecontexts.xml" />
<datasource builder="mmbaseranks" path="Security/mmbaseranks.xml" />
<datasource builder="mmbasegroups" path="Security/mmbasegroups.xml" />
<datasource builder="mmbaseusers" path="Security/mmbaseusers.xml" />
<datasource builder="mmbaseactions" path="Security/mmbaseactions.xml" />
- <datasource builder="mmbasecontexts" path="Security/mmbasecontexts.xml" />
+
</datasourcelist>
<relationsourcelist>
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicContextProvider.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -20,6 +20,7 @@
import org.mmbase.security.*;
import org.mmbase.security.SecurityException;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.module.corebuilders.*;
import org.mmbase.storage.search.*;
import org.mmbase.storage.search.implementation.*;
@@ -345,7 +346,7 @@
if (users.hasField("defaultcontext")) {
MMBase mmb = MMBase.getMMBase();
BasicSearchQuery query = new BasicSearchQuery(true);
- Step step = query.addStep(users);
+ Step step = query.addStep(users.getTableName());
BasicFieldValueConstraint constraint = new
BasicFieldValueConstraint(new BasicStepField(step,
users.getField("defaultcontext")), Integer.valueOf(node.getNumber()));
query.setConstraint(constraint);
BasicAggregatedField baf =
query.addAggregatedField(query.getSteps().get(0),
users.getField("defaultcontext"), AggregatedField.AGGREGATION_TYPE_COUNT);
@@ -602,7 +603,7 @@
BasicStepField numberStepField = new BasicStepField(step,
contextBuilder.getField("number"));
BasicFieldValueConstraint numberConstraint = new
BasicFieldValueConstraint(numberStepField,
Integer.valueOf(contextNode.getNumber()));
- BasicRelationStep relationStep = query.addRelationStep(rights,
groupsOrUsers);
+ BasicRelationStep relationStep =
query.addRelationStep(rights.getTableName(), groupsOrUsers.getTableName());
relationStep.setDirectionality(RelationStep.DIRECTIONS_DESTINATION);
((BasicStep) relationStep.getNext()).setAlias("contexts");
@@ -615,7 +616,7 @@
query.setConstraint(constraint);
query.removeFields();
- query.addFields(relationStep.getNext());
+ query.addFields(relationStep.getNext(), CoreQueryContext.INSTANCE);
try {
result.addList(groupsOrUsers.getStorageConnector().getNodes(query, false));
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BasicUserProvider.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -14,6 +14,7 @@
import java.util.*;
import org.mmbase.util.transformers.*;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.datatypes.DataType;
import org.mmbase.core.CoreField;
import org.mmbase.security.SecurityException;
@@ -230,11 +231,11 @@
MMBase mmb = MMBase.getMMBase();
BasicSearchQuery query = new BasicSearchQuery();
MMObjectBuilder ranks = mmb.getBuilder("mmbaseranks");
- BasicStep step = query.addStep(ranks);
+ BasicStep step = query.addStep(ranks.getTableName());
StepField sf = query.addField(step, ranks.getField("name"));
Constraint cons = new BasicFieldValueConstraint(sf, rank);
query.addField(step, ranks.getField("number"));
- BasicRelationStep relStep = query.addRelationStep(mmb.getInsRel(),
getUserBuilder());
+ BasicRelationStep relStep =
query.addRelationStep(mmb.getInsRel().getTableName(),
getUserBuilder().getTableName());
query.addField(relStep.getNext(), getField("number"));
relStep.setDirectionality(RelationStep.DIRECTIONS_SOURCE);
relStep.setRole(Integer.valueOf(mmb.getRelDef().getNumberByName("rank")));
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BuilderNames.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BuilderNames.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/BuilderNames.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -9,7 +9,7 @@
*/
package org.mmbase.security.implementation.cloudcontext;
-import org.mmbase.storage.search.implementation.NodeSearchQuery;
+import org.mmbase.module.core.NodeSearchQuery;
import java.util.*;
/**
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/ContextProvider.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -9,12 +9,12 @@
*/
package org.mmbase.security.implementation.cloudcontext;
-import org.mmbase.storage.search.implementation.NodeSearchQuery;
import java.util.*;
import org.mmbase.security.*;
import org.mmbase.security.SecurityException;
import org.mmbase.module.core.MMObjectNode;
import org.mmbase.module.core.MMObjectBuilder;
+import org.mmbase.module.core.NodeSearchQuery;
/**
* The implemention of 'context' is pluggable, and should be returned by
{...@link
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/User.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -129,16 +129,27 @@
final int number = in.readInt();
key = in.readLong();
if (number == -1) {
- log.warn("Found node -1 on deserialization!. Interpreting as
'null'. User object was probably not correctly serialized, or not assiociated
with a real node.");
+ log.warn("Found node -1 on deserialization!. Interpreting as
'null'. User object was probably not correctly serialized, or not associated
with a real node.");
node = null;
} else {
- org.mmbase.util.ThreadPools.jobsExecutor.execute(new Runnable() {
- public void run() {
-
org.mmbase.bridge.LocalContext.getCloudContext().assertUp();
- MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
- node = users.getNode(number);
- }
- });
+ boolean isUp;
+ try {
+ isUp = org.mmbase.bridge.LocalContext.getCloudContext().isUp();
+ } catch (Exception e) {
+ isUp = false;
+ }
+ if (isUp) {
+ MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+ node = users.getNode(number);
+ } else {
+ org.mmbase.util.ThreadPools.jobsExecutor.execute(new
Runnable() {
+ public void run() {
+
org.mmbase.bridge.LocalContext.getCloudContext().assertUp();
+ MMObjectBuilder users =
Authenticate.getInstance().getUserProvider().getUserBuilder();
+ node = users.getNode(number);
+ }
+ });
+ }
}
}
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Actions.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Actions.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Actions.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -13,6 +13,7 @@
import org.mmbase.framework.*;
import java.util.*;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.security.*;
import org.mmbase.security.SecurityException;
import org.mmbase.storage.search.*;
@@ -46,7 +47,7 @@
try {
NodeSearchQuery query = new NodeSearchQuery(this);
query.setMaxNumber(1);
- query.setConstraint(new
BasicCompositeConstraint(CompositeConstraint.LOGICAL_AND,
+ 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())
));
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Groups.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Groups.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Groups.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -12,6 +12,7 @@
import org.mmbase.security.implementation.cloudcontext.*;
import java.util.*;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.module.corebuilders.*;
import org.mmbase.cache.Cache;
import org.mmbase.util.logging.Logger;
@@ -74,15 +75,15 @@
MMObjectBuilder object = mmb.getBuilder("object");
BasicSearchQuery query = new BasicSearchQuery();
- Step step = query.addStep(object);
+ Step step = query.addStep(object.getTableName());
BasicStepField numberStepField = new BasicStepField(step, object.
getField("number"));
BasicFieldValueConstraint numberConstraint = new
BasicFieldValueConstraint(numberStepField, new Integer(containedObject));
- BasicRelationStep relationStep = query.addRelationStep(insrel,
this);
+ BasicRelationStep relationStep =
query.addRelationStep(insrel.getTableName(), this.getTableName());
relationStep.setDirectionality(RelationStep.DIRECTIONS_SOURCE);
query.setConstraint(numberConstraint);
- query.addFields(relationStep.getNext());
+ query.addFields(relationStep.getNext(), CoreQueryContext.INSTANCE);
List<MMObjectNode> resultList;
try {
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Ranks.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Ranks.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Ranks.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -11,6 +11,7 @@
import java.util.*;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.storage.search.*;
import org.mmbase.storage.search.implementation.*;
import org.mmbase.security.Rank;
Modified:
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Users.java
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Users.java
2010-04-13 13:52:45 UTC (rev 41893)
+++
mmbase/trunk/applications/cloudcontext/src/main/java/org/mmbase/security/implementation/cloudcontext/builders/Users.java
2010-04-13 14:05:25 UTC (rev 41894)
@@ -12,6 +12,7 @@
import org.mmbase.security.implementation.cloudcontext.*;
import java.util.*;
import org.mmbase.module.core.*;
+import org.mmbase.module.core.NodeSearchQuery;
import org.mmbase.security.*;
import org.mmbase.security.SecurityException;
import org.mmbase.storage.search.*;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
