Author: jleroux
Date: Tue Oct 24 03:58:36 2006
New Revision: 467304
URL: http://svn.apache.org/viewvc?view=rev&rev=467304
Log:
A patch from Adam Heath "Upgrade bsf to something a bit more modern"
(https://issues.apache.org/jira/browse/OFBIZ-401)
Modified:
incubator/ofbiz/trunk/framework/base/lib/scripting/bsf.jar
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/OfbizBshBsfEngine.java
incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java
incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
Modified: incubator/ofbiz/trunk/framework/base/lib/scripting/bsf.jar
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/lib/scripting/bsf.jar?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
Binary files - no diff available.
Modified:
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/OfbizBshBsfEngine.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/OfbizBshBsfEngine.java?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
---
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/OfbizBshBsfEngine.java
(original)
+++
incubator/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/OfbizBshBsfEngine.java
Tue Oct 24 03:58:36 2006
@@ -33,10 +33,10 @@
import bsh.InterpreterError;
import bsh.TargetError;
-import com.ibm.bsf.BSFDeclaredBean;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.BSFEngineImpl;
+import org.apache.bsf.BSFDeclaredBean;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.BSFEngineImpl;
import org.ofbiz.base.util.cache.UtilCache;
Modified:
incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
---
incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java
(original)
+++
incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java
Tue Oct 24 03:58:36 2006
@@ -23,10 +23,10 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.minilang.method.MethodContext;
-import com.ibm.bsf.BSFDeclaredBean;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.BSFEngineImpl;
+import org.apache.bsf.BSFDeclaredBean;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.BSFEngineImpl;
/**
* <P>This is the OFBiz MiniLang SimpleMethod adapter for IBM's Bean Scripting
Famework.
Modified:
incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
---
incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java
(original)
+++
incubator/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/BSFEngine.java
Tue Oct 24 03:58:36 2006
@@ -27,8 +27,8 @@
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceDispatcher;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
/**
* BSF Service Engine
@@ -87,11 +87,11 @@
mgr.registerBean("context", context);
// pre-load the engine to make sure we were called right
- com.ibm.bsf.BSFEngine bsfEngine = null;
+ org.apache.bsf.BSFEngine bsfEngine = null;
try {
bsfEngine = mgr.loadScriptingEngine(modelService.engineName);
} catch (BSFException e) {
- throw new GenericServiceException("Problems loading
com.ibm.bsf.BSFEngine: " + modelService.engineName, e);
+ throw new GenericServiceException("Problems loading
org.apache.bsf.BSFEngine: " + modelService.engineName, e);
}
// source the script into a string
Modified:
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
---
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
(original)
+++
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Tue Oct 24 03:58:36 2006
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.Enumeration;
-import com.ibm.bsf.BSFManager;
+import org.apache.bsf.BSFManager;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilHttp;
Modified:
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java?view=diff&rev=467304&r1=467303&r2=467304
==============================================================================
---
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
(original)
+++
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
Tue Oct 24 03:58:36 2006
@@ -22,9 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import com.ibm.bsf.util.IOUtils;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
+import org.apache.bsf.util.IOUtils;
import org.ofbiz.base.util.cache.UtilCache;
