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

Evolveum · Feb 1, 2017 · b8f9cf5 · b8f9cf5
2 parents 8718ef2 + 7f9f6dd
commit b8f9cf5
Show file tree

Hide file tree

Showing 15 changed files with 793 additions and 786 deletions.
diff --git a/README.md b/README.md
@@ -5,53 +5,52 @@ midPoint 3.5 "Einstein"
 
 General information:
 
-MidPoint is a comprehensive identity management and governance system.
-MidPoint can synchronize several identity repositories, manage and
-transform data in these repostories to keep them synchronized. MidPoint can
-make the data available in unified form, apply and manage policies,
-manage object lifecycle, maitain audit trails and many other things.
-
+MidPoint is a comprehensive Identity Governance and Administration (IGA) platform. It is used by the organizations around the world to deal with Identity Provisioning, Identity Governance & Compliance and also Access Management. As for the identity being a security perimeter, midPoint keeps safe both organization’s internal network and external resources.
 The most important features of midPoint are:
-   - User provisioning and deprovisioning
-   - Identity governance
-   - Administration GUI
-   - Identity repository implemention (SQL)
-   - Custom schema extensibility
-   - Identity synchronization (liveSync, reconciliation, discovery, import)
-   - Support for expressions in synchronization mappings (Groovy, JavaScript, Python)
-   - Advanced RBAC support with temporal constraints
-   - Identity management process automation (workflow, notifications)
-   - Password policies
-   - Password reset
-   - Organizational structure management
-   - Entitlements
-   - Support for ConnId and OpenICF connectors
-   - Provisioning consistency and error handling
-   - Support for security auditing and reporting
-   - Workflow
-   - Reporting
-   - Notifications
-   - Local Java APIs, Remote web service interface (SOAP), REST API
-   - High availablity (HA) support
-
-For more information please go to:
-
-  http://midpoint.evolveum.com/
 
-For bugtracking system please go to:
+- Identity Governance
+- Security auditing and reporting
+- Organizational structure management
+- Credential Management
+- Workflow
+- Entitlement Management 
+
+Read more about these features at https://evolveum.com/midpoint/about-midpoint/
+
+Other features: 
+
+- User provisioning and deprovisioning
+- Administration GUI
+- Identity repository implemention (SQL)
+- Custom schema extensibility
+- Identity synchronization (liveSync, reconciliation, discovery, import)
+- Support for expressions in synchronization mappings (Groovy, JavaScript, Python)
+- Advanced RBAC support with temporal constraints
+- Identity management process automation (workflow, notifications)
+- Password policies
+- Password reset
+- Entitlements
+- Support for ConnId and OpenICF connectors
+- Provisioning consistency and error handling
+- Reporting
+- Notifications
+- Local Java APIs, Remote web service interface (SOAP), REST API
+- High availablity (HA) support
+
+For more information bout midPoint identity manager please go to:
+http://midpoint.evolveum.com/
 
-  http://jira.evolveum.com/
+For bugtracking system please go to:
+http://jira.evolveum.com/
 
 MidPoint source code is maintained on github:
-
-  https://github.com/Evolveum/midpoint 
+https://github.com/Evolveum/midpoint 
 
 Latest source code can be obtained from our Git repository using one of the 
 following repository locations:
+https://github.com/Evolveum/midpoint.git
 
-  https://github.com/Evolveum/midpoint.git
-
-  git@github.com:Evolveum/midpoint.git
+git@github.com:Evolveum/midpoint.git
 
 This project is developed under Apache license (version 2.0) You may get copy
 of licence in LICENSE file. Please also see NOTICE file for addtional

diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -82,7 +82,7 @@
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.6</xmlsec.version>
         <connid.version>1.4.2.18</connid.version>
-        <jasper.version>6.1.1</jasper.version>
+        <jasper.version>6.4.0</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
         <jackson.version>2.8.6</jackson.version>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
