OFBIZ-7763 :

Remove all bsh libraries and bsh remaining fonctionnalities.
Bsh interpreter is replaced by GroovyShell evaluation.

To avoid groovyShell undefined var exception, the evaluated expression is analysed, detecting variables used and setting its to null if undefined in context.
Today only alphabetic variable with '_' are detected (i.e. my_variable==null).
Add in example a test replacement of " syntax to simple quote.
Remove all found bsh references

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752231 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gil Portenseigne
2016-07-11 23:04:54 +00:00
parent e16a4d0d10
commit 3130f0eb95
20 changed files with 77 additions and 765 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ specific language governing permissions and limitations
under the License.
=====================================================================
For Java, Groovy, BSH, CSS and JS Files:
For Java, Groovy, CSS and JS Files:
=====================================================================
/*
* Licensed to the Apache Software Foundation (ASF) under one
-478
View File
@@ -447,7 +447,6 @@ The JDOM License
The following libraries distributed with Apache OFBiz are licensed under the
BSD License:
applications/content/lib/dom4j-1.6.1.jar
framework/base/lib/bsh-engine-modified.jar
framework/base/lib/hamcrest-all-1.2.jar
framework/base/lib/httpunit-1.7.jar
framework/base/lib/ical4j-1.0-rc2.jar
@@ -1235,483 +1234,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
Sun Public License:
framework/base/lib/scripting/bsh-2.0b4.jar
=========================================================================
SUN PUBLIC LICENSE Version 1.0
1. Definitions.
1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.
1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.
1.2. "Contributor Version" means the combination of the Original Code,
prior Modifications used by a Contributor, and the Modifications made
by that particular Contributor.
1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof and corresponding documentation released
with the source code.
1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.
1.5. "Executable" means Covered Code in any form other than Source
Code.
1.6. "Initial Developer" means the individual or entity identified as
the Initial Developer in the Source Code notice required by Exhibit A.
1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.
1.8. "License" means this document.
1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.
1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:
A. Any addition to or deletion from the contents of a file containing
Original Code or previous Modifications.
B. Any new file that contains any part of the Original Code or
previous Modifications.
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.
1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process, and
apparatus claims, in any patent Licensable by grantor.
1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated documentation, interface definition files, scripts used
to control compilation and installation of an Executable, or source
code differential comparisons against either the Original Code or
another well known, available Covered Code of the Contributor's
choice. The Source Code can be in a compressed or archival form,
provided the appropriate decompression or de-archiving software is
widely available for no charge.
1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section 6.1.
For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect, to
cause the direction or management of such entity, whether by contract
or otherwise, or (b) ownership of more than fifty percent (50%) of the
outstanding shares or beneficial ownership of such entity.
2. Source Code License.
2.1 The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:
(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce, modify,
display, perform, sublicense and distribute the Original Code (or
portions thereof) with or without Modifications, and/or as part of a
Larger Work; and
(b) under Patent Claims infringed by the making, using or selling of
Original Code, to make, have made, use, practice, sell, and offer for
sale, and/or otherwise dispose of the Original Code (or portions
thereof).
(c) the licenses granted in this Section 2.1(a) and (b) are effective
on the date Initial Developer first distributes Original Code under
the terms of this License.
(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by:
i) the modification of the Original Code or ii) the combination of the
Original Code with other software or devices.
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world-wide, royalty-free, non-exclusive license
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications created
by such Contributor (or portions thereof) either on an unmodified
basis, with other Modifications, as Covered Code and/or as part of a
Larger Work; and
(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
combination), to make, use, sell, offer for sale, have made, and/or
otherwise dispose of: 1) Modifications made by that Contributor (or
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).
(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
on the date Contributor first makes Commercial Use of the Covered
Code.
(d) notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3) for
infringements caused by: i) third party modifications of Contributor
Version or ii) the combination of Modifications made by that
Contributor with other software (except as part of the Contributor
Version) or other devices; or 4) under Patent Claims infringed by
Covered Code in the absence of Modifications made by that Contributor.
3. Distribution Obligations.
3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder. However, You may include
an additional document offering the additional rights described in
Section 3.5.
3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.
3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.
3.4. Intellectual Property Matters.
(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2, Contributor
must include a text file with the Source Code distribution titled
"LEGAL'' which describes the claim and the party making the claim in
sufficient detail that a recipient will know whom to contact. If
Contributor obtains such knowledge after the Modification is made
available as described in Section 3.2, Contributor shall promptly
modify the LEGAL file in all copies Contributor makes available
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.
(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface ("API") and Contributor has knowledge of patent licenses
which are reasonably necessary to implement that API, Contributor must
also include this information in the LEGAL file.
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4(a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.
3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code. If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice. If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A. You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code. You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor. You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.
3.6. Distribution of Executable Versions.
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.
3.7. Larger Works.
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.
4. Inability to Comply Due to Statute or Regulation.
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.
5. Application of this License.
This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.
6. Versions of the License.
6.1. New Versions.
Sun Microsystems, Inc. ("Sun") may publish revised and/or new versions
of the License from time to time. Each version will be given a
distinguishing version number.
6.2. Effect of New Versions.
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Sun. No one
other than Sun has the right to modify the terms applicable to Covered
Code created under this License.
6.3. Derivative Works.
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must: (a) rename Your license so that
the phrases "Sun," "Sun Public License," or "SPL" or any confusingly
similar phrase do not appear in your license (except to note that your
license differs from this License) and (b) otherwise make it clear
that Your version of the license contains terms which differ from the
Sun Public License. (Filling in the name of the Initial Developer,
Original Code or Contributor in the notice described in Exhibit A
shall not of themselves be deemed to be modifications of this
License.)
7. DISCLAIMER OF WARRANTY.
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS,
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
8. TERMINATION.
8.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.
8.2. If You initiate litigation by asserting a patent infringement
claim (excluding declaratory judgment actions) against Initial Developer
or a Contributor (the Initial Developer or Contributor against whom
You file such action is referred to as "Participant") alleging that:
(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i)
agree in writing to pay Participant a mutually agreeable reasonable
royalty for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant. If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.
(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.
8.3. If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.
8.4. In the event of termination under Sections 8.1 or 8.2 above, all
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.
9. LIMITATION OF LIABILITY.
UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
10. U.S. GOVERNMENT END USERS.
The Covered Code is a "commercial item," as that term is defined in 48
C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software"
and "commercial computer software documentation," as such terms are
used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R.
12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
U.S. Government End Users acquire Covered Code with only those rights
set forth herein.
11. MISCELLANEOUS.
This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law provisions.
With respect to disputes in which at least one party is a citizen of,
or an entity chartered or registered to do business in the United
States of America, any litigation relating to this License shall be
subject to the jurisdiction of the Federal Courts of the Northern
District of California, with venue lying in Santa Clara County,
California, with the losing party responsible for costs, including
without limitation, court costs and reasonable attorneys' fees and
expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly excluded.
Any law or regulation which provides that the language of a contract
shall be construed against the drafter shall not apply to this
License.
12. RESPONSIBILITY FOR CLAIMS.
As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.
13. MULTIPLE-LICENSED CODE.
Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed". "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the alternative licenses, if any, specified by the
Initial Developer in the file described in Exhibit A.
Exhibit A -Sun Public License Notice.
The contents of this file are subject to the Sun Public License
Version 1.0 (the "License"); you may not use this file except in
compliance with the License. A copy of the License is available at
http://www.sun.com/
The Original Code is _________________. The Initial Developer of the
Original Code is ___________. Portions created by ______ are Copyright
(C)_________. All Rights Reserved.
Contributor(s): ______________________________________.
Alternatively, the contents of this file may be used under the terms
of the _____ license (the "[___] License"), in which case the
provisions of [______] License are applicable instead of those above.
If you wish to allow use of your version of this file only under the
terms of the [____] License and not to allow others to use your
version of this file under the SPL, indicate your decision by deleting
the provisions above and replace them with the notice and other
provisions required by the [___] License. If you do not delete the
provisions above, a recipient may use your version of this file under
either the SPL or the [___] License."
[NOTE: The text of this Exhibit A may differ slightly from the text of
the notices in the Source Code files of the Original Code. You should
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
=========================================================================
The Jython library is licensed under the BeOpen/CNRI as follows.
framework/base/lib/scripting/jython-nooro.jar
@@ -23,7 +23,7 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
<!-- generate a PDF for the invoice. sharing the same BSH file as the HTML page for viewing invoice -->
<!-- generate a PDF for the invoice. Sharing the same script file as the HTML page for viewing invoice -->
<screen name="InvoicePDF">
<section>
<actions>
@@ -31,8 +31,9 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import org.ofbiz.base.util.BshUtil;
import org.codehaus.groovy.control.CompilationFailedException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GroovyUtil;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilCodec;
@@ -63,7 +64,6 @@ import org.ofbiz.service.ServiceUtil;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import bsh.EvalError;
import freemarker.ext.dom.NodeModel;
/**
@@ -493,8 +493,8 @@ public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInte
context.put("topics", topics);
context.put("keywords", keywords);
context.put("typeAncestry", contentTypeAncestry);
boolean isPick = checkWhen(context, (String) whenMap.get("pickWhen"));
boolean isReturnBefore = checkReturnWhen(context, (String) whenMap.get("returnBeforePickWhen"));
boolean isPick = checkWhen(context, (String) whenMap.get("pickWhen"), true);
boolean isReturnBefore = checkWhen(context, (String) whenMap.get("returnBeforePickWhen"), false);
Map<String, Object> thisNode = null;
if (isPick || !isReturnBefore) {
thisNode = new HashMap<String, Object>();
@@ -512,7 +512,7 @@ public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInte
pickList.add(content);
thisNode.put("value", content);
}
boolean isReturnAfter = checkReturnWhen(context, (String) whenMap.get("returnAfterPickWhen"));
boolean isReturnAfter = checkWhen(context, (String) whenMap.get("returnAfterPickWhen"), false);
if (!isReturnAfter) {
List<String> assocTypes = new LinkedList<String>();
List<GenericValue> relatedAssocs = getContentAssocsWithId(delegator, contentId, fromDate, thruDate, direction, assocTypes);
@@ -536,7 +536,7 @@ public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInte
relatedDirection = "To";
}
boolean isFollow = checkWhen(assocContext, (String) whenMap.get("followWhen"));
boolean isFollow = checkWhen(assocContext, (String) whenMap.get("followWhen"), true);
if (isFollow) {
GenericValue thisContent = assocValue.getRelatedOne(assocRelation, false);
traverse(delegator, thisContent, fromDate, thruDate, whenMap, depthIdx + 1, thisNode, contentAssocTypeId, pickList, relatedDirection);
@@ -735,34 +735,29 @@ public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInte
}
}
public static boolean checkWhen(Map<String, Object> context, String whenStr) {
boolean isWhen = true; //opposite default from checkReturnWhen
if (UtilValidate.isNotEmpty(whenStr)) {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(whenStr);
String newWhen = fse.expandString(context);
//if (Debug.infoOn()) Debug.logInfo("newWhen:" + newWhen,null);
//if (Debug.infoOn()) Debug.logInfo("context:" + context,null);
try {
Boolean isWhenObj = (Boolean) BshUtil.eval(newWhen, context);
isWhen = isWhenObj.booleanValue();
} catch (EvalError e) {
Debug.logError("Error in evaluating :" + whenStr + " : " + e.getMessage(), null);
throw new RuntimeException(e.getMessage());
}
}
//if (Debug.infoOn()) Debug.logInfo("isWhen:" + isWhen,null);
return isWhen;
}
public static boolean checkReturnWhen(Map<String, Object> context, String whenStr) {
boolean isWhen = false; //opposite default from checkWhen
/** Returns a boolean, result of whenStr evaluation with context.
* If whenStr is empty return defaultReturn.
* @param context A <code>Map</code> containing initial variables
* @param whenStr A <code>String</code> condition expression
* @param defaultReturn A <code>boolean</code> default return value
* @return A <code>boolan</code> result of evaluation
*/
public static boolean checkWhen(Map<String, Object> context, String whenStr, boolean defaultReturn) {
boolean isWhen = defaultReturn;
if (UtilValidate.isNotEmpty(whenStr)) {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(whenStr);
String newWhen = fse.expandString(context);
try {
Boolean isWhenObj = (Boolean) BshUtil.eval(newWhen, context);
isWhen = isWhenObj.booleanValue();
} catch (EvalError e) {
Object retVal = GroovyUtil.eval(newWhen,context);
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
Boolean boolVal = (Boolean) retVal;
isWhen = boolVal.booleanValue();
} else {
throw new IllegalArgumentException("Return value from use-when condition eval was not a Boolean: "
+ (retVal != null ? retVal.getClass().getName() : "null") + " [" + retVal + "]");
}
} catch (CompilationFailedException e) {
Debug.logError("Error in evaluating :" + whenStr + " : " + e.getMessage(), null);
throw new RuntimeException(e.getMessage());
}
@@ -1280,13 +1275,13 @@ public class ContentWorker implements org.ofbiz.widget.content.ContentWorkerInte
} catch (GenericEntityException e) {
}
context.put("typeAncestry", contentTypeAncestry);
boolean isReturnBefore = checkReturnWhen(context, (String)whenMap.get("returnBeforePickWhen"));
boolean isReturnBefore = checkWhen(context, (String)whenMap.get("returnBeforePickWhen"), false);
trailNode.put("isReturnBefore", Boolean.valueOf(isReturnBefore));
boolean isPick = checkWhen(context, (String)whenMap.get("pickWhen"));
boolean isPick = checkWhen(context, (String)whenMap.get("pickWhen"), true);
trailNode.put("isPick", Boolean.valueOf(isPick));
boolean isFollow = checkWhen(context, (String)whenMap.get("followWhen"));
boolean isFollow = checkWhen(context, (String)whenMap.get("followWhen"), true);
trailNode.put("isFollow", Boolean.valueOf(isFollow));
boolean isReturnAfter = checkReturnWhen(context, (String)whenMap.get("returnAfterPickWhen"));
boolean isReturnAfter = checkWhen(context, (String)whenMap.get("returnAfterPickWhen"), false);
trailNode.put("isReturnAfter", Boolean.valueOf(isReturnAfter));
trailNode.put("checked", Boolean.TRUE);
}
@@ -321,7 +321,7 @@ public class TraverseSubContentTransform implements TemplateTransformModel {
List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail"));
int indentSz = indent.intValue() + nodeTrail.size();
assocContext.put("indentObj", Integer.valueOf(indentSz));
isPick = ContentWorker.checkWhen(assocContext, (String)whenMap.get("pickWhen"));
isPick = ContentWorker.checkWhen(assocContext, (String)whenMap.get("pickWhen"), true);
return isPick;
}
@@ -23,7 +23,7 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
<!-- generate a PDF for the order, sharing the same BSH file as the HTML page for viewing the order -->
<!-- generate a PDF for the order, sharing the same groovy file as the HTML page for viewing the order -->
<screen name="OrderPDF">
<section>
<actions>
@@ -55,7 +55,7 @@ under the License.
<process field="PASSWORD"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process>
<process field="CONFIRM_PASSWORD">
<compare-field operator="equals" field="PASSWORD"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>
<!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<!-- This is checked below in the checkNewPassword method in the block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<copy to-field="currentPasswordVerify"/>
</process>
<process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process>
@@ -86,7 +86,7 @@ under the License.
<process field="PASSWORD"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process>
<process field="CONFIRM_PASSWORD">
<compare-field operator="equals" field="PASSWORD"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>
<!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<!-- This is checked below in the checkNewPassword method in the block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<copy to-field="currentPasswordVerify"/>
</process>
<process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process>
-2
View File
@@ -66,8 +66,6 @@ minilang.SimpleMethodsDirect.expireTime=10000
minilang.SimpleMethodsResource.expireTime=10000
minilang.SimpleMethodsURL.expireTime=10000
script.BshLocationParsedCache.expireTime=10000
script.BshBsfParsedCache.expireTime=10000
script.ParsedScripts.expireTime=10000
script.GroovyLocationParsedCache.expireTime=10000
Binary file not shown.
Binary file not shown.
@@ -1,175 +0,0 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
package org.ofbiz.base.util;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.ofbiz.base.location.FlexibleLocation;
import org.ofbiz.base.util.cache.UtilCache;
import bsh.BshClassManager;
import bsh.EvalError;
import bsh.Interpreter;
import bsh.NameSpace;
import bsh.ParseException;
/**
* BshUtil - BeanShell Utilities
*
*/
public final class BshUtil {
public static final String module = BshUtil.class.getName();
private static ConcurrentHashMap<ClassLoader, BshClassManager> masterClassManagers = new ConcurrentHashMap<ClassLoader, BshClassManager>();
private static final UtilCache<String, Interpreter.ParsedScript> parsedScripts = UtilCache.createUtilCache("script.BshLocationParsedCache", 0, 0, false);
private BshUtil() {}
/**
* Evaluate a BSH condition or expression
* @param expression The expression to evaluate
* @param context The context to use in evaluation (re-written)
* @return Object The result of the evaluation
* @throws EvalError
*/
public static final Object eval(String expression, Map<String, Object> context) throws EvalError {
Object o = null;
if (expression == null || expression.equals("")) {
Debug.logError("BSH Evaluation error. Empty expression", module);
return null;
}
if (Debug.verboseOn())
Debug.logVerbose("Evaluating -- " + expression, module);
if (Debug.verboseOn())
Debug.logVerbose("Using Context -- " + context, module);
try {
Interpreter bsh = makeInterpreter(context);
// evaluate the expression
o = bsh.eval(expression);
if (Debug.verboseOn())
Debug.logVerbose("Evaluated to -- " + o, module);
// read back the context info
NameSpace ns = bsh.getNameSpace();
String[] varNames = ns.getVariableNames();
for (String varName: varNames) {
context.put(varName, bsh.get(varName));
}
} catch (EvalError e) {
Debug.logError(e, "BSH Evaluation error.", module);
throw e;
}
return o;
}
public static Interpreter makeInterpreter(Map<String, ? extends Object> context) throws EvalError {
Interpreter bsh = getMasterInterpreter(null);
// Set the context for the condition
if (context != null) {
for (Map.Entry<String, ? extends Object> entry: context.entrySet()) {
bsh.set(entry.getKey(), entry.getValue());
}
// include the context itself in for easier access in the scripts
bsh.set("context", context);
}
return bsh;
}
public static Interpreter getMasterInterpreter(ClassLoader classLoader) {
if (classLoader == null) {
classLoader = Thread.currentThread().getContextClassLoader();
}
//find the "master" BshClassManager for this classpath
BshClassManager master = BshUtil.masterClassManagers.get(classLoader);
if (master == null) {
master = BshClassManager.createClassManager();
master.setClassLoader(classLoader);
BshUtil.masterClassManagers.putIfAbsent(classLoader, master);
master = BshUtil.masterClassManagers.get(classLoader);
}
if (master != null) {
Interpreter interpreter = new Interpreter(new StringReader(""), System.out, System.err,
false, new NameSpace(master, "global"), null, null);
return interpreter;
} else {
Interpreter interpreter = new Interpreter();
interpreter.setClassLoader(classLoader);
return interpreter;
}
}
public static Object runBshAtLocation(String location, Map<String, ? extends Object> context) throws GeneralException {
try {
Interpreter interpreter = makeInterpreter(context);
Interpreter.ParsedScript script = null;
script = parsedScripts.get(location);
if (script == null) {
URL scriptUrl = FlexibleLocation.resolveLocation(location);
if (scriptUrl == null) {
throw new GeneralException("Could not find bsh script at [" + location + "]");
}
Reader scriptReader = new InputStreamReader(scriptUrl.openStream());
script = interpreter.parseScript(location, scriptReader);
if (Debug.verboseOn()) Debug.logVerbose("Caching BSH script at: " + location, module);
script = parsedScripts.putIfAbsentAndGet(location, script);
}
return interpreter.evalParsedScript(script);
} catch (MalformedURLException e) {
String errMsg = "Error loading BSH script at [" + location + "]: " + e.toString();
Debug.logError(e, errMsg, module);
throw new GeneralException(errMsg, e);
} catch (ParseException e) {
String errMsg = "Error parsing BSH script at [" + location + "]: " + e.toString();
Debug.logError(e, errMsg, module);
throw new GeneralException(errMsg, e);
} catch (IOException e) {
String errMsg = "Error loading BSH script at [" + location + "]: " + e.toString();
Debug.logError(e, errMsg, module);
throw new GeneralException(errMsg, e);
} catch (EvalError ee) {
Throwable t = ee.getCause();
if (t == null) {
Debug.logWarning(ee, "No cause (from getCause) found for BSH EvalError: " + ee.toString(), module);
t = ee;
} else {
Debug.logError(t, "Got cause (from getCause) for BSH EvalError: " + ee.toString(), module);
}
String errMsg = "Error running BSH script at [" + location + "], line [" + ee.getErrorLineNumber() + "]: " + t.toString();
// don't log the full exception, just the main message; more detail logged later
throw new GeneralException(errMsg, t);
}
}
}
@@ -89,7 +89,7 @@ public class GroovyUtil {
Debug.logVerbose("Using Context -- " + context, module);
}
try {
GroovyShell shell = new GroovyShell(getBinding(context));
GroovyShell shell = new GroovyShell(getBinding(context, expression));
o = shell.evaluate(StringUtil.convertOperatorSubstitutions(expression));
if (Debug.verboseOn()) {
Debug.logVerbose("Evaluated to -- " + o, module);
@@ -107,6 +107,8 @@ public class GroovyUtil {
/** Returns a <code>Binding</code> instance initialized with the
* variables contained in <code>context</code>. If <code>context</code>
* is <code>null</code>, an empty <code>Binding</code> is returned.
* <p>The expression is parsed to initiate non existing variable
* in <code>Binding</code> to null for GroovyShell evaluation.
* <p>The <code>context Map</code> is added to the <code>Binding</code>
* as a variable called "context" so that variables can be passed
* back to the caller. Any variables that are created in the script
@@ -116,10 +118,16 @@ public class GroovyUtil {
* @param context A <code>Map</code> containing initial variables
* @return A <code>Binding</code> instance
*/
public static Binding getBinding(Map<String, Object> context) {
public static Binding getBinding(Map<String, Object> context, String expression) {
Map<String, Object> vars = new HashMap<String, Object>();
if (context != null) {
vars.putAll(context);
if (UtilValidate.isNotEmpty(expression)) {
//analyse expression to find variables by split non alpha, ignoring "_" to allow my_variable usage
String [] variables = expression.split("[\\P{Alpha}&&[^_]]+");
for (String variable: variables)
if(!vars.containsKey(variable)) vars.put(variable, null);
}
vars.put("context", context);
if (vars.get(ScriptUtil.SCRIPT_HELPER_KEY) == null) {
ScriptContext scriptContext = ScriptUtil.createScriptContext(context);
@@ -132,6 +140,10 @@ public class GroovyUtil {
return new Binding(vars);
}
public static Binding getBinding(Map<String, Object> context) {
return getBinding(context, null);
}
public static Class<?> getScriptClassFromLocation(String location) throws GeneralException {
try {
Class<?> scriptClass = parsedScripts.get(location);
@@ -31,8 +31,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import org.ofbiz.base.util.BshUtil;
import org.codehaus.groovy.control.CompilationFailedException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GroovyUtil;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilCodec;
import org.ofbiz.base.util.UtilGenerics;
@@ -53,9 +54,6 @@ import org.ofbiz.widget.WidgetWorker;
import org.ofbiz.widget.renderer.FormStringRenderer;
import org.w3c.dom.Element;
import bsh.EvalError;
import bsh.Interpreter;
/**
* Abstract base class for the &lt;form&gt; and &lt;grid&gt; elements.
*
@@ -892,15 +890,6 @@ public abstract class ModelForm extends ModelWidget {
return autoFieldsServices;
}
public Interpreter getBshInterpreter(Map<String, Object> context) throws EvalError {
Interpreter bsh = (Interpreter) context.get("bshInterpreter");
if (bsh == null) {
bsh = BshUtil.makeInterpreter(context);
context.put("bshInterpreter", bsh);
}
return bsh;
}
@Override
public String getBoundaryCommentName() {
return formLocation + "#" + getName();
@@ -1319,10 +1308,8 @@ public abstract class ModelForm extends ModelWidget {
public String getStyleAltRowStyle(Map<String, Object> context) {
String styles = "";
try {
// use the same Interpreter (ie with the same context setup) for all evals
Interpreter bsh = this.getBshInterpreter(context);
for (AltRowStyle altRowStyle : this.altRowStyles) {
Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(altRowStyle.useWhen));
Object retVal = GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(altRowStyle.useWhen),context);
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
Boolean boolVal = (Boolean) retVal;
@@ -1334,8 +1321,8 @@ public abstract class ModelForm extends ModelWidget {
+ retVal.getClass().getName() + " [" + retVal + "] of form " + getName());
}
}
} catch (EvalError e) {
String errmsg = "Error evaluating BeanShell style conditions on form " + getName();
} catch (CompilationFailedException e) {
String errmsg = "Error evaluating groovy style conditions on form " + getName();
Debug.logError(e, errmsg, module);
throw new IllegalArgumentException(errmsg);
}
@@ -1356,11 +1343,9 @@ public abstract class ModelForm extends ModelWidget {
expanderContext = UtilCodec.HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(context, simpleEncoder);
}
try {
// use the same Interpreter (ie with the same context setup) for all evals
Interpreter bsh = this.getBshInterpreter(context);
for (AltTarget altTarget : this.altTargets) {
String useWhen = FlexibleStringExpander.expandString(altTarget.useWhen, context);
Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(useWhen));
Object retVal = GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(useWhen),context);
boolean condTrue = false;
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
@@ -1375,8 +1360,8 @@ public abstract class ModelForm extends ModelWidget {
return altTarget.targetExdr.expandString(expanderContext);
}
}
} catch (EvalError e) {
String errmsg = "Error evaluating BeanShell target conditions on form " + getName();
} catch (CompilationFailedException e) {
String errmsg = "Error evaluating Groovy target conditions on form " + getName();
Debug.logError(e, errmsg, module);
throw new IllegalArgumentException(errmsg);
}
@@ -36,12 +36,13 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.TimeZone;
import org.codehaus.groovy.control.CompilationFailedException;
import org.ofbiz.base.conversion.ConversionException;
import org.ofbiz.base.conversion.DateTimeConverters;
import org.ofbiz.base.conversion.DateTimeConverters.StringToTimestamp;
import org.ofbiz.base.util.BshUtil;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
import org.ofbiz.base.util.GroovyUtil;
import org.ofbiz.base.util.ObjectType;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilCodec;
@@ -77,9 +78,6 @@ import org.ofbiz.widget.renderer.MenuStringRenderer;
import org.ofbiz.widget.renderer.ScreenRenderer;
import org.w3c.dom.Element;
import bsh.EvalError;
import bsh.Interpreter;
/**
* Models the &lt;field&gt; element.
*
@@ -845,8 +843,7 @@ public class ModelFormField {
return true;
try {
Interpreter bsh = this.modelForm.getBshInterpreter(context);
Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(useWhenStr));
Object retVal = GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(useWhenStr),context);
boolean condTrue = false;
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
@@ -859,11 +856,10 @@ public class ModelFormField {
}
return condTrue;
} catch (EvalError e) {
String errMsg = "Error evaluating BeanShell use-when condition [" + useWhenStr + "] on the field " + this.name
} catch (CompilationFailedException e) {
String errMsg = "Error evaluating groovy use-when condition [" + useWhenStr + "] on the field " + this.name
+ " of form " + this.modelForm.getName() + ": " + e.toString();
Debug.logError(e, errMsg, module);
//Debug.logError("For use-when eval error context is: " + context, module);
throw new IllegalArgumentException(errMsg);
}
}
@@ -3698,13 +3694,8 @@ public class ModelFormField {
String useWhen = this.getUseWhen(context);
if (UtilValidate.isNotEmpty(useWhen)) {
try {
Interpreter bsh = (Interpreter) context.get("bshInterpreter");
if (bsh == null) {
bsh = BshUtil.makeInterpreter(context);
context.put("bshInterpreter", bsh);
}
Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(useWhen));
Object retVal = GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(useWhen),context);
boolean condTrue = false;
// retVal should be a Boolean, if not something weird is up...
if (retVal instanceof Boolean) {
@@ -3714,8 +3705,8 @@ public class ModelFormField {
throw new IllegalArgumentException("Return value from target condition eval was not a Boolean: "
+ retVal.getClass().getName() + " [" + retVal + "]");
}
} catch (EvalError e) {
String errmsg = "Error evaluating BeanShell target conditions";
} catch (CompilationFailedException e) {
String errmsg = "Error evaluating Groovy target conditions";
Debug.logError(e, errmsg, module);
throw new IllegalArgumentException(errmsg);
}
@@ -3730,13 +3721,8 @@ public class ModelFormField {
if (UtilValidate.isEmpty(ignoreWhen)) return false;
try {
Interpreter bsh = (Interpreter) context.get("bshInterpreter");
if (bsh == null) {
bsh = BshUtil.makeInterpreter(context);
context.put("bshInterpreter", bsh);
}
Object retVal = bsh.eval(StringUtil.convertOperatorSubstitutions(ignoreWhen));
Object retVal = GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(ignoreWhen),context);
boolean condTrue = false;
if (retVal instanceof Boolean) {
shouldIgnore =(Boolean) retVal;
@@ -3744,7 +3730,7 @@ public class ModelFormField {
throw new IllegalArgumentException("Return value from ignore-when condition eval was not a Boolean: " + (retVal != null ? retVal.getClass().getName() : "null") + " [" + retVal + "] on the field " + this.name + " of form " + this.modelForm.getName());
}
} catch (EvalError e) {
} catch (CompilationFailedException e) {
String errMsg = "Error evaluating BeanShell ignore-when condition [" + ignoreWhen + "] on the field " + this.name + " of form " + this.modelForm.getName() + ": " + e.toString();
Debug.logError(e, errMsg, module);
throw new IllegalArgumentException(errMsg);
@@ -490,8 +490,8 @@ public class ModelMenu extends ModelWidget {
* @param writer The Writer that the menu text will be written to
* @param context Map containing the menu context; the following are
* reserved words in this context: parameters (Map), isError (Boolean),
* itemIndex (Integer, for lists only, otherwise null), bshInterpreter,
* menuName (String, optional alternate name for menu, defaults to the
* itemIndex (Integer, for lists only, otherwise null), menuName
* (String, optional alternate name for menu, defaults to the
* value of the name attribute)
* @param menuStringRenderer An implementation of the MenuStringRenderer
* interface that is responsible for the actual text generation for
@@ -223,8 +223,8 @@ public class FormRenderer {
* @param writer The Writer that the form text will be written to
* @param context Map containing the form context; the following are
* reserved words in this context: parameters (Map), isError (Boolean),
* itemIndex (Integer, for lists only, otherwise null), bshInterpreter,
* formName (String, optional alternate name for form, defaults to the
* itemIndex (Integer, for lists only, otherwise null), formName
* (String, optional alternate name for form, defaults to the
* value of the name attribute)
*/
public void render(Appendable writer, Map<String, Object> context)
@@ -731,9 +731,6 @@ public class FormRenderer {
continue;
}
// reset/remove the BshInterpreter now as well as later because chances are there is an interpreter at this level of the stack too
this.resetBshInterpreter(context);
Map<String, Object> itemMap = UtilGenerics.checkMap(item);
MapStack<String> localContext = MapStack.create(context);
if (UtilValidate.isNotEmpty(modelForm.getListEntryName())) {
@@ -749,8 +746,6 @@ public class FormRenderer {
}
}
// reset/remove the BshInterpreter now as well as later because chances are there is an interpreter at this level of the stack too
this.resetBshInterpreter(localContext);
localContext.push();
localContext.put("previousItem", previousItem);
previousItem = new HashMap<String, Object>();
@@ -763,8 +758,6 @@ public class FormRenderer {
localContext.put("formUniqueId", "_" + context.get("renderFormSeqNumber"));
}
this.resetBshInterpreter(localContext);
if (Debug.verboseOn())
Debug.logVerbose("In form got another row, context is: " + localContext, module);
@@ -1228,10 +1221,6 @@ public class FormRenderer {
}
private void resetBshInterpreter(Map<String, Object> context) {
context.remove("bshInterpreter");
}
private static <X> X safeNext(Iterator<X> iterator) {
try {
return iterator.next();
@@ -64,7 +64,7 @@ under the License.
<process field="password"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process>
<process field="confirmPassword">
<compare-field operator="equals" field="password"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>
<!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<!-- This is checked below in the checkNewPassword method in the block: <not-empty><fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/></not-empty> -->
<copy to-field="currentPasswordVerify"/>
</process>
<process field="passwordHint"><copy to-field="passwordHint"/></process>
@@ -86,7 +86,7 @@ under the License.
<if-has-permission permission="EXAMPLE" action="_VIEW"/>
</condition>
<actions>
<!-- these are only needed so that when bsh evaluates use-when attributes these will exist and not cause an error -->
<!-- these are only needed so that when groovy evaluates use-when attributes these will exist and not cause an error -->
<property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="exampleId" from-field="parameters.exampleId"/>
@@ -63,8 +63,8 @@ under the License.
</service>
<set field="sortField" from-field="parameters.sortField"/>
</actions>
<alt-row-style use-when="&quot;EXST_APPROVED&quot;.equals(statusId)" style="Validate"/>
<alt-row-style use-when="&quot;EXST_CANCELLED&quot;.equals(statusId)" style="Warn"/>
<alt-row-style use-when="'EXST_APPROVED'.equals(statusId)" style="Validate"/>
<alt-row-style use-when="'EXST_CANCELLED'.equals(statusId)" style="Warn"/>
<field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${exampleId}" target="EditExample">
<parameter param-name="exampleId"/>