Commit Graph
6492 Commits
Author SHA1 Message Date
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
Jacques Le Roux cbc7317064 A modified additional patch from Wai "widget <image> tag to use css for resizing" https://issues.apache.org/jira/browse/OFBIZ-4768
Changes in the relevant css files were not made. As a result the spinner is showing a horizontal repeat. This has been corrected.
Tomahawk themes/tomahawk/webapp/tomahawk/images/spinner.gif is now removed framework/images/webapp/images.spinner.gif will be used by all themes in order for the same consistent spinner image to be used.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328738 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 21:42:19 +00:00
Jacques Le Roux 24c36ab9a1 Moves guiapp component inside POS component
Closes https://issues.apache.org/jira/browse/OFBIZ-4807



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328727 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 19:19:09 +00:00
Jacopo Cappellato ebf04fde84 Synchronized read access to the parsedScript cache to avoid issues with concurrent thread visibility.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328641 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 12:19:31 +00:00
Jacques Le Roux 986c1ae6ac A patch from Daniel Riquelme "Enable NOT-IN operator to performFind" https://issues.apache.org/jira/browse/OFBIZ-4815
This patch will enable NOT-IN operator to the performFind service.
Only two lines of the file framework/common/src/org/ofbiz/common/FindServices.java were modified to enable de NOT-IN operator.
An use case is provided to test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328637 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 11:38:14 +00:00
Erwan de Ferrieres 23e9a65a01 Moving example* applications to specialpurpose OFBIZ-4790
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328503 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 21:11:02 +00:00
Jacopo Cappellato 684fce1265 The cache of parsed Groovy scripts was not thread safe; this issue, in instances with several concurrent threads running the same script the first time (i.e. not cached) could cause the same script parsed multiple times and then added to the cache (overriding the previous value); this event was causing the clearing of caches in Freemarker; because of a bug in Freemarker [*] this could cause a deadlock.
The issue is present on all versions of Freemarker but it is less frequent on latest version because of the refactoring of caches happened after release 2.3.10.

[*] https://sourceforge.net/tracker/?func=detail&aid=3519805&group_id=794&atid=100794

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328356 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 12:53:35 +00:00
Adrian Crum a871ca4fac Some Mini-language validation code and other files in preparation for the syntax overhaul. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328302 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 10:26:38 +00:00
Jacques Le Roux 567080a8e3 Fixes a NPE introduced at r1328122
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328226 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 06:59:06 +00:00
Adrian Crum 500a2b4ec4 Added exception handling to the mini-language API. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328222 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 06:53:41 +00:00
Jacques Le Roux 5e5f0e27a5 This introduces a mean to hide a service result in log (when the service is longer than 50 ms and Debug.timingOn() or > 200 ms and Debug.infoOn(), see ServiceDispatcher.java, just above line 600)
A hideResultInLog service attribute is added. If set to true the service result will be hidden from possible exposition in ServiceDispatcher.runSync() 
This is convenient when used for sending a password to an user (the password must be legible in the sent mail). 
I'm sure a lot of you would want to have no logs at all in production. But by experience I know that we need to log info in logs even in production. Especially when the system is quickly moving ahead...
So this is a sure mean to hide any password in logs, being current or backuped somewhere on the servers disks...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328122 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 21:41:39 +00:00
Adrian Crum b64a9d940f Mini-language code format cleanup. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327981 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 15:09:03 +00:00
Jacopo Cappellato 3736c9856c Reverted rev. 1327736: with it it was impossible to log in with demo accounts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327866 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 08:43:54 +00:00
Sascha Rodekamp 83a3e0f6f4 Revert 1327835: accidently committed file WidgetWorker.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327839 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 06:30:36 +00:00
Sascha Rodekamp 94889bae2d Fix jackrabbit unit testing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327835 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 05:58:29 +00:00
Sascha Rodekamp 4c080a3d97 Fix jackrabbit unit testing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327834 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 05:56:56 +00:00
Adam Heath 4e165df74b FEATURE: Very simple command-line tool to crypt a password.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327742 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:28 +00:00
Adam Heath f092508550 FEATURE: Make use of new HashCrypt cryptPassword functionality.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327741 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:22 +00:00
Adam Heath ffd48b19c9 FEATURE: Add unix(glibc)-compatible password hashing, exact same output, with support for salts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327740 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:10 +00:00
Adam Heath 3cea0258d0 OPTIMIZE: Refactored LoginServices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327737 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:58 +00:00
Adam Heath 6ea609d022 FIX: Fix a bunch of hashed passwords that had the oldFunnyHex encoding.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327736 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:51 +00:00
Adam Heath 731a0d461f FEATURE/FIX: <entity-condition> on views are now done correctly. When a
view was previously joined to another view, the conditions on the inner
view were added to the outer-most WHERE clause.  This caused multiple
problems.  One, if the join was optional, the generated sql actually made
it required(because it was in the WHERE, and not in the ON clause).
Second, the outer WHERE may reference a field that was not available *at
all* in the generated nested select(view table).

The fix is to *not* recurse thru all view member entities when finding
conditions, and instead attach them to a new WHERE clause on the
generated inner SELECT(view table).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327735 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:40 +00:00
Adam Heath c029432953 FEATURE: Remove synchronization on UtilCache access in
ModelFieldTypeReader.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327734 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:33 +00:00
Adam Heath 96b4df930a FIX/FEATURE: When connecting views to their real entities, do a dependency sort, so
that a view that references another view is configured after it's
dependencies.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327733 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:26 +00:00
Adam Heath e5c44753c3 FEATURE: Remove synchronization on entity caching; this requires the
non-blocking features I added to UtilCache; without them, you'll get
internal map corruption.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327732 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:20 +00:00
Adam Heath 8069604927 FIX: No longer use LRUMap, but ConcurrentLinkedHashMap. This fixes the
case where getSerivceLogMap is called, and the elements are enumerated.
This could cause an error when the calling code was enumerating the map,
to print out it's information, but a service that was represented in the
map would finish, and get removed from the map.  The calling code that
had the map might then get stuck in a loop that would never end(internal
to the map itself).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327731 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:14 +00:00
Adam Heath 15869c914e OPTIMIZE: nothing in runLog.put can throw an exception, except for
standard OutOfMemory type conditions; therefore, there is no reason to
actually catch and log any exception that won't be thrown anyways.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327730 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:08 +00:00
Adam Heath ba0112fea4 OPTIMIZE: runLog can never be null, it's a static final; if for some
reason that fails at class init time, then an exception will be thrown
then, and the class will not be usable.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327729 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:01 +00:00
Erwan de Ferrieres 39c7dc647e Removing commons-compress-1.1.jar as not used anywhere in OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327667 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 20:29:19 +00:00
Sascha Rodekamp e14bb20f8d Small jackrabbit API code cleanups and refactoring, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327506 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:37:25 +00:00
Jacques Le Roux 2db2a99619 A modified patch from Wai "ajax autocomplete and dialog during session timeout" https://issues.apache.org/jira/browse/OFBIZ-4813
1. autocomplete feature shows the message "no records found" during a session timeout. This could be misleading for the user.
2. During a session timeout, clicking on ajax dialog button shows a large frame containing a message indicating session has timeout. Should show a more detailed message.

jleroux: what I adapted:
* Added <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> in htmlheader-for-ajax.ftl
* Replaced also spinner.gif in Tomahawk (better be consistent)
* Added a French label an kept those existing but English (improved by Wai)
* Removed the ajaxErrorText style in ajaxNotLoggedIn screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327502 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:24:30 +00:00