Author: jacopoc
Date: Mon Sep 12 14:53:47 2016
New Revision: 1760384
URL: http://svn.apache.org/viewvc?rev=1760384&view=rev
Log:
Improved: Removal of support for the Bean Scripting Framework (BSF).
(OFBIZ-8224)
This commit removes the support for the Bean Scripting Framework (BSF) from the
OFBiz framework:
no application code was using this since several years and there are better and
more modern tools at the present time.
Removed:
ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethodBsfEngine.java
ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/BSFEngine.java
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/BsfEventHandler.java
Modified:
ofbiz/trunk/OPTIONAL_LIBRARIES
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/build.gradle
ofbiz/trunk/framework/base/config/cache.properties
ofbiz/trunk/framework/service/config/serviceengine.xml
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
Modified: ofbiz/trunk/OPTIONAL_LIBRARIES
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/OPTIONAL_LIBRARIES?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
--- ofbiz/trunk/OPTIONAL_LIBRARIES (original)
+++ ofbiz/trunk/OPTIONAL_LIBRARIES Mon Sep 12 14:53:47 2016
@@ -7,12 +7,6 @@ to change to include them in the OFBiz b
NOTE: While these aren't included in the main SVN repository they are available
on the old Undersun SVN server in the specialized/libraries component
directory.
--=- Scripting:
________________________________________________________________________________________________________________________________________________
-
--JavaScript/Rhino (NPL 1.1):
- http://www.mozilla.org/js
- TO BUILD comment out exclude:
base/build.xml:org/apache/ofbiz/base/util/OfbizJsBsfEngine.java
-
-=- Reporting:
________________________________________________________________________________________________________________________________________________
- JIMI (used by FOP ):
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Mon
Sep 12 14:53:47 2016
@@ -23,9 +23,6 @@ under the License.
<include
location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<description>Facility Manager Module Site Configuration File</description>
-
- <handler name="bsf" type="request"
class="org.apache.ofbiz.webapp.event.BsfEventHandler"/>
-
<!-- Events to run on every request before security (chains exempt) -->
<!--
Modified: ofbiz/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Mon Sep 12 14:53:47 2016
@@ -92,7 +92,6 @@ dependencies {
compile 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
compile 'org.apache.ant:ant-junit:1.9.0'
compile 'org.apache.axis2:axis2-kernel:1.7.1'
- compile 'org.apache.bsf:com.springsource.org.apache.bsf:2.4.0'
compile 'org.apache.commons:commons-collections4:4.1'
compile 'org.apache.commons:commons-csv:1.1'
compile 'org.apache.commons:commons-dbcp2:2.1'
@@ -145,7 +144,6 @@ dependencies {
runtime 'net.sf.barcode4j:barcode4j-fop-ext-complete:2.0'
runtime 'net.sf.dozer:dozer:4.2.1'
runtime 'net.sf.ezmorph:ezmorph:0.9.1'
- runtime 'org.apache.ant:ant-apache-bsf:1.9.0'
runtime 'org.apache.axis2:axis2-adb:1.7.1'
runtime 'org.apache.geronimo.specs:geronimo-jaxr_1.0_spec:1.0'
runtime 'org.apache.geronimo.specs:geronimo-saaj_1.3_spec:1.1'
Modified: ofbiz/trunk/framework/base/config/cache.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/cache.properties?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/cache.properties (original)
+++ ofbiz/trunk/framework/base/config/cache.properties Mon Sep 12 14:53:47 2016
@@ -73,8 +73,6 @@ script.GroovyLocationParsedCache.expireT
# Clearing this cache will reload service defs, for all service and so it
takes time and results in lots of log messages, so it is commented by default.
#service.ModelServiceMapByDispatcher.expireTime=10000
-webapp.BsfEvents.expireTime=10000
-webapp.JasperReportsCompiled.expireTime=10000
webapp.ControllerConfig.expireTime=10000
widget.form.locationResource.expireTime=10000
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Mon Sep 12 14:53:47
2016
@@ -47,9 +47,7 @@ under the License.
<engine name="script"
class="org.apache.ofbiz.service.engine.ScriptEngine"/>
<!-- Engines that can be replaced by the generic script engine -->
<engine name="groovy"
class="org.apache.ofbiz.service.engine.GroovyEngine"/>
- <engine name="jacl" class="org.apache.ofbiz.service.engine.BSFEngine"/>
<engine name="javascript"
class="org.apache.ofbiz.service.engine.ScriptEngine"/>
- <engine name="jpython"
class="org.apache.ofbiz.service.engine.BSFEngine"/>
<!-- -->
<engine name="route"
class="org.apache.ofbiz.service.engine.RouteEngine"/>
<engine name="http"
class="org.apache.ofbiz.service.engine.HttpEngine"/>
Modified:
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java?rev=1760384&r1=1760383&r2=1760384&view=diff
==============================================================================
---
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
(original)
+++
ofbiz/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
Mon Sep 12 14:53:47 2016
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.bsf.BSFManager;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilCodec;
import org.apache.ofbiz.base.util.UtilGenerics;
@@ -74,8 +73,6 @@ public class ControlServlet extends Http
Debug.logInfo("Loading webapp [" + webappName + "], located at " +
servletContext.getRealPath("/"), module);
}
- // configure custom BSF engines
- configureBsf();
// initialize the request handler
getRequestHandler();
}
@@ -329,14 +326,6 @@ public class ControlServlet extends Http
return RequestHandler.getRequestHandler(getServletContext());
}
- protected void configureBsf() {
- String[] jsExtensions = {"js"};
- BSFManager.registerScriptingEngine("javascript",
"org.apache.ofbiz.base.util.OfbizJsBsfEngine", jsExtensions);
-
- String[] smExtensions = {"sm"};
- BSFManager.registerScriptingEngine("simplemethod",
"org.apache.ofbiz.minilang.SimpleMethodBsfEngine", smExtensions);
- }
-
protected void logRequestInfo(HttpServletRequest request) {
ServletContext servletContext = this.getServletContext();
HttpSession session = request.getSession();
