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

Evolveum · Feb 6, 2015 · 3d28144 · 3d28144
2 parents 63e5ce9 + 453a5fa
commit 3d28144
Show file tree

Hide file tree

Showing 88 changed files with 1,349 additions and 545 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
@@ -18,11 +18,13 @@
 
 import com.evolveum.midpoint.common.StaticExpressionUtil;
 import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceAttributeDefinitionType;
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 import com.evolveum.prism.xml.ns._public.types_3.RawType;
 
 import org.apache.commons.lang.StringUtils;
@@ -129,7 +131,7 @@ public ResourceAttributeDefinitionType getConstruction() throws SchemaException
         }
 
         ResourceAttributeDefinitionType attrConstruction = new ResourceAttributeDefinitionType();
-        attrConstruction.setRef(definition.getName());
+        attrConstruction.setRef(new ItemPathType(new ItemPath(definition.getName())));
         MappingType outbound = construction != null && construction.getOutbound() != null ? construction.getOutbound().clone() : new MappingType();
         attrConstruction.setOutbound(outbound);
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.query.EqualFilter;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
@@ -42,6 +43,7 @@
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -629,7 +631,7 @@ private ResourceAttributeDefinitionType findOrCreateValueConstruction(PrismPrope
         }
 
         ResourceAttributeDefinitionType construction = new ResourceAttributeDefinitionType();
-        construction.setRef(attrDef.getName());
+        construction.setRef(new ItemPathType(new ItemPath(attrDef.getName())));
 
         return construction;
     }

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
+import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -39,8 +40,8 @@
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -63,6 +64,7 @@
 import org.apache.wicket.util.string.Strings;
 
 import javax.xml.namespace.QName;
