From ba8cc7463f6250139d87987e109ca2a1378bbee8 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Sat, 9 Mar 2013 08:47:01 +0800
Subject: [PATCH] IDEMPIERE-598 Different errors when running Groovy scripts
 from Swing or Webui. Peer review.

---
 .../src/org/adempiere/util/ProcessUtil.java   | 51 ++-----------------
 .../src/org/compiere/model/MRule.java         |  3 +-
 .../adempiere/webui/process/WProcessInfo.java |  6 ++-
 3 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java b/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
index da0f39d49e..68c88f3bea 100644
--- a/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
+++ b/org.adempiere.base/src/org/adempiere/util/ProcessUtil.java
@@ -24,7 +24,6 @@ import java.math.BigDecimal;
 import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
-import java.util.UUID;
 import java.util.logging.Level;
 
 import javax.script.ScriptEngine;
@@ -156,56 +155,12 @@ public final class ProcessUtil {
 		}
 
 		ProcessCall process = null;
-		//always query equinox extension first
+		//invoke process factory
 		process = Core.getProcess(className);
 
 		if (process == null) {
-			//Get Class
-			Class<?> processClass = null;
-			//use context classloader if available
-			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-			if (classLoader != null)
-			{
-				try
-				{
-					processClass = classLoader.loadClass(className);
-				}
-				catch (ClassNotFoundException ex)
-				{
-					log.log(Level.FINE, className, ex);
-				}
-			}
-			if (processClass == null)
-			{
-				classLoader = ProcessUtil.class.getClassLoader();
-				try
-				{
-					processClass = classLoader.loadClass(className);
-				}
-				catch (ClassNotFoundException ex)
-				{
-					log.log(Level.WARNING, className, ex);
-					pi.setSummary ("ClassNotFound", true);
+			pi.setSummary("Failed to create new process instance for " + className, true);
 			return false;
-				}
-			}
-
-			if (processClass == null) {
-				pi.setSummary("No Instance for " + pi.getClassName(), true);
-				return false;
-			}
-
-			//Get Process
-			try
-			{
-				process = (ProcessCall)processClass.newInstance();
-			}
-			catch (Exception ex)
-			{
-				log.log(Level.WARNING, "Instance for " + className, ex);
-				pi.setSummary ("InstanceError", true);
-				return false;
-			}
 		}
 
 		boolean success = false;
@@ -268,7 +223,7 @@ public final class ProcessUtil {
 			// now add the method arguments to the engine
 			engine.put(MRule.ARGUMENTS_PREFIX + "Ctx", ctx);
 			if (trx == null)
-				trx = Trx.get(pi.getTitle()+"_"+pi.getAD_PInstance_ID() + "_" + UUID.randomUUID(), true);
+				trx = Trx.get(Trx.createTrxName(pi.getTitle()+"_"+pi.getAD_PInstance_ID()), true);
 			engine.put(MRule.ARGUMENTS_PREFIX + "Trx", trx);
 			engine.put(MRule.ARGUMENTS_PREFIX + "TrxName", trx.getTrxName());
 			engine.put(MRule.ARGUMENTS_PREFIX + "Record_ID", pi.getRecord_ID());
diff --git a/org.adempiere.base/src/org/compiere/model/MRule.java b/org.adempiere.base/src/org/compiere/model/MRule.java
index d50ac7a447..457cd50ffc 100644
--- a/org.adempiere.base/src/org/compiere/model/MRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MRule.java
@@ -26,7 +26,6 @@ import java.util.Properties;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
-import org.compiere.Adempiere;
 import org.compiere.util.CCache;
 import org.compiere.util.CLogger;
 import org.compiere.util.Msg;
@@ -196,7 +195,7 @@ public class MRule extends X_AD_Rule
 	 *	@return ScriptEngine
 	 */
 	public ScriptEngine getScriptEngine() {
-		factory = new ScriptEngineManager(Adempiere.class.getClassLoader());
+		factory = new ScriptEngineManager(getClass().getClassLoader());
 		String engineName = getEngineName();
 		if (engineName != null)
 			engine = factory.getEngineByName(getEngineName());
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
index 350d05bb74..1bda5882fd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
@@ -118,8 +118,10 @@ public class WProcessInfo extends ProcessInfo {
 		{
 			try {
 				int lastdot = className.lastIndexOf(".");
-				zkName = className.substring(0, lastdot) + ".W" +  className.substring(lastdot+1);
-				this.getClass().getClassLoader().loadClass(zkName);
+				if (lastdot > 0) {
+					zkName = className.substring(0, lastdot) + ".W" +  className.substring(lastdot+1);
+					this.getClass().getClassLoader().loadClass(zkName);
+				}
 			} catch (Exception e) {
 				zkName = null;
 			}