@@ -528,14 +528,14 @@ public <O extends ObjectType> void collectModifications(ObjectDelta<O> delta) th
 	}
 
 	private ItemDelta computePropertyDeltas(PropertyWrapper propertyWrapper, ItemPath containerPath) {
-		ItemDefinition itemDef = propertyWrapper.getItem().getDefinition();
+		ItemDefinition itemDef = propertyWrapper.getItemDefinition();
 		ItemDelta pDelta = itemDef.createEmptyDelta(containerPath.subPath(itemDef.getName()));
 		addItemDelta(propertyWrapper, pDelta, itemDef, containerPath);
 		return pDelta;
 	}
 
 	private ReferenceDelta computeReferenceDeltas(ReferenceWrapper referenceWrapper, ItemPath containerPath) {
-		PrismReferenceDefinition propertyDef = referenceWrapper.getItem().getDefinition();
+		PrismReferenceDefinition propertyDef = referenceWrapper.getItemDefinition();
 		ReferenceDelta pDelta = new ReferenceDelta(containerPath, propertyDef.getName(), propertyDef,
 				propertyDef.getPrismContext());
 		addItemDelta(referenceWrapper, pDelta, propertyDef, containerPath.subPath(propertyDef.getName()));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
@@ -36,6 +36,7 @@
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.Producer;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -97,7 +98,7 @@ private PrismObject<O> instantiateObject(QName objectType, PageBase parentPage)
 	}
 
 	private void initialize(final PrismObject<O> prismObject, String formOid, Form<?> mainForm,
-			boolean runPrivileged, final PageBase parentPage) {
+			final boolean runPrivileged, final PageBase parentPage) {
 
 		if (prismObject == null) {
 			getSession().error(getString("DynamicFormPanel.object.must.not.be.null"));
@@ -110,19 +111,24 @@ private void initialize(final PrismObject<O> prismObject, String formOid, Form<?
 
 			@Override
 			protected ObjectWrapper<O> load() {
-				ObjectWrapperFactory owf = new ObjectWrapperFactory(parentPage);
-				ObjectWrapper<O> objectWrapper = owf.createObjectWrapper("DisplayName", "description",
-						prismObject,
-						(prismObject.getOid() == null) ? ContainerStatus.ADDING : ContainerStatus.MODIFYING);
-				objectWrapper.setShowEmpty(true);
-				return objectWrapper;
+
+				final ObjectWrapperFactory owf = new ObjectWrapperFactory(parentPage);
+				return createObjectWrapper(owf, prismObject);
 			}
 		};
 
 		setParent(parentPage);
 
 		initLayout(formOid, runPrivileged, mainForm);
 	}
+
+	private ObjectWrapper<O> createObjectWrapper(ObjectWrapperFactory owf, PrismObject<O> prismObject){
+		ObjectWrapper<O> objectWrapper = owf.createObjectWrapper("DisplayName", "description",
+				prismObject,
+				(prismObject.getOid() == null) ? ContainerStatus.ADDING : ContainerStatus.MODIFYING);
+		objectWrapper.setShowEmpty(true);
+		return objectWrapper;
+	}
 
 	@Override
 	public IModel<ObjectWrapper<O>> getModel() {

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
@@ -29,8 +29,8 @@ public class ItemWrapperComparator implements Comparator<ItemWrapper>, Serializa
 
     @Override
     public int compare(ItemWrapper p1, ItemWrapper p2) {
-        ItemDefinition def1 = p1.getItem().getDefinition();
-        ItemDefinition def2 = p2.getItem().getDefinition();
+        ItemDefinition def1 = p1.getItemDefinition();
+        ItemDefinition def2 = p2.getItemDefinition();
 
         if (isMainContainer(p1)) {
             return -1;

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
@@ -59,7 +59,7 @@ public PrismContainerPanel(String id, final IModel<ContainerWrapper> model, bool
             public boolean isVisible() {
                 ContainerWrapper<? extends PrismContainer> containerWrapper = model.getObject();
                 PrismContainer prismContainer = containerWrapper.getItem();
-                if (prismContainer.getDefinition().isOperational()) {
+                if (containerWrapper.getItemDefinition().isOperational()) {
                     return false;
                 }
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
@@ -134,8 +134,7 @@ public boolean isVisible() {
             @Override
             public boolean isVisible() {
                 IW wrapper = model.getObject();
-                Item property = wrapper.getItem();
-                ItemDefinition def = property.getDefinition();
+                ItemDefinition def = wrapper.getItemDefinition();
 
                 if (ObjectType.F_NAME.equals(def.getName())) {
                     //fix for "name as required" MID-789
@@ -207,8 +206,8 @@ protected String getValueCssClass() {
     }
 
     private String loadHelpText(IModel<IW> model) {
-        Item property = (Item) model.getObject().getItem();
-        ItemDefinition def = property.getDefinition();
+        IW property = (IW) model.getObject();
+        ItemDefinition def = property.getItemDefinition();
         String doc = def.getHelp();
         if (StringUtils.isEmpty(doc)) {
             return null;
@@ -247,8 +246,8 @@ private int getIndexOfValue(ValueWrapper value) {
 
     private boolean hasOutbound(IModel<IW> model) {
         ItemWrapper wrapper = model.getObject();
-        Item property = wrapper.getItem();
-        ItemDefinition def = property.getDefinition();
+//        Item property = wrapper.getItem();
+        ItemDefinition def = wrapper.getItemDefinition();
         if (!(def instanceof RefinedAttributeDefinition)) {
             return false;
         }

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java b/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
@@ -140,9 +140,9 @@ public I getItem() {
 		return item;
 	}
 
-	public ItemDefinition getDefinition() {
-		return item.getDefinition();
-	}
+//	public ItemDefinition getDefinition() {
+//		return item.getDefinition();
+//	}
 
 	public boolean hasChanged() {
 		for (ValueWrapper value : getValues()) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
@@ -58,7 +58,7 @@ private List<ValueWrapper> createValues() {
             values.add(new ValueWrapper(this, prismValue, ValueStatus.NOT_CHANGED));
         }
 
-        int minOccurs = getDefinition().getMinOccurs();
+        int minOccurs = getItemDefinition().getMinOccurs();
         while (values.size() < minOccurs) {
             values.add(createAddedValue());
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
@@ -47,7 +47,7 @@ private List<ValueWrapper> createValues() {
 			values.add(new ValueWrapper(this, prismValue, prismValue, ValueStatus.NOT_CHANGED));
 		}
 
-		int minOccurs = getDefinition().getMinOccurs();
+		int minOccurs = getItemDefinition().getMinOccurs();
 		while (values.size() < minOccurs) {
 			values.add(createAddedValue());
 		}

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
@@ -62,7 +62,7 @@
 public class PageUserHistory extends PageAdminFocus<UserType> {
 
     private static final String DOT_CLASS = PageUserHistory.class.getName() + ".";
-    private static final Trace LOGGER = TraceManager.getTrace(PageUser.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PageUserHistory.class);
     private String date = "";
 
     public PageUserHistory(final PrismObject<UserType> user, String date) {