Commit Graph
485 Commits
Author SHA1 Message Date
Adrian Crum a3b3ad07ad Trivial JavaDoc fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735182 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 23:20:30 +00:00
David E. Jones c4602119e7 Changed screen, form, menu and tree widget actions and conditions to be consistent with simple-method cleanups, includes XSD and java changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733436 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 09:19:34 +00:00
Adrian Crum ddf29482dc Updated JUEL library to 2.1.1 RC1 - the version that contains the changes we need.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732622 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 06:32:11 +00:00
Adrian Crum fcffc8771a Fixed a problem where the BSH interpreter was throwing exceptions on a variable that had periods in its name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732173 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 23:38:47 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Jacques Le Roux 35897cab0c Upgrade Freemarker jar from 2.3.10 to 2.3.15 (downloaded from http://downloads.sourceforge.net/freemarker/freemarker-2.3.15.tar.gz).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731487 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 08:09:29 +00:00
Adrian Crum 01fdf5c723 Fixed problem with OFBiz script syntax versus UEL syntax. UEL identifiers cannot start with a digit, so identifiers created from IDs would generate syntax errors. This commit fixes that by converting ID identifiers internally by prefixing them with an underscore.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729819 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 00:43:05 +00:00
Adrian Crum 3d8de29f8a Final work on Unified Expression Language integration. L-values can contain nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729759 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 18:15:20 +00:00
Adrian Crum db2a92cadc Improved UEL implementation. FlexibleMapAccessor.java uses the UEL library instead of the home-grown parser.
This commit includes the JUEL library taken from CVS - not the 2.1.0 zip file download. It includes the author's modifications to support auto-vivify.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729583 13f79535-47bb-0310-9956-ffa450edef68
2008-12-27 02:31:05 +00:00
Jacques Le Roux 5a6d7dc969 These blocks should not have been indented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729471 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 09:32:07 +00:00
Jacques Le Roux 3ab1cc9086 This change should not have slipped in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729394 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 06:09:46 +00:00
Hans Bakker a2d58dc0ca set port values back to original default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729391 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 03:33:55 +00:00
David E. Jones c5c395277f I don't know why these were changed, probably mistakenly included in a commit, so changing back to more normal defaults
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729337 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 17:32:18 +00:00
Jacques Le Roux 7613c522d0 Added a comment found in https://sourceforge.net/forum/message.php?msg_id=5879468
Gmail would needs IMAPs for inbounds mails to work (SSL)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729284 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 09:27:05 +00:00
Jacques Le Roux a0b8e736d3 French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728778 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 21:15:15 +00:00
Jacques Le Roux c890b3ef32 Reverted on Adam's guidances
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728536 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 22:25:22 +00:00
Jacques Le Roux 63e03b9043 Add a date:nowTimestamp() function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728133 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 20:24:09 +00:00
Adrian Crum 2c32e6fbb4 Fixed bug in FlexibleMapAccessor.java parsing - someMap[this.that] syntax works now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727845 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 22:29:19 +00:00
Jacques Le Roux d5f99b443a A modified patch from Erik Wegner "Patch for all language files (*Labels.xml) to correct language order, find duplicates or invalid entries" (https://issues.apache.org/jira/browse/OFBIZ-2073) - OFBIZ-2073
I removed some hunks, see https://issues.apache.org/jira/browse/OFBIZ-2073?focusedCommentId=12656651#action_12656651



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726808 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 21:28:06 +00:00
Adrian Crum ad0147d45b A couple more UEL functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726374 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 05:45:32 +00:00
Adrian Crum c0fd5f4261 More Unified Expression Language built-in functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726338 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 02:35:58 +00:00
Adrian Crum 48860ab47b Removed unnecessary deprecation warning from FlexibleMapAccessor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726290 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 23:18:25 +00:00
Adrian Crum 03ae66d708 Implemented FlexibleMapAccessor.getInstance() in the remaining classes. Deprecated the FlexibleMapAccessor constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726260 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:25:33 +00:00
Adrian Crum d0e7d7ab3e Removed debugging code from recent commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726233 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 16:58:48 +00:00
Adrian Crum dc3dc713ec FlexibleMapAccessor refactor - added Unified Expression Language support and a cache/factory method.
The UEL implementation is asymmetric - get() method calls are delegated to the UEL library, and put() and remove() method calls are implemented with internal classes. The reason is because FlexibleMapAccessor supports object creation during assignment and UEL does not. The UEL specification clearly states that assignment can only happen to existing variables. The JUEL library implements that - you can only assign values to existing variables.

I've spent several days testing this, but there is still a chance that something will break. I'll watch the dev mailing list closely and fix any problems as they come up.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726165 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 03:23:47 +00:00
Jacopo Cappellato 62a546391b small misc cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726147 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 23:31:30 +00:00
Jacopo Cappellato fa390788fa Renamed file to follow standard naming conventions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726141 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:31:58 +00:00
Adrian Crum 60de21586d UtilMisc work - expanded and improved Object to number conversions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726074 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 17:22:35 +00:00
Jacques Le Roux 52595e4f48 A slightly modified patch from Bilgin Ibryam "Allow multi-pagination in a page" (https://issues.apache.org/jira/browse/OFBIZ-1935) - OFBIZ-1935
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725053 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 10:39:16 +00:00
Adrian Crum a6f7092892 Converted ${env...} expression syntax to ${sys:getProperty(String)}. The old syntax still works.
I didn't like how an expression starting with "env." was treated differently, especially since it wasn't documented anywhere.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724851 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 19:46:44 +00:00
Adrian Crum dc76c292df Finished building out the Unified Expression Language functions, added detailed JavaDocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724835 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 19:08:19 +00:00
Adrian Crum 00c2bc4a62 Fixed a bug I introduced in FlexibleStringExpander - the special ${env...} syntax wasn't being expanded properly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724792 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 17:31:28 +00:00
Adrian Crum f7b4614553 Added some functions to the Unified Expression Language. See the UelFunctions.java JavaDoc for details.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724616 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 05:58:18 +00:00
Adrian Crum f48fa23ce4 More work on the Unified Expression Language code:
1. Renamed some things in UelUtil.java to make them more understandable
2. Moved exception handling out of UelUtil.java and into calling methods
3. Added missing UEL implementation to FlexibleStringExpander.java


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724428 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 18:00:22 +00:00
Adrian Crum b8b7fa131e Fixed parsing errors in Unified Expression Language code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724373 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:58:14 +00:00
Adrian Crum d838febb44 Integrated the Unified Expression Language (JSR-245) into the FlexibleStringExpander class.
This commit also includes an example usage in InventoryServices.xml.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724146 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 16:11:44 +00:00
Adrian Crum c09cf015a1 Fixed bug where properties using the ${} syntax weren't being expanded, reported by Mridul Pathak - https://issues.apache.org/jira/browse/OFBIZ-2066.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722104 13f79535-47bb-0310-9956-ffa450edef68
2008-12-01 15:53:13 +00:00
Jacques Le Roux 5f1f00276d A patch from Philipp Hoppen " Individual logfiles for scheduled jobs" (https://issues.apache.org/jira/browse/OFBIZ-2042) - OFBIZ-2042
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@719836 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 11:24:28 +00:00
Jacques Le Roux 2af8a8c28d Minerva commented out for convenience. As Oxygen reported an error, I looked for an XSD but found none.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@719719 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:27:01 +00:00
Adrian Crum fc32f9e7d8 A rudimentary iCalendar integration implementation. Work efforts can be published in iCalendar format. The published calendar is read-only.
Run ant run-install, then navigate to:

https://localhost:8443/iCalendar/CALENDAR_PUB_DEMO/MyCalendar.ics

for a demonstration.

I will continue to build this out as I have time.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718684 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 18:56:11 +00:00
Adrian Crum a7b1c9c92a Removed static fields that are no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718618 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 14:32:40 +00:00
Adam Heath 3935ab51c0 Implement multiple resource loading from the classpath; this means
that framework doesn't have to reference transforms that exist in
later components.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718491 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 06:09:58 +00:00
Adrian Crum 8cfee75105 Small fixup for one of my previous commits.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@714087 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 18:06:37 +00:00
Adam Heath feab072e37 Ported to the java1.4 exception chaining feature, instead of
maintaining our own reference to the nested/chained throwable.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@713576 13f79535-47bb-0310-9956-ffa450edef68
2008-11-13 00:20:48 +00:00
Adrian Crum f4a3855f56 Oops, missed the JavaDoc comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712239 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 19:50:02 +00:00
Adrian Crum 6c084dc8e3 Deprecated one more unnecessary class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712237 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 19:47:04 +00:00
Adrian Crum cd731c702b Fixed a small bug in UtilProperties.java where some properties files were cached twice.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712201 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 17:06:48 +00:00
Adrian Crum a414ac0c9b Code cleanups in the base component - deprecated unused/unnecessary classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712195 13f79535-47bb-0310-9956-ffa450edef68
2008-11-07 16:54:41 +00:00
Adam Heath 23fd64c410 Remove the prepare targets, they are already defined in common.xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@711773 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 06:17:36 +00:00
Adam Heath e4566854d9 Javadoc updates; no warnings!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709585 13f79535-47bb-0310-9956-ffa450edef68
2008-10-31 22:15:48 +00:00