+
 import java.util.*;
 
 /**
@@ -369,7 +371,7 @@ public String getObject() {
                         StringBuilder sb = new StringBuilder();
 
                         if(model.getObject().getRef() != null){
-                            sb.append(model.getObject().getRef().getLocalPart());
+                            sb.append(ItemPathUtil.getOnlySegmentQName(model.getObject().getRef()).getLocalPart());
                         } else {
                             return null;
                         }
@@ -420,7 +422,7 @@ public String getObject() {
                         StringBuilder sb = new StringBuilder();
 
                         if(model.getObject().getRef() != null){
-                            sb.append(model.getObject().getRef().getLocalPart());
+                            sb.append(ItemPathUtil.getOnlySegmentQName(model.getObject().getRef()).getLocalPart());
                         } else {
                             return null;
                         }

diff --git a/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java b/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
@@ -17,6 +17,7 @@
 package com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling;
 
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
@@ -37,6 +38,7 @@
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -50,6 +52,7 @@
 import org.w3c.dom.Element;
 
 import javax.xml.namespace.QName;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -122,7 +125,7 @@ public String getObject() {
                 if(association.getDisplayName() == null && association.getRef() == null){
                     return getString("ResourceAssociationEditor.label.new");
                 } else {
-                    return getString("ResourceAssociationEditor.label.edit", association.getRef().getLocalPart());
+                    return getString("ResourceAssociationEditor.label.edit", ItemPathUtil.getOnlySegmentQName(association.getRef()).getLocalPart());
                 }
             }
         });

diff --git a/...point/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java b/...point/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
@@ -16,6 +16,7 @@
 package com.evolveum.midpoint.web.component.wizard.resource.component.schemahandling;
 
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
@@ -36,6 +37,7 @@
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -52,6 +54,7 @@
 import org.w3c.dom.Element;
 
 import javax.xml.namespace.QName;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -117,7 +120,7 @@ public String getObject() {
                 if(attribute.getDisplayName() == null && attribute.getRef() == null){
                     return getString("ResourceAttributeEditor.label.new");
                 } else {
-                    return getString("ResourceAttributeEditor.label.edit", attribute.getRef().getLocalPart());
+                    return getString("ResourceAttributeEditor.label.edit", ItemPathUtil.getOnlySegmentQName(attribute.getRef()).getLocalPart());
                 }
             }
         });

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
@@ -52,6 +52,7 @@ <h3><wicket:message key="PageInternals.title.internalsConfig"/></h3>
                 <div class="form-group" wicket:id="consistencyChecks"/>
                 <div class="form-group" wicket:id="encryptionChecks"/>
                 <div class="form-group" wicket:id="readEncryptionChecks"/>
+                <div class="form-group" wicket:id="tolerateUndeclaredPrefixes"/>
 
                 <div class="main-button-bar">
                     <a class="btn btn-primary" wicket:id="updateInternalsConfig"/>

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
@@ -39,6 +39,7 @@ public class PageInternals extends PageAdminConfiguration {
     private static final String ID_CONSISTENCY_CHECKS = "consistencyChecks";
     private static final String ID_ENCRYPTION_CHECKS = "encryptionChecks";
     private static final String ID_READ_ENCRYPTION_CHECKS = "readEncryptionChecks";
+    private static final String ID_TOLERATE_UNDECLARED_PREFIXES = "tolerateUndeclaredPrefixes";
     private static final String ID_DETAILED_DEBUG_DUMP = "detailedDebugDump";
 
     private static final String LABEL_SIZE = "col-md-4";
@@ -145,6 +146,10 @@ private void initInternalsConfigForm() {
                 new PropertyModel<Boolean>(internalsModel, InternalsConfigDto.F_READ_ENCRYPTION_CHECKS),
                 createStringResource("PageInternals.checkReadEncrypion"), LABEL_SIZE, INPUT_SIZE);
         form.add(encryptionRead);
+        CheckFormGroup tolerateUndeclaredPrefixes = new CheckFormGroup(ID_TOLERATE_UNDECLARED_PREFIXES,
+                new PropertyModel<Boolean>(internalsModel, InternalsConfigDto.F_TOLERATE_UNDECLARED_PREFIXES),
+                createStringResource("PageInternals.tolerateUndeclaredPrefixes"), LABEL_SIZE, INPUT_SIZE);
+        form.add(tolerateUndeclaredPrefixes);
 
         AjaxSubmitButton update = new AjaxSubmitButton(ID_UPDATE_INTERNALS_CONFIG,
                 createStringResource("PageBase.button.update")) {

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties b/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
@@ -23,6 +23,7 @@ PageInternals.title.timeChange=Time change
 PageInternals.checkConsistency=Check consistency
 PageInternals.checkEncryption=Check encryption
 PageInternals.checkReadEncrypion=Check read encryption
+PageInternals.tolerateUndeclaredPrefixes=Tolerate undeclared prefixes in QNames and paths
 PageInternals.detailedDebugDump=Detailed debug dump
 
 
diff --git a/.../main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java b/.../main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
@@ -17,6 +17,7 @@
 package com.evolveum.midpoint.web.page.admin.configuration.dto;
 
 import com.evolveum.midpoint.common.InternalsConfig;
+import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.util.DebugUtil;
 
 import java.io.Serializable;
@@ -30,21 +31,25 @@ public class InternalsConfigDto implements Serializable {
     public static final String F_ENCRYPTION_CHECKS = "encryptionChecks";
     public static final String F_READ_ENCRYPTION_CHECKS = "readEncryptionChecks";
     public static final String F_DETAILED_DEBUG_DUMP = "detailedDebugDump";
+    public static final String F_TOLERATE_UNDECLARED_PREFIXES = "tolerateUndeclaredPrefixes";
 
     //internals config
     private boolean consistencyChecks;
     private boolean encryptionChecks;
     private boolean readEncryptionChecks;
     //debug util
     private boolean detailedDebugDump;
-
+    //DOM util
+    private boolean tolerateUndeclaredPrefixes;
 
     public InternalsConfigDto() {
         consistencyChecks = InternalsConfig.consistencyChecks;
         encryptionChecks = InternalsConfig.encryptionChecks;
         readEncryptionChecks = InternalsConfig.readEncryptionChecks;
 
         detailedDebugDump = DebugUtil.isDetailedDebugDump();
+
+        tolerateUndeclaredPrefixes = DOMUtil.isTolerateUndeclaredPrefixes();
     }
 
     public boolean isConsistencyChecks() {
@@ -79,10 +84,20 @@ public void setDetailedDebugDump(boolean detailedDebugDump) {
         this.detailedDebugDump = detailedDebugDump;
     }
 
+    public boolean isTolerateUndeclaredPrefixes() {
+        return tolerateUndeclaredPrefixes;
+    }
+
+    public void setTolerateUndeclaredPrefixes(boolean tolerateUndeclaredPrefixes) {
+        this.tolerateUndeclaredPrefixes = tolerateUndeclaredPrefixes;
+    }
+
+    // undeclared prefixes is also handled here
     public void saveInternalsConfig() {
         InternalsConfig.consistencyChecks = consistencyChecks;
         InternalsConfig.encryptionChecks = encryptionChecks;
         InternalsConfig.readEncryptionChecks = readEncryptionChecks;
+        DOMUtil.setTolerateUndeclaredPrefixes(tolerateUndeclaredPrefixes);
     }
 
     public void saveDebugUtil() {

diff --git a/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java b/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
@@ -63,4 +63,6 @@ public interface MidpointConfiguration {
      * @return
      */
     Document getXmlConfigAsDocument();
+
+    boolean isSafeMode();
 }
diff --git a/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java b/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
@@ -19,6 +19,7 @@
 
 import org.apache.commons.lang.BooleanUtils;
 
