Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum a636524386 Improved Mini-language <script> element - now supports inline scripts in the element body.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1333030 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 13:13:10 +00:00
Adrian Crum 5c4009e4c8 Added some convenience methods to MethodOperation.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1333028 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 13:11:00 +00:00
Jacques Le Roux 232dd652be https://issues.apache.org/jira/browse/OFBIZ-4602 "Null values are not synchronized in http mode"
This is not a complete solution and induces more problem than it solves (notably in RuntimeData for jobs), to be continued...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 21:02:53 +00:00
Jacques Le Roux 289837001e Fixes "View Calendar Broken in Party Manager > Relationships" https://issues.apache.org/jira/browse/OFBIZ-4739
This was due to MacroScreenRenderer.renderScreenletSubWidget() calling HtmlFormRenderer instead of MacroFormRenderer. So there was still a call to the old, now inexistent, call_cal js function.

So this not only fixes this case but also all other similar cases, when a navigation-form-name screenlet attribute was used and a date field used in the related form.

I have also checked there are no other uses of HtmlFormRenderer in MacroScreenRenderer. So I think w are safe from other side effects...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331898 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 12:07:08 +00:00
Adrian Crum 6ed484ff82 Removed some unused Mini-language classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 11:23:55 +00:00
Adrian Crum 66269e1396 Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331876 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 08:18:55 +00:00
Adrian Crum 4452b80aa0 Refactored how Mini-language element model lists are constructed and stored - to improve thread-safety and memory use.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331875 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 08:11:53 +00:00
Adrian Crum 9b8b914657 Overhauled Mini-language <log> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331874 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 08:07:10 +00:00
Adrian Crum 1616a228d6 Overhauled Mini-language <add-error> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331827 13f79535-47bb-0310-9956-ffa450edef68
2012-04-28 20:35:48 +00:00
Adrian Crum f35311f358 Reverting changes to the Mini-language <add-error> element. Too much code depends on the "error_list" name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331811 13f79535-47bb-0310-9956-ffa450edef68
2012-04-28 19:25:48 +00:00
Adrian Crum ade0bf0ccc Overhauled Mini-language <check-errors> and <add-error> elements.
This commit fixes a bug in the <add-error> element. Some of the tests written in Mini-language fail now because errors were previously ignored, but now the error handling works properly.

To assist the developer community with fixing the tests, I added an INFO log message to track down the faulty test code. Run the tests, and then search the log file for "<add-error>".


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331802 13f79535-47bb-0310-9956-ffa450edef68
2012-04-28 18:48:42 +00:00
Scott Gray 37dcad0e67 Removing Jython tests as an option since it was never actually implemented, if we add script support now it'll likely be using Adrian's recent work and won't require a specific implementation for each script engine
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331751 13f79535-47bb-0310-9956-ffa450edef68
2012-04-28 11:30:14 +00:00
Adrian Crum ea8b01bcb0 Add security note to Mini-language <script> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331418 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 13:10:57 +00:00
Adrian Crum 0a8e59574d Added auto-correct to the Mini-language <script> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331394 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 12:46:46 +00:00
Adrian Crum 37bb36e08f Overhauled Mini-language <script> element. Added a "script" attribute so it can be used for small inline scripts (scriptlets).
Removed code that hid script engine exceptions in the error list. If a script engine throws an exception, it should be passed to the calling process, not hidden in an error message list (which might not get checked).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 11:18:52 +00:00
Adrian Crum b396e98bbe Bug fix in overhauled Mini-language <set> element: support operator substitutions in scriptlets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331353 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 11:12:43 +00:00
Adrian Crum 9a64e92cc3 Renamed new <call-simple-method> attribute from memory-model to scope.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331259 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 07:15:14 +00:00
Adrian Crum 4b24b8da30 Fixed a bug in my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331247 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 06:55:10 +00:00
Hans Bakker ab0d140abd fixed error at
https://localhost:8443/webtools/control/FindGeneric?entityName=OrderHeaderAndRoleSummary  and press find, thanks Nop

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331216 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 04:33:21 +00:00
Adrian Crum 28f72c38d3 Added new attribute "memory-model" to the Mini-language <call-simple-method> element. Code cleanup and validation in FieldToResult.java. Improved validation in Now.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331137 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 22:40:22 +00:00
Erwan de Ferrieres 4aa6dfe81e OFBIZ-4845 Apache Commons Compress is missing for Tika
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1331060 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 20:12:46 +00:00
Jacques Le Roux 6900761114 Some improvements in StringUtil class
* Add the possibility to use your own separator, not only "=" which stays the default
* I changed the default separator from "|" in some intermediary methods to null which was the default before my changes in r1212749.
* A new split method based on Pattern.compile(delim).split(str, limit). This allows to create a list of string, splitting only on the nth limit occurrences. This because StringTokenizer is deprecated, though I kept it as main split method
* some formatting also (my own way, more legible I think)

