Commit Graph
3778 Commits
Author SHA1 Message Date
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
Jacques Le Roux fe4fa08e79 A change needed for the protect view feature
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726180 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 07:22:20 +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
Jacques Le Roux 4085538f6f Fix 2 erroneous entity view titles found by chance while working on ProtectedView
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726131 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:04:33 +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 17899ba65b French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725615 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 08:03:49 +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 647530a6d2 Eliminated some unnecessary nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724882 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 20:55:33 +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
Jacques Le Roux 1e26fcea95 French update
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724638 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 08:31:42 +00:00
Hans Bakker 54a5a1094a update of portal pages with including column support and now using the 'normal' ofbiz interface
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724618 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 06:17:35 +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
Hans Bakker 949345f912 adding solution for oracle problem running services
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@723336 13f79535-47bb-0310-9956-ffa450edef68
2008-12-04 14:22:44 +00:00
Jacques Le Roux 7dc45110e9 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722963 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:41:14 +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 7f2cd293c4 I forgot a Luke Prentice's remark in https://issues.apache.org/jira/browse/OFBIZ-1045?focusedCommentId=12630930#action_12630930
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721904 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 22:12:46 +00:00
Jacques Le Roux 5a9c25deeb A patch from Luke Prentice "EntityOperator does not correctly construct SQL for BETWEEN clause" (https://issues.apache.org/jira/browse/OFBIZ-1045) - OFBIZ-1045
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721887 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 20:16:04 +00:00
Jacques Le Roux 6882531dcd Allow to use BETWEEN operator in widget action int he same way IN operator is used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721839 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 16:13:00 +00:00
Jacques Le Roux dc131074d8 Was duplicated in accounting. I kept, commented out, labels where a doubt existed (removed in accounting in a commit to come)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721660 13f79535-47bb-0310-9956-ffa450edef68
2008-11-29 11:00:57 +00:00
Bilgin Ismet Ibryam b685dbd482 Added purposeEnumId field to UomConversionDated entity. This will allow having different currency exchange rates for different on purposea.
Also extended convertUom service to search rates by purpose. If a rate with specified purposeEnumId is not found, then the conversion is done based on rates w/o purpose.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721431 13f79535-47bb-0310-9956-ffa450edef68
2008-11-28 11:16:07 +00:00
Adam Heath 943fa144c0 Do not change the default for existing deployments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720573 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 19:45:27 +00:00
Si Chen a3348f496e Allow email matching to be non case sensitive, so SiChen@opentaps.org would map to sichen@opentaps.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720570 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 19:40:33 +00:00
Jacques Le Roux 8485f16d5e IS MGr French translation + some common amendments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720221 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 16:27:22 +00:00
Jacques Le Roux da7282662f Finally reverted to use an iterator since I got an error in the following ftl (ArtifactInfo.ftl)
There is still errors after but I ran out of time

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720161 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 10:50:51 +00:00
Jacques Le Roux 41f7078d2b javolution.util.FastSet has not getAt() method, head() is ok in this case
http://javolution.org/api/javolution/util/FastSet.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720158 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 10:43:39 +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
Jacques Le Roux 3f9f10601c A patch from Bruno Busco "Replacing FTL TabBar with menu widgets in Webtools" (https://issues.apache.org/jira/browse/OFBIZ-2056) - OFBIZ-2056
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@719681 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 19:25:24 +00:00
David E. Jones 86d28d765b Added field for portlet security service, still needs to be implemented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718847 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 02:47:49 +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
Jacques Le Roux 3457f0f750 A patch from Karim Rahimpur "more and improved spanish translations" (https://issues.apache.org/jira/browse/OFBIZ-2046) - OFBIZ-2046
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718580 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 13:28:33 +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 725c12fc77 More Temporal Expression work:
1. Fixed a bug in the TimeOfDayRange class where it didn't calculate properly across a daylight saving transition.
2. Added interval and count to TimeOfDayRange. Now the next() method will increment according to the new fields.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718373 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 20:42:16 +00:00
Adrian Crum 2544c344f2 Reverted style change made in rev 712478. It caused a gray bar to appear at the top of the screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718299 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 17:56:44 +00:00
David E. Jones e7f1dde5f5 Commit reworked initial patch from Bruno Busco in Jira #1999; this follows Brunos work but adds the PortalPageColumn entity to configure columns, just optional pixel width for now, and also cleaned up entities and added foreign keys; rewrote a few things in screen actions and simple methods and removed a bunch of unused stuff that was commented out, so hopefully there isnt any more stray code in here; moved various things to files that were less generic, ie that mention portal specifically instead of just common or something; changed controller and menu setup so that this isn't in all apps by default, in fact just the example webapp for now with the include of portal-controller.xml and adding a dashboard menu item; note that this does not include the few changes in the specialpurpose directory, just the framework stuff for now; also moved data from seed to demo as it really isn't seed data in common and example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718185 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 07:56:27 +00:00
Scott Gray c4d5499b79 Framework portion of OFBIZ-2049, thanks to Bruno Busco for the patch and Ashish for review
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718169 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 04:01:19 +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
Adrian Crum 5dc2fbe3b6 Temporal Expression class improvements:
1. Hardened classes.
2. Added accessor methods to expression classes and added a visitor interface. These are in preparation for the upcoming iCalendar integration.
3. JavaDoc improvements.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@713848 13f79535-47bb-0310-9956-ffa450edef68
2008-11-13 22:44:52 +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
Jacques Le Roux 9279e3c7d8 To allow clear separation with real ERRORs when searching in log (lowercase is enough for that)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@713422 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 16:47:51 +00:00
Jacques Le Roux 8c9fcc2fcd French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712483 13f79535-47bb-0310-9956-ffa450edef68
2008-11-09 11:16:34 +00:00
Jacques Le Roux 438aaaf492 A patch from Chris Howe "Add createOrStore option to create-value in minilang" (https://issues.apache.org/jira/browse/OFBIZ-893) - OFBIZ-893
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712480 13f79535-47bb-0310-9956-ffa450edef68
2008-11-09 10:49:03 +00:00