Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Apr 30, 2014 · 878c1f7 · 878c1f7
2 parents 17b378a + 09dfefe
commit 878c1f7
Show file tree

Hide file tree

Showing 96 changed files with 876 additions and 858 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -140,12 +140,12 @@ public String getObject() {
     private boolean isAccessible(PrismPropertyDefinition def, ContainerStatus status) {
         switch (status) {
             case ADDING:
-                if (!def.canCreate()) {
+                if (!def.canAdd()) {
                     return false;
                 }
                 break;
             case MODIFYING:
-                if (!def.canUpdate()) {
+                if (!def.canModify()) {
                     return false;
                 }
                 break;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java b/...i/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
@@ -142,9 +142,9 @@ private void addSecurityConfig(FilterInvocation filterInvocation, Collection<Con
     }
 
     @Override
-	public <O extends ObjectType> ObjectSecurityConstraints compileSecurityContraints(PrismObject<O> object, OwnerResolver ownerResolver)
+	public <O extends ObjectType> ObjectSecurityConstraints compileSecurityConstraints(PrismObject<O> object, OwnerResolver ownerResolver)
 			throws SchemaException {
-		return securityEnforcer.compileSecurityContraints(object, ownerResolver);
+		return securityEnforcer.compileSecurityConstraints(object, ownerResolver);
 	}
 
     @Override

diff --git a/.../src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java b/.../src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
@@ -43,6 +43,9 @@ public class LayerRefinedAttributeDefinition extends RefinedAttributeDefinition
 
 	private RefinedAttributeDefinition refinedAttributeDefinition;
 	private LayerType layer;
+	private Boolean overrideCanRead = null;
+	private Boolean overrideCanAdd = null;
+	private Boolean overrideCanModify = null;
 
 	private LayerRefinedAttributeDefinition(RefinedAttributeDefinition refinedAttributeDefinition, LayerType layer) {
 		super(refinedAttributeDefinition, refinedAttributeDefinition.getPrismContext());
@@ -113,19 +116,49 @@ public boolean isTolerant() {
 	public void setTolerant(boolean tolerant) {
 		refinedAttributeDefinition.setTolerant(tolerant);
 	}
+
+	public Boolean getOverrideCanRead() {
+		return overrideCanRead;
+	}
+
+	public void setOverrideCanRead(Boolean overrideCanRead) {
+		this.overrideCanRead = overrideCanRead;
+	}
+
+	public Boolean getOverrideCanAdd() {
+		return overrideCanAdd;
+	}
+
+	public void setOverrideCanAdd(Boolean overrideCanAdd) {
+		this.overrideCanAdd = overrideCanAdd;
+	}
+
+	public Boolean getOverrideCanModify() {
+		return overrideCanModify;
+	}
+
+	public void setOverrideCanModify(Boolean overrideCanModify) {
+		this.overrideCanModify = overrideCanModify;
+	}
 
 	@Override
-	public boolean canCreate() {
-		return refinedAttributeDefinition.canCreate(layer);
+	public boolean canAdd() {
+		if (overrideCanAdd != null) {
+			return overrideCanAdd;
+		}
+		return refinedAttributeDefinition.canAdd(layer);
 	}
 
 	@Override
-	public boolean canCreate(LayerType layer) {
-		return refinedAttributeDefinition.canCreate(layer);
+	public boolean canAdd(LayerType layer) {
+		return refinedAttributeDefinition.canAdd(layer);
 	}
 
 	@Override
 	public boolean canRead() {
+		if (overrideCanRead != null) {
+			return overrideCanRead;
+		}
 		return refinedAttributeDefinition.canRead(layer);
 	}
 
@@ -135,8 +168,11 @@ public boolean canRead(LayerType layer) {
 	}
 
 	@Override
-	public boolean canUpdate() {
-		return refinedAttributeDefinition.canUpdate(layer);
+	public boolean canModify() {
+		if (overrideCanModify != null) {
+			return overrideCanModify;
+		}
+		return refinedAttributeDefinition.canModify(layer);
 	}
 
 	@Override
@@ -145,8 +181,8 @@ public void setName(QName name) {
 	}
 
 	@Override
-	public boolean canUpdate(LayerType layer) {
-		return refinedAttributeDefinition.canUpdate(layer);
+	public boolean canModify(LayerType layer) {
+		return refinedAttributeDefinition.canModify(layer);
 	}
 
 	@Override
@@ -185,13 +221,13 @@ public void setMaxOccurs(int maxOccurs) {
 	}
 
 	@Override
-	public void setRead(boolean read) {
-		refinedAttributeDefinition.setRead(read);
+	public void setCanRead(boolean read) {
+		refinedAttributeDefinition.setCanRead(read);
 	}
 
 	@Override
-	public void setUpdate(boolean update) {
-		refinedAttributeDefinition.setUpdate(update);
+	public void setCanModify(boolean update) {
+		refinedAttributeDefinition.setCanModify(update);
 	}
 
 	@Override
@@ -210,8 +246,8 @@ public boolean isSingleValue() {
 	}
 
 	@Override
-	public void setCreate(boolean create) {
-		refinedAttributeDefinition.setCreate(create);
+	public void setCanAdd(boolean create) {
+		refinedAttributeDefinition.setCanAdd(create);
 	}
 
 	@Override
@@ -489,7 +525,7 @@ public String debugDump(int indent) {
 		StringBuilder sb = new StringBuilder();
 		DebugUtil.indentDebugDump(sb, indent);
 		sb.append(getDebugDumpClassName()).append("(layer=").append(layer).append(",\n");
-		sb.append(refinedAttributeDefinition.debugDump(indent+1));
+		sb.append(refinedAttributeDefinition.debugDump(indent+1, layer));
 		return sb.toString();
 	}
 

diff --git a/...rc/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java b/...rc/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
@@ -452,11 +452,7 @@ public String debugDump() {
 
 	@Override
 	public String debugDump(int indent) {
-		StringBuilder sb = new StringBuilder();
-		DebugUtil.indentDebugDump(sb, indent);
-		sb.append(getDebugDumpClassName()).append("(layer=").append(layer).append(",\n");
-		sb.append(refinedObjectClassDefinition.debugDump(indent+1));
-		return sb.toString();
+		return debugDump(indent, layer);
 	}
 
 	/**

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java
@@ -87,13 +87,13 @@ public String toString() {
 		} else {
 			sb.append("-");
 		}
-		if (getAccess().isCreate()) {
-			sb.append("C");
+		if (getAccess().isAdd()) {
+			sb.append("A");
 		} else {
 			sb.append("-");
 		}
-		if (getAccess().isUpdate()) {
-			sb.append("U");
+		if (getAccess().isModify()) {
+			sb.append("M");
 		} else {
 			sb.append("-");
 		}