All this can notably be helpful when you deal with non encoded URLs...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330995 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 17:56:01 +00:00
Adrian Crum 897fa0e2bd Small fixup for my previous commit - remove class cast.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330919 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 16:11:44 +00:00
Adrian Crum 750a172e3e Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330908 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 15:36:55 +00:00
Adrian Crum aba59f096d Added a new Mini-language element - <now> - that replaces the <now-timestamp> and <now-date-to-env> elements. It is a drop-in replacement for <now-timestamp>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330902 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 15:25:03 +00:00
Sascha Rodekamp 7ddd950b4f Remove wrong fields in the hierarchy node which could not processed in a file context.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330871 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 14:32:34 +00:00
Sascha Rodekamp 696532ba0a Clean Up the repository loding code. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330779 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 11:18:51 +00:00
Sascha Rodekamp 374d9aa1d4 Change the RMI and JNDI port in the Test-containers.xml to 1099. Because the jndi servers in jndiservers.xml/jndi.properties are also configured to port 1099. If another port is set in the *-containers.xml the JNDI server could not be reached.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330778 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 11:15:48 +00:00
Sascha Rodekamp eb3d943fe5 Trying to cache Visit, but Visit has neverCache-option set (https://issues.apache.org/jira/browse/OFBIZ-4846) A patch from Sebastian Leitner: The Visit-entity has the neverCache-option set, but ServerHitBin is trying to cache it anyway. This should be avoided. I will attach a patch for this (rather trivial change).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330768 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 10:56:21 +00:00
Adrian Crum 06f22df23d Added a Mini-language XML style sheet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330764 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 10:38:25 +00:00
Adrian Crum 6a2d61bb07 First pass at overhauled Mini-language <set> element.
1. The schema has been updated to reflect the new syntax.

2. The updated element will log warnings for incorrect syntax. Validation logging can be turned off by changing the minilang.properties validation.level property to none.

3. The element will auto-correct the XML source file if the minilang.properties autocorrect property is set to true.

4. Code has been cleaned up and simplified.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330422 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:09:15 +00:00
Adrian Crum 5b1f84472e Added Mini-language auto-correcting capability.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330418 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:02:26 +00:00
Adrian Crum c99e22ef50 Modified MiniLangUtil.isConstantPlusExpressionAttribute to allow concatenated expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330396 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 16:27:13 +00:00
Adrian Crum ad32a9ebf9 Added a Scriptlet class to the base component - this will be used to simplify scriptlet implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330394 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 16:25:45 +00:00
Adrian Crum 6fdee164ac FlexibleMapAccessor improvement - fixed inconsistent toString() results.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330390 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 16:23:29 +00:00
Adrian Crum 189496613e Improved ObjectType.isEmpty method - removed unnecessary calls to UtilValidate.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1330386 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 16:22:16 +00:00
Adrian Crum 5230635e21 ScriptUtil.java bug fix - removed trailing colon from script names.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329727 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:53:44 +00:00
Sascha Rodekamp dca5aa4a6f Move the repository mapping files in a sub package. To differ between file and data mappings.
Each node contains now a field which identifies the party who created the content and the party which modified it last.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329721 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:51:43 +00:00
Sascha Rodekamp c172c5fe39 Move the repository mapping files in a sub package. To differ between file and data mappings.
Each node contains now a field which identifies the party who created the content and the party which modified it last.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329718 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:50:33 +00:00
Adrian Crum 281b4c0954 Mini-language schema <set> element improvements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329585 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 07:58:57 +00:00
Jacques Le Roux 922de27729 "Housekeeping of jar files" https://issues.apache.org/jira/browse/OFBIZ-4833
Trying to upgrade javamail (mail.jar) from 1.4 (our version) to 1.4.5 from Oracle I discovered that it's now distributed under BCL license (Binary Code License) which is not an open source license hence can't be committed.
So we are stuck with the 1.4 version wich is ok I guess and users should upgrade by themself...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329565 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 06:41:52 +00:00
Adrian Crum 322d294a15 MiniLangValidate.java bug fix - validation was failing for constant attributes that contained only spaces.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 12:57:06 +00:00
Adrian Crum e72cd93484 Improved support for optional target type in ObjectType.simpleTypeConvert.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329219 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 12:54:27 +00:00
Adrian Crum 0d60d510f5 Added <continue> and <break> elements to Mini-language looping elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329034 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 02:31:53 +00:00
Adrian Crum addea69c51 Build out Mini-language exception handling.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1329032 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 02:29:28 +00:00
Jacques Le Roux 8e549fdc59 "Housekeeping of jar files" https://issues.apache.org/jira/browse/OFBIZ-4833
* Updates httpunit.jar to httpunit-1.7.jar
* Updates wsdl4j-1.5.1.jar to wsdl4j-1.6.2.jar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328918 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 18:01:20 +00:00
Adrian Crum da1b810c3b Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328829 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 09:24:36 +00:00
Adrian Crum d66f311eb7 Updated all Mini-language xml files to use the new schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328827 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 09:18:24 +00:00
Adrian Crum 1a2a55e4be Removed Mini-language elements that were deprecated in a previous release and are no longer used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328809 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 07:43:44 +00:00
Jacques Le Roux 79d402fd7c Forgot this part in r1328738
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328743 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 22:25:06 +00:00