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

Evolveum · Dec 9, 2016 · 3d704c5 · 3d704c5
2 parents b03661e + de67a22
commit 3d704c5
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 38 deletions.
diff --git a/...olveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java b/...olveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
@@ -81,6 +81,7 @@ public void execute(DelegateExecution execution) {
 
         if (level.getAutomaticallyApproved() != null) {
             try {
+                opTask.setChannel(wfTask.getChannel());
                 expressionVariables = getDefaultVariables(execution, wfTask, result);
                 preApproved = evaluateBooleanExpression(level.getAutomaticallyApproved(), expressionVariables, execution, opTask, result);
                 if (LOGGER.isTraceEnabled()) {

diff --git a/...in/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java b/...in/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
@@ -176,7 +176,7 @@ private PrismObject determineRootTaskObject(ModelContext context) {
     public WfTask submitRootTask(WfTaskCreationInstruction rootInstruction, Task taskFromModel, WfConfigurationType wfConfigurationType,
 			OperationResult result)
             throws SchemaException, ObjectNotFoundException, ObjectAlreadyExistsException {
-        WfTask rootWfTask = wfTaskController.submitWfTask(rootInstruction, determineParentTaskForRoot(taskFromModel), wfConfigurationType, result);
+        WfTask rootWfTask = wfTaskController.submitWfTask(rootInstruction, determineParentTaskForRoot(taskFromModel), wfConfigurationType, taskFromModel.getChannel(), result);
 		result.setBackgroundTaskOid(rootWfTask.getTask().getOid());
 		wfTaskUtil.setRootTaskOidImmediate(taskFromModel, rootWfTask.getTask().getOid(), result);
         return rootWfTask;

diff --git a/...rc/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java b/...rc/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
@@ -212,7 +212,7 @@ private HookOperationMode submitTasks(List<PcpChildWfTaskCreationInstruction> in
 					// TODO CONSIDER THIS... when OID is no longer transferred
 					instruction.addHandlersAfterWfProcessAtEnd(WfTaskUtil.WAIT_FOR_TASKS_HANDLER_URI, WfPrepareChildOperationTaskHandler.HANDLER_URI);
 				}
-				WfTask wfTask = wfTaskController.submitWfTask(instruction, rootWfTask.getTask(), wfConfigurationType, result);
+				WfTask wfTask = wfTaskController.submitWfTask(instruction, rootWfTask.getTask(), wfConfigurationType, null, result);
                 wfTasks.add(wfTask);
             }
 

diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.java
@@ -111,7 +111,7 @@ public class WfTaskController {
 
     public WfTask submitWfTask(WfTaskCreationInstruction instruction, WfTask parentWfTask, WfConfigurationType wfConfigurationType,
 			OperationResult result) throws SchemaException, ObjectNotFoundException {
-        return submitWfTask(instruction, parentWfTask.getTask(), wfConfigurationType, result);
+        return submitWfTask(instruction, parentWfTask.getTask(), wfConfigurationType, null, result);
     }
 
     /**
@@ -121,11 +121,11 @@ public WfTask submitWfTask(WfTaskCreationInstruction instruction, WfTask parentW
 	 * @param wfConfigurationType
 	 */
     public WfTask submitWfTask(WfTaskCreationInstruction instruction, Task parentTask, WfConfigurationType wfConfigurationType,
-			OperationResult result) throws SchemaException, ObjectNotFoundException {
+			String channelOverride, OperationResult result) throws SchemaException, ObjectNotFoundException {
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Processing start instruction:\n{}", instruction.debugDump());
         }
-        Task task = submitTask(instruction, parentTask, wfConfigurationType, result);
+        Task task = submitTask(instruction, parentTask, wfConfigurationType, channelOverride, result);
 		WfTask wfTask = recreateWfTask(task, instruction.getChangeProcessor());
         if (!instruction.isNoProcess()) {
             startWorkflowProcessInstance(wfTask, instruction, result);
@@ -173,8 +173,11 @@ public WfTask recreateRootWfTask(Task task) {
 
     //region Working with midPoint tasks
 
-    private Task submitTask(WfTaskCreationInstruction instruction, Task parentTask, WfConfigurationType wfConfigurationType, OperationResult result) throws SchemaException, ObjectNotFoundException {
+    private Task submitTask(WfTaskCreationInstruction instruction, Task parentTask, WfConfigurationType wfConfigurationType, String channelOverride, OperationResult result) throws SchemaException, ObjectNotFoundException {
 		Task wfTask = instruction.createTask(this, parentTask, wfConfigurationType);
+		if (channelOverride != null) {
+			wfTask.setChannel(channelOverride);
+		}
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Switching workflow root or child task to background:\n{}", wfTask.debugDump());
         }

diff --git a/...est/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsNsUniqueIdTest.java b/...est/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsNsUniqueIdTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-2015 Evolveum
+ * Copyright (c) 2014-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,5 +38,10 @@ public String getPrimaryIdentifierAttributeName() {
 	protected boolean syncCanDetectDelete() {
 		return false;
 	}
+
+	@Override
+	protected boolean isUsingGroupShortcutAttribute() {
+		return false;
+	}
 
 }
diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
@@ -51,7 +51,7 @@ protected String getLdapBindDn() {
 
 	@Override
 	protected String getLdapBindPassword() {
-		return "secret123";
+		return "qwe12345";
 	}
 
 	@Override

diff --git a/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java b/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
@@ -115,7 +115,7 @@ public abstract class AbstractAdLdapTest extends AbstractLdapSynchronizationTest
 	private static final String GROUP_PIRATES_NAME = "pirates";
 	private static final String GROUP_MELEE_ISLAND_NAME = "Mêlée Island";
 
-	protected static final int NUMBER_OF_ACCOUNTS = 16;
+	protected static final int NUMBER_OF_ACCOUNTS = 25;
 	private static final String ASSOCIATION_GROUP_NAME = "group";
 
 	private static final String NS_EXTENSION = "http://whatever.com/my";
@@ -604,8 +604,11 @@ public void test182Search2AccountsOffset1SortCn() throws Exception {
 
 		SearchResultList<PrismObject<ShadowType>> shadows = doSearch(TEST_NAME, query, 2, task, result);
 
-        assertAccountShadow(shadows.get(0), "CN=Adalbert Meduza,OU=evolveum,DC=win,DC=evolveum,DC=com");
-        assertAccountShadow(shadows.get(1), "CN=Adalbert Meduza1,OU=evolveum,DC=win,DC=evolveum,DC=com");
+		assertAccountShadow(shadows.get(0), "a5vg a5vg,CN=Users,DC=win,DC=evolveum,DC=com");
+        assertAccountShadow(shadows.get(1), "CN=Adalbert Meduza,OU=evolveum,DC=win,DC=evolveum,DC=com");
+
+//        assertAccountShadow(shadows.get(0), "CN=Adalbert Meduza,OU=evolveum,DC=win,DC=evolveum,DC=com");
+//        assertAccountShadow(shadows.get(1), "CN=Adalbert Meduza1,OU=evolveum,DC=win,DC=evolveum,DC=com");
 
         assertConnectorOperationIncrement(1);
         assertConnectorSimulatedPagingSearchIncrement(0);

diff --git a/...src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java b/...src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java
@@ -163,6 +163,7 @@ public void test000Sanity() throws Exception {
 		cleanupDelete(toAccountDn(ACCOUNT_HT_UID, ACCOUNT_HT_CN));
 		cleanupDelete(toAccountDn(ACCOUNT_HTM_UID, ACCOUNT_HTM_CN));
 		cleanupDelete(toGroupDn(GROUP_MONKEYS_CN));
+		cleanupDelete(toGroupDn(GROUP_FOOLS_CN));
 	}
 
 	@Test

diff --git a/.../testing/conntest/Test389DsDnBacchus.java → ...t/testing/conntest/Test389DsDnPhobos.java b/.../testing/conntest/Test389DsDnBacchus.java → ...t/testing/conntest/Test389DsDnPhobos.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-2015 Evolveum
+ * Copyright (c) 2014-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,26 +29,26 @@
  *
  */
 @Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class })
-public class Test389DsDnBacchus extends Abstract389DsDnTest {
+public class Test389DsDnPhobos extends Abstract389DsDnTest {
 
 
 	@Override
 	protected File getResourceFile() {
-		return new File(getBaseDir(), "resource-dn-bacchus.xml");
+		return new File(getBaseDir(), "resource-dn-phobos.xml");
 	}
 
 	@Override
 	public String getStartSystemCommand() {
-		return getScriptDirectoryName()+"/389ds-bacchus-start";
+		return getScriptDirectoryName()+"/389ds-phobos-start";
 	}
 
 	@Override
 	public String getStopSystemCommand() {
-		return getScriptDirectoryName()+"/389ds-bacchus-stop";
+		return getScriptDirectoryName()+"/389ds-phobos-stop";
 	}
 
 	@Override
 	protected String getLdapServerHost() {
-		return "bacchus.lab.evolveum.com";
+		return "phobos.lab.evolveum.com";
 	}
 }
diff --git a/.../conntest/Test389DsNsUniqueIdBacchus.java → ...g/conntest/Test389DsNsUniqueIdPhobos.java b/.../conntest/Test389DsNsUniqueIdBacchus.java → ...g/conntest/Test389DsNsUniqueIdPhobos.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-2015 Evolveum
+ * Copyright (c) 2014-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,27 +27,27 @@
  * @author semancik
  *
  */
-public class Test389DsNsUniqueIdBacchus extends Abstract389DsNsUniqueIdTest {
+public class Test389DsNsUniqueIdPhobos extends Abstract389DsNsUniqueIdTest {
 
 
 	@Override
 	protected File getResourceFile() {
-		return new File(getBaseDir(), "resource-nsuniqueid-bacchus.xml");
+		return new File(getBaseDir(), "resource-nsuniqueid-phobos.xml");
 	}
 
 	@Override
 	public String getStartSystemCommand() {
-		return getScriptDirectoryName()+"/389ds-bacchus-start";
+		return getScriptDirectoryName()+"/389ds-phobos-start";
 	}
 
 	@Override
 	public String getStopSystemCommand() {
-		return getScriptDirectoryName()+"/389ds-bacchus-stop";
+		return getScriptDirectoryName()+"/389ds-phobos-stop";
 	}
 
 	@Override
 	protected String getLdapServerHost() {
-		return "bacchus.lab.evolveum.com";
+		return "phobos.lab.evolveum.com";
 	}
 
 }
diff --git a/...t/resources/389ds/resource-dn-bacchus.xml → ...st/resources/389ds/resource-dn-phobos.xml b/...t/resources/389ds/resource-dn-bacchus.xml → ...st/resources/389ds/resource-dn-phobos.xml
@@ -27,7 +27,7 @@
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
 	xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3">
-	<name>Localhost 389ds</name>
+	<name>Phobos 389ds</name>
 	<connectorRef type="ConnectorType">
 	    <filter>
 			<q:and>
@@ -44,7 +44,7 @@
 			xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector">
 		<icfc:configurationProperties>
 			<icfcldap:port>2389</icfcldap:port>
-			<icfcldap:host>bacchus.lab.evolveum.com</icfcldap:host>
+			<icfcldap:host>phobos.lab.evolveum.com</icfcldap:host>
 			<icfcldap:baseContext>dc=example,dc=com</icfcldap:baseContext>
 			<icfcldap:bindDn>cn=idm,ou=Special Users,dc=example,dc=com</icfcldap:bindDn>
 			<icfcldap:bindPassword><t:clearValue>secret123</t:clearValue></icfcldap:bindPassword>

diff --git a/...ces/389ds/resource-nsuniqueid-bacchus.xml → ...rces/389ds/resource-nsuniqueid-phobos.xml b/...ces/389ds/resource-nsuniqueid-bacchus.xml → ...rces/389ds/resource-nsuniqueid-phobos.xml
@@ -27,7 +27,7 @@
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
 	xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3">
-	<name>Localhost 389ds</name>
+	<name>Phobos 389ds</name>
 	<connectorRef type="ConnectorType">
 	    <filter>
 			<q:and>
@@ -44,7 +44,7 @@
 			xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector">
 		<icfc:configurationProperties>
 			<icfcldap:port>2389</icfcldap:port>
-			<icfcldap:host>bacchus.lab.evolveum.com</icfcldap:host>
+			<icfcldap:host>phobos.lab.evolveum.com</icfcldap:host>
 			<icfcldap:baseContext>dc=example,dc=com</icfcldap:baseContext>
 			<icfcldap:bindDn>cn=idm,ou=Special Users,dc=example,dc=com</icfcldap:bindDn>
 			<icfcldap:bindPassword><t:clearValue>secret123</t:clearValue></icfcldap:bindPassword>

diff --git a/testing/conntest/testng-integration.xml b/testing/conntest/testng-integration.xml
@@ -25,8 +25,8 @@
             <class name="com.evolveum.midpoint.testing.conntest.TestOpenDj"/>
             <class name="com.evolveum.midpoint.testing.conntest.TestOpenDjUnsafe"/>
             <class name="com.evolveum.midpoint.testing.conntest.TestOpenDjDumber"/>
-            <class name="com.evolveum.midpoint.testing.conntest.Test389DsNsUniqueIdBacchus"/>
-            <class name="com.evolveum.midpoint.testing.conntest.Test389DsDnBacchus"/>
+            <class name="com.evolveum.midpoint.testing.conntest.Test389DsNsUniqueIdPhobos"/>
+            <class name="com.evolveum.midpoint.testing.conntest.Test389DsDnPhobos"/>
             <class name="com.evolveum.midpoint.testing.conntest.TestEDirDeimos"/>
             <class name="com.evolveum.midpoint.testing.conntest.TestAdLdapMedusa"/>
             <class name="com.evolveum.midpoint.testing.conntest.TestAdLdapRawMedusa"/>

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -55,11 +55,6 @@
 			<artifactId>prism</artifactId>
 			<version>3.5-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.infra</groupId>
-			<artifactId>common</artifactId>
-			<version>3.5-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>repo-api</artifactId>

diff --git a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java
@@ -257,7 +257,7 @@ public void test100AddUserJack() throws Exception {
         assertAuditLoginLogout(tailer);
         assertAuditIds(tailer);
         assertAuditOperation(tailer, "ADD_OBJECT");
-        tailer.assertAudit(5);
+        tailer.assertAudit(4);
 
         // GET user
         UserType userAfter = getObject(UserType.class, USER_JACK_OID);

diff --git a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSecurity.java b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSecurity.java
@@ -402,7 +402,7 @@ public void test120AddUserNobodyAsAdministrator() throws Exception {
         assertAuditLoginLogout(tailer);
         assertAuditIds(tailer);
         assertAuditOperation(tailer, "ADD_OBJECT");
-        tailer.assertAudit(5);
+        tailer.assertAudit(4);
 
         // GET user
         UserType userNobodyAfter = getObject(UserType.class, userNobodyOid);
@@ -796,7 +796,7 @@ public void test142DisableHimselfAsDarthAdder() throws Exception {
         assertAuditLoginLogout(tailer);
         assertAuditIds(tailer);
         assertAuditOperation(tailer, "MODIFY_OBJECT");
-        tailer.assertAudit(5);
+        tailer.assertAudit(4);
 
         modelPort = createModelPort();
         UserType user = getObject(UserType.class, USER_DARTHADDER_OID);
@@ -882,7 +882,7 @@ public void test146EnableDarthAdder() throws Exception {
         assertAuditLoginLogout(tailer);
         assertAuditIds(tailer);
         assertAuditOperation(tailer, "MODIFY_OBJECT");
-        tailer.assertAudit(5);
+        tailer.assertAudit(4);
 
         modelPort = createModelPort(USER_DARTHADDER_USERNAME, USER_DARTHADDER_PASSWORD, WSConstants.PW_DIGEST);
         UserType user = getObject(UserType.class, USER_DARTHADDER_OID);