Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 025a75b632 Added a utility method to FlexibleMapAccessor.java to test for nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338361 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 19:43:18 +00:00
Adrian Crum e3d62b1f76 Updated Mini-language schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338345 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 19:04:01 +00:00
Jacopo Cappellato cef1cccf82 OFBIZ-4864
* enabled by default the DebugManagedDataSource wrapper around ManagedDataSource
* enhanced the DebugManagedDataSource wrapper to:
** print log messages only at verbose level (instead of always as it was before)
** if possible print additional information about the connection status
** added new method that returns information about the connection pool settings/status
* added new static method to DBCPConnectionFactory to return information about the pools
* new screen in the webtools where information about each pool/helper is shown
The information provided by the screen can be very useful to analyze the status of the connection pools.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338230 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 14:45:43 +00:00
Jacopo Cappellato 4fe09a970a Fix for wrong operation name returned by the FieldToResult.toString(...) method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338224 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 14:36:54 +00:00
Adrian Crum 19fea3bcfc Modified the Mini-language comparison elements:
1. Moved comparison logic from ObjectType.java to the minilanguage component and improved it to be more modular.
2. Moved object type conversion from ObjectType.java to the minilanguage component and simplified it.
3. Modified comparison elements to use new comparison logic and object type conversion.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338212 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 14:11:33 +00:00
Jacques Le Roux ef02599c23 Removes the ij.script and derbytools-10.8.2.2.jar.
Reasons for this:
 * no active committer was maintaining it
 * it's maintained by the Derby project, see http://db.apache.org/derby/docs/dev/tools/ for details


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338173 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 12:03:58 +00:00
Jacques Le Roux 364c0fe88a Complete r1338065, the same message existed in fieldlookup.js
Also no needs to i18n such error messages, I removed the //TODO

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338101 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 09:15:10 +00:00
Jacques Le Roux 29c03cda16 A patch from Amardeep Singh Jhajj "Ajax autocomplete error while adding 1st item in order manager order creation" https://issues.apache.org/jira/browse/OFBIZ-4867
I found the small bug that when ajax request is aborted in autocompleter, the alert box is opened with message 
- An error occurred while communicating with the server:
    reason=abort
    exception=abort.
Hence, I have added a check to handle ajax abort exception in such case.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338065 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 08:51:08 +00:00
Jacopo Cappellato 53d6c971e9 Improved implementation of concurrent access to the cache of parsed Groovy scripts to avoid the risk of a NPE in the unlucky event that, between the execution of the cache.putIfAbsent and cache.get methods, the cache entry was removed (e.g. cache cleared/expired).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337789 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 07:16:18 +00:00
Adam Heath 2b3fdc9379 Deprecate Delegator.findByPrimaryKey and Delegator.findByPrimaryKeyCache.
Ofbiz is moving towards simpler delegator apis; this means all
'fooCache' variants are removed(and their matching 'foo' method), and a
new version of 'foo' added that takes a boolean cache parameter.

Delegator.findByPrimaryKey(String, Map) is replaced with
findOne(String, Map, false).

Delegator.findByPrimaryKeyCache(String, Map) is replaced with
findOne(String, Map, true).

Delegator.findByPrimaryKey(String, Object...) is replaced with
findOne(String, false, Object...).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337688 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:22:26 +00:00
Adam Heath 64a9662c25 DEPRECATION: framework: findByPrimaryKey variants replaced with findOne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:17:55 +00:00
Adam Heath 818b164f44 FORMATTING: Add some missing final newlines to few more files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337661 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:17:33 +00:00
Jacques Le Roux a60bc0b5d9 Moves the line
<set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
from ApplicationDecorator to GlobalDecorator screen.

This in order to prevent showing the Setup application in all framework components (example, examplext, webtools) when demo data are loaded. 
No side effects when loading only extseed data, Setup always shows (logical and tested)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337644 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 20:52:30 +00:00
Erwan de Ferrieres 8e0642a575 Adding consistency in log messages, 3 chars between square brackets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337462 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 07:39:56 +00:00
Jacopo Cappellato 0adb5a91f9 Completed migration to new captcha event implemented by Scott; removed old artifacts; removed tempfiles webapp that was causing the error reported in OFBIZ-4856
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337202 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:10:45 +00:00
Adrian Crum 3c9838c534 Added new element - <trace> - to Mini-language. Also updated the <simple-method> element to output trace messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337137 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 13:02:35 +00:00
Adrian Crum 7ca86c0501 Fixed Mini-language validation for the <check-id> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337135 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 12:55:55 +00:00
Adrian Crum 7a8a64a27e Minor Mini-language <log> element changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337117 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 11:47:23 +00:00
Adrian Crum beda6b3d14 Fixed broken Mini-language <check-errors> element (second try).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337103 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 10:25:33 +00:00
Adrian Crum f60d3ca6c8 Fixed broken Mini-language <check-errors> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337092 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 09:50:45 +00:00
Scott Gray 7f0893f8cd Deprecated org.ofbiz.common.Captcha
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337058 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 08:23:10 +00:00
Scott Gray 20047d5fe3 Copied the captcha image generator into a single event that streams the image to the response for a direct request rather than trying to store it during screen rendering to be served up later.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337057 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 08:23:02 +00:00
Jacopo Cappellato 4c5561546f Based on review from Adam Heath, refactored/simplified the implementation of thread safe code using the parsedScripts object.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337046 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 07:50:43 +00:00
Ashish Vijaywargiya b256c3d7cc Applied similar fix as we did on trunk r1300463.
On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-)