+import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectAssociationDirectionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectAssociationType;
@@ -50,7 +51,7 @@ public void setAssociationTarget(RefinedObjectClassDefinition associationTarget)
 	}
 
 	public QName getName() {
-		return resourceObjectAssociationType.getRef();
+		return ItemPathUtil.getOnlySegmentQName(resourceObjectAssociationType.getRef());
 	}
 
 	public ShadowKindType getKind() {

diff --git a/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java b/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.prism.PrismObjectDefinition;
 import com.evolveum.midpoint.prism.parser.QueryConvertor;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
+import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.processor.*;
@@ -40,6 +41,7 @@
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.CountObjectsCapabilityType;
 import com.evolveum.midpoint.xml.ns._public.resource.capabilities_3.PagedSearchCapabilityType;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 
 import javax.xml.namespace.QName;
 
@@ -374,6 +376,11 @@ public void add(RefinedAttributeDefinition refinedAttributeDefinition) {
         attributeDefinitions.add(refinedAttributeDefinition);
     }
 
+    public boolean containsAttributeDefinition(ItemPathType pathType) {
+        QName segmentQName = ItemPathUtil.getOnlySegmentQName(pathType);
+        return containsAttributeDefinition(segmentQName);
+    }
+
     public boolean containsAttributeDefinition(QName attributeName) {
         for (RefinedAttributeDefinition rAttributeDef : attributeDefinitions) {
             if (QNameUtil.match(rAttributeDef.getName(), attributeName)) {
@@ -592,11 +599,12 @@ private static ResourceAttributeDefinitionType findAttributeDefinitionType(QName
         ResourceAttributeDefinitionType foundAttrDefType = null;
         for (ResourceAttributeDefinitionType attrDefType : rOcDefType.getAttribute()) {
             if (attrDefType.getRef() != null) {
-                if (QNameUtil.match(attrDefType.getRef(), attrName)) {
+            	QName ref = ItemPathUtil.getOnlySegmentQName(attrDefType.getRef());
+                if (QNameUtil.match(ref, attrName)) {
                     if (foundAttrDefType == null) {
                         foundAttrDefType = attrDefType;
                     } else {
-                        throw new SchemaException("Duplicate definition of attribute " + attrDefType.getRef() + " in "+typeDesc+" type "
+                        throw new SchemaException("Duplicate definition of attribute " + ref + " in "+typeDesc+" type "
                                 + rOcDefType.getIntent() + ", in " + contextDescription);
                     }
                 }

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java b/infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
@@ -417,7 +417,23 @@ private EventResult validateObjectInternal(Element objectElement, OperationResul
 			}
 			objectResult.recordFatalError(ex);
 			return EventResult.skipObject();
-		}
+		} catch (RuntimeException ex) {
+            validatorResult.recordFatalError("Couldn't parse object: " + ex.getMessage(), ex);
+            if (verbose) {
+                ex.printStackTrace();
+            }
+            if (handler != null) {
+                try {
+                    handler.handleGlobalError(validatorResult);
+                } catch (RuntimeException e) {
+                    // Make sure that unhandled exceptions are recorded in object result before they are rethrown
+                    objectResult.recordFatalError("Internal error: handleGlobalError call failed: "+e.getMessage(), e);
+                    throw e;
+                }
+            }
+            objectResult.recordFatalError(ex);
+            return EventResult.skipObject();
+        }
 
 	}
 

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
@@ -128,12 +128,20 @@ public Class<Objectable> getTargetTypeCompileTimeClass() {
         }
     }
 
-	public void setTargetType(QName targetType) {
+    public void setTargetType(QName targetType) {
+        setTargetType(targetType, false);
+    }
+
+    /**
+     * @param targetType
+     * @param allowEmptyNamespace This is an ugly hack. See comment in DOMUtil.validateNonEmptyQName.
+     */
+	public void setTargetType(QName targetType, boolean allowEmptyNamespace) {
 		// Null value is OK
 		if (targetType != null) {
 			// But non-empty is not ..
 			Itemable item = getParent();
-			DOMUtil.validateNonEmptyQName(targetType, " in target type in reference "+ (item == null ? "(unknown)" : item.getElementName()));
+			DOMUtil.validateNonEmptyQName(targetType, " in target type in reference "+ (item == null ? "(unknown)" : item.getElementName()), allowEmptyNamespace);
 		}
 		this.targetType = targetType;
 	}

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
@@ -256,8 +256,9 @@ private <T> void serializeFromPrimitive(PrimitiveXNode<T> primitive, QName nodeN
 		}
 
 		T value = primitive.getValue();
-		if ( value == null){
+		if (value == null) {
 			value = (T) primitive.getStringValue();
+            // TODO write also namespace declarations!
 		}
 		if (nodeName == null) {
 			generator.writeObject(value);