Merge branch 'master' into gui-devel

Evolveum · Jul 10, 2014 · 8c29330 · 8c29330
2 parents 1bb5520 + 7931dfc
commit 8c29330
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/...el-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java b/...el-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
@@ -209,8 +209,10 @@ public static Object resolvePath(ItemPath path, ExpressionVariables variables, O
 		if (root instanceof ObjectReferenceType) {
 			root = resolveReference((ObjectReferenceType)root, objectResolver, varDesc, shortDesc, result);
 		}
-
-		if (root instanceof PrismObject<?>) {
+
+        if (root instanceof Objectable) {
+            return (((Objectable) root).asPrismObject()).find(relativePath);
+        } if (root instanceof PrismObject<?>) {
 			return ((PrismObject<?>)root).find(relativePath);
 		} else if (root instanceof PrismContainer<?>) {
 			return ((PrismContainer<?>)root).find(relativePath);

diff --git a/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml b/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
@@ -35,10 +35,6 @@
 
 	<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/reconciliation/handler-3</handlerUri>
 	<objectRef oid="10000000-0000-0000-0000-00000000a204" type="ResourceType"/>
-	<recurrence>recurring</recurrence>
-	<binding>tight</binding>
-	<schedule>
-		<interval>5</interval>
-	</schedule>
+	<recurrence>single</recurrence>
 
 </task>
diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2014 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,7 @@
 package com.evolveum.midpoint.task.api;
 
 /**
- * Created with IntelliJ IDEA.
- * User: mederly
- * Date: 3.5.2012
- * Time: 21:50
- * To change this template use File | Settings | File Templates.
+ * @author mederly
  */
 public class TaskCategory {
 
@@ -36,4 +32,5 @@ public class TaskCategory {
     public static final String WORKFLOW = "Workflow";
     public static final String SYSTEM = "System";
     public static final String REPORT = "Report";
+    public static final String CUSTOM = "Custom";
 }