Bad use of Debug statement. On production system you will get false alarm that you are having error in code base although the resultant statement is only giving additional information instead of error message.

If conditional check is used for some debug level lets say "Verbose" then the containing Debug statement will be Debug.logVerbose() instead of Debug.logInfo() - Comment from Jacopo and Adrian. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337024 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 04:46:26 +00:00
Ashish Vijaywargiya e0971b304c Applied similar fix as we did on trunk r1300463.
On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-)

Bad use of Debug statement. On production system you will get false alarm that you are having error in code base although the resultant statement is only giving additional information instead of error message.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335927 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 05:28:17 +00:00
Adam Heath 6cd099d6fd FEATURE: Key-encrypting-key(kek) support is now enabled. To enable
support for this, run:

java org.ofbiz.base.crypto.Main -kek

and paste that value as a new attribute in entityengine.xml, <delegator
key-encrypting-key="$kekText"/>.  Make certain to add that attribute to
*all* delegators that share the same datasources.

ps: That java command should really be added to build.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335268 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 21:27:32 +00:00
Adam Heath 31b721aaa6 FIX: Bare passwords(circa 595296) comparisons were broken; they actually
used the oldFunnyHex encoding, not the fixed correct hex encoding.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335267 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 21:27:25 +00:00
Adam Heath 48062a3c41 FIX: There is a problem with tenant kek support, this should fix it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335064 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 15:29:28 +00:00
Jacopo Cappellato 5b528efa2d First pass in fixing the buggy code for captcha support; this is a first pass (the next one will probably be to save the image in the session rather than in the file system); the main problems fixed are related to concurrent access: the class was not thread safe and this, especially in servers with high traffic, could cause a series of issues like:
* captcha images created and then lost
* captcha images created in the wrong location (for example out of the OFBiz folder)
* the folder runtime/tempfiles/captcha could be locked



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335047 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 14:46:07 +00:00
Adrian Crum 3aba61d402 Oops, forgot to include schema changes in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335025 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 13:53:50 +00:00
Adrian Crum 832eb766ea Overhauled Mini-language <return> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335020 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 13:50:41 +00:00
Adrian Crum 615c04ec63 Moved some classes out of the org.ofbiz.minilang.method.callops package. The classes might have been intended for call/return operations originally, but now they are used in a generic way - so I moved them to the org.ofbiz.minilang.method.envops package.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335018 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 13:48:41 +00:00
Adrian Crum 778871216f Moved some classes out of the org.ofbiz.minilang.method.conditional package that didn't belong there.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334997 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 12:59:21 +00:00
Adrian Crum 782b312b1a Small fix for the Mini-language <set> element validation - allow scripts in the "from" attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334996 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 12:56:36 +00:00
Adrian Crum e288d47d0c More work on Mini-language: API fixes, overhauled <if-regexp>, <if-validate-method>, and <check-id> elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334971 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 12:26:01 +00:00
Hans Bakker 7f14038f90 fix duplicate relation name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334927 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 08:58:06 +00:00
Adrian Crum 643d47d4ac Overhauled a bunch of Mini-language conditional elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334915 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 08:28:47 +00:00
Adrian Crum 1a9c764f4e Minor code cleanup in ObjectType.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334840 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 00:13:35 +00:00
Adrian Crum 315b486c47 Overhauled Mini-language <assert> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334579 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 09:28:14 +00:00
Adrian Crum 11ccf4ebcb Some code cleanups/fixes for the Mini-language <add-error> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334578 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 09:27:20 +00:00
Adrian Crum a854aa7d55 Added a convenience method to MiniLangValidate.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334577 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 09:25:49 +00:00
Jacques Le Roux 80af13f2c1 Non functional changes. Removes useless exceptions catches.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334576 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 09:06:39 +00:00
Adrian Crum ae64f8dfc8 FlexibleStringExpander performance improvement - eliminate costly call to UtilValidate.isEmpty(Object).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334575 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 08:59:24 +00:00
Adrian Crum b968e62da5 Overhauled Mini-language <iterate-map>, <loop>, and <while> elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334536 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 00:43:58 +00:00
Adrian Crum 40b48b9a34 Overhauled Mini-language <iterate> element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334502 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 20:53:13 +00:00
Adrian Crum 96145d0819 Mini-language validation bug fix - allow nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334501 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 20:52:35 +00:00
Jacques Le Roux c4ca1b90fc Simplify code, non functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334483 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 20:23:39 +00:00
Adrian Crum e0313918de Reverting my previous commit because it breaks nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334473 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 19:45:19 +00:00
Adrian Crum 272d627686 Improved Mini-language <set-service-fields> auto-correction.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334469 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 19:09:26 +00:00
Adrian Crum d1cd637f11 Bug fix in Mini-language <iterate> element - the <break> and <continue> elements were ignored for collections and iterators.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334459 13f79535-47bb-0310-9956-ffa450edef68
2012-05-05 17:36:13 +00:00