Skip to content

Commit

Permalink
OFBIZ-7763 Removed a series of artifacts dependent on the old Beanshe…
Browse files Browse the repository at this point in the history
…ll jar that is going to be removed from the project; specifically:

* removed the code that implemented the deprecated "call-bsh" operation in Minilang
* removed the BeanShellContainer (it has been disabled a long time ago)
* removed the BeanShell service engine, no more used


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751947 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
jacopoc committed Jul 8, 2016
1 parent 041a803 commit e0815df
Show file tree
Hide file tree
Showing 19 changed files with 4 additions and 752 deletions.
3 changes: 0 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -456,9 +456,6 @@ framework/base/lib/jce-jdk13-154.jar
framework/base/lib/xpp3-1.1.4c.jar
framework/base/lib/xstream-1.4.9.jar
framework/base/lib/esapi-2.1.0.jar
framework/base/lib/scripting/antlr-2.7.6.jar
framework/base/lib/scripting/asm-3.2.jar
framework/base/lib/scripting/jline-0.9.94.jar

=========================================================================
The BSD License
Expand Down
5 changes: 0 additions & 5 deletions applications/commonext/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ under the License.
<param-name>mainDecoratorLocation</param-name>
<param-value>component://commonext/widget/CommonScreens.xml</param-value>
</context-param>
<context-param>
<description>BeanShell Script Location</description>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
</context-param>

<filter>
<display-name>ContextFilter</display-name>
Expand Down
7 changes: 1 addition & 6 deletions applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,7 @@
<param-name>mainDecoratorLocation</param-name>
<param-value>component://commonext/widget/ofbizsetup/CommonScreens.xml</param-value>
</context-param>
<context-param>
<description>BeanShell Script Location</description>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
</context-param>


<filter>
<display-name>ContextFilter</display-name>
<filter-name>ContextFilter</filter-name>
Expand Down
5 changes: 0 additions & 5 deletions applications/marketing/webapp/marketing/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ under the License.
<param-name>localDispatcherName</param-name>
<param-value>marketing</param-value>
</context-param>
<context-param>
<description>BeanShell Script Location</description>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
</context-param>
<context-param>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
<param-name>mainDecoratorLocation</param-name>
Expand Down
5 changes: 0 additions & 5 deletions applications/workeffort/webapp/workeffort/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ under the License.
<param-name>localDispatcherName</param-name>
<param-value>workeffort</param-value>
</context-param>
<context-param>
<description>BeanShell Script Location</description>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
</context-param>
<context-param>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable
in screen def XML files.
Expand Down
8 changes: 0 additions & 8 deletions framework/base/ofbiz-component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,4 @@ under the License.
<property name="port" value="1099"/>
</container>

<!-- load BeanShell remote telnet server -->
<!-- Commented out by default for security reasons -->
<!-- the port below and port-1 will be opened by Beanshell -->
<!--container name="beanshell-container" class="org.ofbiz.base.container.BeanShellContainer">
<property name="telnet-port" value="9990"/>
<property name="app-name" value="OFBiz"/>
</container-->

</ofbiz-component>

This file was deleted.

120 changes: 0 additions & 120 deletions framework/base/src/org/ofbiz/base/container/BeanShellContainer.java

This file was deleted.

Loading

0 comments on commit e0815df

Please sign in to comment.