Merge branch 'fix/#456' into 'wrdp'

Fix/#456

See merge request o2oa/o2oa!2733

o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java

@@ -122,50 +122,50 @@ public class ScriptFactory {
 		return BooleanUtils.toBooleanObject(Objects.toString(o, "false"));
 	}
 
-	public static List<String> asDistinguishedName(Object o) throws Exception {
-		List<String> list = new ArrayList<>();
-		if (null != o) {
-			if (o instanceof CharSequence) {
-				list.add(Objects.toString(o));
-			} else if (o instanceof Iterable) {
-				for (Object obj : (Iterable<?>) o) {
-					if (null != obj) {
-						if (obj instanceof CharSequence) {
-							list.add(Objects.toString(obj));
-						} else {
-							Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
-							if (null != d) {
-								list.add(Objects.toString(d));
-							}
-						}
-					}
-				}
-			} else if (o instanceof ScriptObjectMirror) {
-				ScriptObjectMirror som = (ScriptObjectMirror) o;
-				if (som.isArray()) {
-					Object[] objs = (som.to(Object[].class));
-					for (Object obj : objs) {
-						if (null != obj) {
-							if (obj instanceof CharSequence) {
-								list.add(Objects.toString(obj));
-							} else {
-								Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
-								if (null != d) {
-									list.add(Objects.toString(d));
-								}
-							}
-						}
-					}
-				} else {
-					Object d = PropertyUtils.getProperty(o, JpaObject.DISTINGUISHEDNAME);
-					if (null != d) {
-						list.add(Objects.toString(d));
-					}
-				}
-			}
-		}
-		return list;
-	}
+//	public static List<String> asDistinguishedName(Object o) throws Exception {
+//		List<String> list = new ArrayList<>();
+//		if (null != o) {
+//			if (o instanceof CharSequence) {
+//				list.add(Objects.toString(o));
+//			} else if (o instanceof Iterable) {
+//				for (Object obj : (Iterable<?>) o) {
+//					if (null != obj) {
+//						if (obj instanceof CharSequence) {
+//							list.add(Objects.toString(obj));
+//						} else {
+//							Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
+//							if (null != d) {
+//								list.add(Objects.toString(d));
+//							}
+//						}
+//					}
+//				}
+//			} else if (o instanceof ScriptObjectMirror) {
+//				ScriptObjectMirror som = (ScriptObjectMirror) o;
+//				if (som.isArray()) {
+//					Object[] objs = (som.to(Object[].class));
+//					for (Object obj : objs) {
+//						if (null != obj) {
+//							if (obj instanceof CharSequence) {
+//								list.add(Objects.toString(obj));
+//							} else {
+//								Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
+//								if (null != d) {
+//									list.add(Objects.toString(d));
+//								}
+//							}
+//						}
+//					}
+//				} else {
+//					Object d = PropertyUtils.getProperty(o, JpaObject.DISTINGUISHEDNAME);
+//					if (null != d) {
+//						list.add(Objects.toString(d));
+//					}
+//				}
+//			}
+//		}
+//		return list;
+//	}
 
 	private static List<String> readAsStringList(Object obj) throws Exception {
 		List<String> list = new ArrayList<>();
@@ -264,6 +264,7 @@ public class ScriptFactory {
 				} else {
 					list.add(PropertyTools.getOrElse(o, JpaObject.DISTINGUISHEDNAME, String.class, ""));
 				}
+			// ScriptObject or JO
 			} else if (o instanceof ScriptObject) {
 				ScriptObject so = (ScriptObject) o;
 				if (so.isArray()) {

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCheckDraft.java

@@ -1,61 +0,0 @@
-//package com.x.processplatform.assemble.surface.jaxrs.work;
-//
-//import java.util.Objects;
-//
-//import org.apache.commons.lang3.BooleanUtils;
-//
-//import com.x.base.core.container.EntityManagerContainer;
-//import com.x.base.core.container.factory.EntityManagerContainerFactory;
-//import com.x.base.core.project.Applications;
-//import com.x.base.core.project.x_processplatform_service_processing;
-//import com.x.base.core.project.http.ActionResult;
-//import com.x.base.core.project.http.EffectivePerson;
-//import com.x.base.core.project.jaxrs.WoId;
-//import com.x.processplatform.assemble.surface.Business;
-//import com.x.processplatform.assemble.surface.ThisApplication;
-//import com.x.processplatform.assemble.surface.WorkControl;
-//import com.x.processplatform.core.entity.content.Work;
-//import com.x.processplatform.core.entity.element.ActivityType;
-//import com.x.processplatform.core.entity.element.Process;
-//
-//class ActionCheckDraft extends BaseAction {
-//
-//	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
-//		ActionResult<Wo> result = new ActionResult<>();
-//		Wo wo = new Wo();
-//		Work work = null;
-//		Process process = null;
-//		WoControl control = null;
-//		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-//			Business business = new Business(emc);
-//			work = emc.find(id, Work.class);
-//			if (null != work) {
-//				process = business.process().pick(work.getProcess());
-//				control = business.getControl(effectivePerson, work, WoControl.class);
-//			}
-//		}
-//		if ((null != process) && (null != control)) {
-//			if (BooleanUtils.isTrue(process.getCheckDraft())) {
-//				if (BooleanUtils.isTrue(control.getAllowDelete())) {
-//					if (BooleanUtils.isFalse(work.getDataChanged())
-//							&& Objects.equals(ActivityType.manual, work.getActivityType())) {
-//						wo = ThisApplication.context().applications()
-//								.deleteQuery(x_processplatform_service_processing.class,
-//										Applications.joinQueryUri("work", work.getId()), work.getJob())
-//								.getData(Wo.class);
-//						wo.setId(work.getId());
-//					}
-//				}
-//			}
-//		}
-//		result.setData(wo);
-//		return result;
-//	}
-//
-//	public static class Wo extends WoId {
-//
-//	}
-//
-//	public static class WoControl extends WorkControl {
-//	}
-//}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ScriptHelper.java

@@ -1,213 +0,0 @@
-//package com.x.processplatform.service.processing;
-//
-//import java.util.ArrayList;
-//import java.util.Collection;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Map.Entry;
-//import java.util.Objects;
-//
-//import javax.script.ScriptEngine;
-//import javax.script.ScriptEngineManager;
-//
-//import org.apache.commons.beanutils.PropertyUtils;
-//import org.apache.commons.lang3.StringUtils;
-//import org.apache.commons.lang3.SystemUtils;
-//
-//import com.google.gson.JsonArray;
-//import com.google.gson.JsonElement;
-//import com.google.gson.JsonObject;
-//import com.x.base.core.project.exception.ExceptionScriptEval;
-//import com.x.base.core.project.logger.Logger;
-//import com.x.base.core.project.logger.LoggerFactory;
-//import com.x.processplatform.core.entity.element.Script;
-//import com.x.processplatform.service.processing.processor.AeiObjects;
-//
-//import jdk.nashorn.api.scripting.ScriptObjectMirror;
-//
-//public class ScriptHelper {
-//
-//	private static Logger logger = LoggerFactory.getLogger(ScriptHelper.class);
-//
-//	private static final String defaultLanguage = "JavaScript";
-//
-//	private static final String distinguishedName = "distinguishedName";
-//
-//	private ScriptEngineManager factory;
-//	private ScriptEngine engine;
-//	private Business business;
-//	private AeiObjects aeiObjects = null;
-//
-//	public AeiObjects getAeiObjects() {
-//		return this.aeiObjects;
-//	}
-//
-//	void setAeiObjects(AeiObjects aeiObjects) {
-//		this.aeiObjects = aeiObjects;
-//	}
-//
-//	ScriptHelper(Business business, Map<String, Object> map, String initialScriptText) throws Exception {
-//		this.factory = new ScriptEngineManager();
-//		this.engine = factory.getEngineByName(defaultLanguage);
-//		this.business = business;
-//		for (Entry<String, Object> entry : map.entrySet()) {
-//			engine.put(entry.getKey(), entry.getValue());
-//		}
-//		try {
-//			engine.eval(initialScriptText);
-//		} catch (Exception e) {
-//			throw new ExceptionInitialScript(e, initialScriptText);
-//		}
-//	}
-//
-//	public Object eval(String scriptText) throws Exception {
-//		Object o = this.eval(null, null, scriptText);
-//		return o;
-//	}
-//
-//	public Object eval(String application, String scriptName, String scriptText) throws Exception {
-//		StringBuffer sb = new StringBuffer();
-//		try {
-//			sb.append("(function(){").append(SystemUtils.LINE_SEPARATOR);
-//			if (StringUtils.isNotEmpty(scriptName)) {
-//				List<Script> list = business.element().listScriptNestedWithApplicationWithUniqueName(application,
-//						scriptName);
-//				for (Script o : list) {
-//					sb.append(o.getText()).append(SystemUtils.LINE_SEPARATOR);
-//				}
-//			}
-//			if (StringUtils.isNotEmpty(scriptText)) {
-//				sb.append(scriptText).append(SystemUtils.LINE_SEPARATOR);
-//			}
-//			sb.append("}).apply(bind);");
-//			// return this.engine.eval(sb.toString(), scriptContext);
-//			Object obj = this.engine.eval(sb.toString());
-//			logger.debug("eval return:{}.", obj);
-//			return obj;
-//		} catch (Exception e) {
-//			throw new ExceptionScriptEval(e, e.getMessage() + ", code:\n" + sb.toString());
-//		}
-//	}
-//
-//	public List<String> evalAsStringList(String application, String scriptName, String scriptText) throws Exception {
-//		Object o = this.eval(application, scriptName, scriptText);
-//		return this.readAsStringList(o);
-//	}
-//
-//	public String evalAsString(String application, String scriptName, String scriptText) throws Exception {
-//		Object o = this.eval(application, scriptName, scriptText);
-//		return Objects.toString(o);
-//	}
-//
-//	public Boolean evalAsBoolean(String application, String scriptName, String scriptText) throws Exception {
-//		Object o = this.eval(application, scriptName, scriptText);
-//		return (Boolean) o;
-//	}
-//
-//	public List<String> evalExtrectDistinguishedName(String application, String scriptName, String scriptText)
-//			throws Exception {
-//		List<String> list = new ArrayList<>();
-//		Object o = this.eval(application, scriptName, scriptText);
-//		if (null != o) {
-//			if (o instanceof CharSequence) {
-//				list.add(Objects.toString(o, ""));
-//			} else if (o instanceof JsonObject) {
-//				JsonObject jsonObject = (JsonObject) o;
-//				if (jsonObject.has(distinguishedName)) {
-//					list.add(jsonObject.get(distinguishedName).getAsString());
-//				}
-//			} else if (o instanceof JsonArray) {
-//				for (JsonElement jsonElement : (JsonArray) o) {
-//					if (jsonElement.isJsonObject()) {
-//						JsonObject jsonObject = jsonElement.getAsJsonObject();
-//						if (jsonObject.has(distinguishedName)) {
-//							list.add(jsonObject.get(distinguishedName).getAsString());
-//						}
-//					}
-//				}
-//			} else if (o instanceof Iterable) {
-//				for (Object obj : (Iterable<?>) o) {
-//					if (null != obj) {
-//						if (obj instanceof CharSequence) {
-//							list.add(Objects.toString(obj, ""));
-//						} else {
-//							Object d = PropertyUtils.getProperty(obj, distinguishedName);
-//							if (null != d) {
-//								list.add(Objects.toString(d, ""));
-//							}
-//						}
-//					}
-//				}
-//			} else if (o instanceof ScriptObjectMirror) {
-//				ScriptObjectMirror som = (ScriptObjectMirror) o;
-//				if (som.isArray()) {
-//					Object[] objs = (som.to(Object[].class));
-//					for (Object obj : objs) {
-//						if (null != obj) {
-//							if (obj instanceof CharSequence) {
-//								list.add(Objects.toString(obj, ""));
-//							} else {
-//								Object d = PropertyUtils.getProperty(obj, distinguishedName);
-//								if (null != d) {
-//									list.add(Objects.toString(d, ""));
-//								}
-//							}
-//						}
-//					}
-//				} else {
-//					Object d = PropertyUtils.getProperty(o, distinguishedName);
-//					if (null != d) {
-//						list.add(Objects.toString(d, ""));
-//					}
-//				}
-//			}
-//		}
-//		return list;
-//
-//	}
-//
-//	private List<String> readAsStringList(Object obj) throws Exception {
-//		List<String> list = new ArrayList<>();
-//		for (Object o : this.iterator(obj)) {
-//			list.add(Objects.toString(o));
-//		}
-//		return list;
-//	}
-//
-//	private List<Object> iterator(Object obj) throws Exception {
-//		List<Object> results = new ArrayList<>();
-//		this.iterator(obj, results);
-//		return results;
-//	}
-//
-//	private void iterator(Object obj, List<Object> results) throws Exception {
-//		if (null == obj) {
-//			return;
-//		}
-//		List<Object> list = new ArrayList<>();
-//		if (obj.getClass().isArray()) {
-//			for (Object o : (Object[]) obj) {
-//				list.add(o);
-//			}
-//		} else if (obj instanceof Collection) {
-//			for (Object o : (Collection<?>) obj) {
-//				list.add(o);
-//			}
-//		} else if (obj instanceof ScriptObjectMirror) {
-//			ScriptObjectMirror som = (ScriptObjectMirror) obj;
-//			if (som.isArray()) {
-//				Object[] os = (som.to(Object[].class));
-//				for (Object o : os) {
-//					list.add(o);
-//				}
-//			} else {
-//				results.add(som);
-//			}
-//		} else {
-//			results.add(obj);
-//		}
-//		for (Object o : list) {
-//			iterator(o, results);
-//		}
-//	}
-//}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/ScriptHelperFactory.java

@@ -1,82 +0,0 @@
-//package com.x.processplatform.service.processing;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//import com.x.base.core.project.gson.XGsonBuilder;
-//import com.x.base.core.project.scripting.ScriptingEngine;
-//import com.x.base.core.project.webservices.WebservicesClient;
-//import com.x.organization.core.express.Organization;
-//import com.x.processplatform.core.entity.content.Data;
-//import com.x.processplatform.core.entity.content.Task;
-//import com.x.processplatform.core.entity.content.TaskCompleted;
-//import com.x.processplatform.core.entity.content.Work;
-//import com.x.processplatform.core.entity.element.Activity;
-//import com.x.processplatform.service.processing.processor.AeiObjects;
-//
-//public class ScriptHelperFactory {
-//
-//	public static String initialScriptText;
-//
-//	public static ScriptHelper create(AeiObjects aeiObjects, BindingPair... bindingPairs) throws Exception {
-//		WorkContext workContext = new WorkContext(aeiObjects);
-//		Map<String, Object> map = new HashMap<>();
-//		map.put(ScriptingEngine.BINDINGNAME_WORKCONTEXT, workContext);
-//		map.put(ScriptingEngine.BINDINGNAME_GSON, XGsonBuilder.instance());
-//		map.put(ScriptingEngine.BINDINGNAME_DATA, aeiObjects.getData());
-//		map.put(ScriptingEngine.BINDINGNAME_ORGANIZATION, new Organization(ThisApplication.context()));
-//		map.put(ScriptingEngine.BINDINGNAME_WEBSERVICESCLIENT, new WebservicesClient());
-//		map.put(ScriptingEngine.BINDINGNAME_DICTIONARY,
-//				new ApplicationDictHelper(aeiObjects.entityManagerContainer(), aeiObjects.getWork().getApplication()));
-//		map.put(ScriptingEngine.BINDINGNAME_APPLICATIONS, ThisApplication.context().applications());
-//		if ((null != aeiObjects.getProcessingAttributes())
-//				&& (null != aeiObjects.getProcessingAttributes().getRouteData())) {
-//			map.put(ScriptingEngine.BINDINGNAME_ROUTEDATA,
-//					aeiObjects.getProcessingAttributes().getRouteData().toString());
-//		} else {
-//			map.put(ScriptingEngine.BINDINGNAME_ROUTEDATA, "");
-//		}
-//		for (BindingPair o : bindingPairs) {
-//			map.put(o.getName(), o.getValue());
-//		}
-//		ScriptHelper sh = new ScriptHelper(aeiObjects.business(), map, initialScriptText);
-//		sh.setAeiObjects(aeiObjects);
-//		return sh;
-//	}
-//
-//	public static ScriptHelper createWithTask(Business business, Work work, Data data, Activity activity, Task task,
-//			BindingPair... bindingPairs) throws Exception {
-//		WorkContext workContext = new WorkContext(business, work, activity, task);
-//		Map<String, Object> map = new HashMap<>();
-//		map.put(ScriptingEngine.BINDINGNAME_WORKCONTEXT, workContext);
-//		map.put(ScriptingEngine.BINDINGNAME_DATA, data);
-//		map.put(ScriptingEngine.BINDINGNAME_ORGANIZATION, new Organization(ThisApplication.context()));
-//		map.put(ScriptingEngine.BINDINGNAME_WEBSERVICESCLIENT, new WebservicesClient());
-//		map.put(ScriptingEngine.BINDINGNAME_DICTIONARY,
-//				new ApplicationDictHelper(business.entityManagerContainer(), work.getApplication()));
-//		map.put(ScriptingEngine.BINDINGNAME_APPLICATIONS, ThisApplication.context().applications());
-//		for (BindingPair o : bindingPairs) {
-//			map.put(o.getName(), o.getValue());
-//		}
-//		ScriptHelper sh = new ScriptHelper(business, map, initialScriptText);
-//		return sh;
-//	}
-//
-//	public static ScriptHelper createWithTaskCompleted(Business business, Work work, Data data, Activity activity,
-//			TaskCompleted taskCompleted, BindingPair... bindingPairs) throws Exception {
-//		WorkContext workContext = new WorkContext(business, work, activity, taskCompleted);
-//		Map<String, Object> map = new HashMap<>();
-//		map.put(ScriptingEngine.BINDINGNAME_WORKCONTEXT, workContext);
-//		map.put(ScriptingEngine.BINDINGNAME_DATA, data);
-//		map.put(ScriptingEngine.BINDINGNAME_ORGANIZATION, new Organization(ThisApplication.context()));
-//		map.put(ScriptingEngine.BINDINGNAME_WEBSERVICESCLIENT, new WebservicesClient());
-//		map.put(ScriptingEngine.BINDINGNAME_DICTIONARY,
-//				new ApplicationDictHelper(business.entityManagerContainer(), work.getApplication()));
-//		map.put(ScriptingEngine.BINDINGNAME_APPLICATIONS, ThisApplication.context().applications());
-//		for (BindingPair o : bindingPairs) {
-//			map.put(o.getName(), o.getValue());
-//		}
-//		ScriptHelper sh = new ScriptHelper(business, map, initialScriptText);
-//		return sh;
-//	}
-//}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/TranslateTaskIdentityTools.java

@@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
@@ -26,8 +25,6 @@ import com.x.processplatform.core.entity.element.Manual;
 import com.x.processplatform.service.processing.Business;
 import com.x.processplatform.service.processing.processor.AeiObjects;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
-
 /**
  * 在Manual环节计算所有的待办人的Identity
  * 
@@ -116,46 +113,49 @@ public class TranslateTaskIdentityTools {
 					.getCompiledScript(aeiObjects.getWork().getApplication(), manual, Business.EVENT_MANUALTASK)
 					.eval(aeiObjects.scriptContext());
 			if (null != o) {
-				if (o instanceof CharSequence) {
-					taskIdentities.addIdentity(o.toString());
-				} else if (o instanceof JsonObject) {
-					JsonObject jsonObject = (JsonObject) o;
-					addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
-				} else if (o instanceof JsonArray) {
-					for (JsonElement jsonElement : (JsonArray) o) {
-						if (jsonElement.isJsonObject()) {
-							JsonObject jsonObject = jsonElement.getAsJsonObject();
-							addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
-						}
-					}
-				} else if (o instanceof Iterable) {
-					for (Object obj : (Iterable<?>) o) {
-						if (null != obj) {
-							if (obj instanceof CharSequence) {
-								taskIdentities.addIdentity(Objects.toString(obj, ""));
-							} else {
-								addObjectToTaskIdentities(taskIdentities, units, groups, obj);
-							}
-						}
-					}
-				} else if (o instanceof ScriptObjectMirror) {
-					ScriptObjectMirror som = (ScriptObjectMirror) o;
-					if (som.isArray()) {
-						Object[] objs = (som.to(Object[].class));
-						for (Object obj : objs) {
-							if (null != obj) {
-								if (obj instanceof CharSequence) {
-									taskIdentities.addIdentity(Objects.toString(obj, ""));
-								} else {
-									addObjectToTaskIdentities(taskIdentities, units, groups, obj);
-								}
-							}
-						}
-					} else {
-						addObjectToTaskIdentities(taskIdentities, units, groups, som);
-					}
-				}
+				addObjectToTaskIdentities(taskIdentities, units, groups, o);
 			}
+//			if (null != o) {
+//				if (o instanceof CharSequence) {
+//					taskIdentities.addIdentity(o.toString());
+//				} else if (o instanceof JsonObject) {
+//					JsonObject jsonObject = (JsonObject) o;
+//					addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
+//				} else if (o instanceof JsonArray) {
+//					for (JsonElement jsonElement : (JsonArray) o) {
+//						if (jsonElement.isJsonObject()) {
+//							JsonObject jsonObject = jsonElement.getAsJsonObject();
+//							addJsonObjectToTaskIdentities(taskIdentities, units, groups, jsonObject);
+//						}
+//					}
+//				} else if (o instanceof Iterable) {
+//					for (Object obj : (Iterable<?>) o) {
+//						if (null != obj) {
+//							if (obj instanceof CharSequence) {
+//								taskIdentities.addIdentity(Objects.toString(obj, ""));
+//							} else {
+//								addObjectToTaskIdentities(taskIdentities, units, groups, obj);
+//							}
+//						}
+//					}
+//				} else if (o instanceof ScriptObjectMirror) {
+//					ScriptObjectMirror som = (ScriptObjectMirror) o;
+//					if (som.isArray()) {
+//						Object[] objs = (som.to(Object[].class));
+//						for (Object obj : objs) {
+//							if (null != obj) {
+//								if (obj instanceof CharSequence) {
+//									taskIdentities.addIdentity(Objects.toString(obj, ""));
+//								} else {
+//									addObjectToTaskIdentities(taskIdentities, units, groups, obj);
+//								}
+//							}
+//						}
+//					} else {
+//						addObjectToTaskIdentities(taskIdentities, units, groups, som);
+//					}
+//				}
+//			}
 		}
 		return list;
 	}
@@ -222,25 +222,25 @@ public class TranslateTaskIdentityTools {
 		}
 	}
 
-	private static void addJsonObjectToTaskIdentities(TaskIdentities taskIdentities, List<String> units,
-			List<String> group, JsonObject jsonObject) throws Exception {
-		if (jsonObject.has(JpaObject.DISTINGUISHEDNAME)) {
-			String d = jsonObject.get(JpaObject.DISTINGUISHEDNAME).getAsString();
-			if (OrganizationDefinition.isIdentityDistinguishedName(d)) {
-				boolean ignore = false;
-				if (jsonObject.has(TaskIdentity.IGNOREEMPOWER)) {
-					ignore = BooleanUtils.isTrue(
-							BooleanUtils.toBooleanObject(jsonObject.get(TaskIdentity.IGNOREEMPOWER).getAsString()));
-				}
-				TaskIdentity taskIdentity = new TaskIdentity();
-				taskIdentity.setIdentity(d);
-				taskIdentity.setIgnoreEmpower(ignore);
-				taskIdentities.add(taskIdentity);
-			} else if (OrganizationDefinition.isUnitDistinguishedName(d)) {
-				units.add(d);
-			} else if (OrganizationDefinition.isGroupDistinguishedName(d)) {
-				units.add(d);
-			}
-		}
-	}
+//	private static void addJsonObjectToTaskIdentities(TaskIdentities taskIdentities, List<String> units,
+//			List<String> group, JsonObject jsonObject) throws Exception {
+//		if (jsonObject.has(JpaObject.DISTINGUISHEDNAME)) {
+//			String d = jsonObject.get(JpaObject.DISTINGUISHEDNAME).getAsString();
+//			if (OrganizationDefinition.isIdentityDistinguishedName(d)) {
+//				boolean ignore = false;
+//				if (jsonObject.has(TaskIdentity.IGNOREEMPOWER)) {
+//					ignore = BooleanUtils.isTrue(
+//							BooleanUtils.toBooleanObject(jsonObject.get(TaskIdentity.IGNOREEMPOWER).getAsString()));
+//				}
+//				TaskIdentity taskIdentity = new TaskIdentity();
+//				taskIdentity.setIdentity(d);
+//				taskIdentity.setIgnoreEmpower(ignore);
+//				taskIdentities.add(taskIdentity);
+//			} else if (OrganizationDefinition.isUnitDistinguishedName(d)) {
+//				units.add(d);
+//			} else if (OrganizationDefinition.isGroupDistinguishedName(d)) {
+//				units.add(d);
+//			}
+//		}
+//	}
 }