Commit Graph
10472 Commits
Author SHA1 Message Date
Adam Heath 3fe7804696 Make use of UtilObject.equalsHelper in storeAll.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930737 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:08:46 +00:00
Adam Heath 688dbbdbf9 Remove static ExecutionPoolFactory; it was only used internally, and the
original implementation that this was based on did more, which required
it to be a separate class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930736 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:08:40 +00:00
Adam Heath 7edfb25c62 Remove synchronized here too; again, since we are adding/removing from a
cache, if 2 threads happen to not find anything, then it will just cause
a little bit of duplicated work.  It's better to that, then have a block
occur.  Class loading causes static constructors to run, which might end
up calling into the thread context class loader, which then might end up
starting other threads, which then could end up calling back into this
code path; instant dead-lock.  So, removing a lock stops the dead-lock
possibility.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930735 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:08:34 +00:00
Adam Heath 21ee263389 Remove synchronized blocks when fetching/creating instances into the
local caches.  It's not important to make certain there is only one
constructed instance.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930734 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:08:27 +00:00
Adam Heath b50fdaa488 There is really no need to protect hint with a synchronized block.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930733 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 18:52:26 +00:00
Adam Heath aa93a9511e Annotation used to document how some other variable or method is
protected under some other locking mechanism.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930732 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 18:52:19 +00:00
Adam Heath 426dc6fa7b Remove javacc from the runtime library path.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930731 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 18:47:22 +00:00
Bilgin Ismet Ibryam 4b60bfb7f9 Cleanup autocompleter fields. Removed type fields from the list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930707 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 16:06:24 +00:00
Adrian Crum da42890638 A patch from Blas Rodriguez Somoza - XHTML validation errors (framework excluding widget) (https://issues.apache.org/jira/browse/OFBIZ-3622).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930701 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 15:29:58 +00:00
Bilgin Ismet Ibryam e2c539b0ef Removed double ampersands from autoCompleterTarget, because it was breaking autocompleters.
Autocompleter code (a third party library) expects only one ampersand and adds the second one itself during ajax call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930670 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 12:28:33 +00:00
Bilgin Ismet Ibryam 2c208a4b35 Using == is more readable than = for comparisons (even both work the same way in FTLs)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930666 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 11:48:14 +00:00
Bilgin Ismet Ibryam 2a29d19bc0 Committed a patch from OFBIZ-3541 "Using Widgets html form templates in FTL files". This change will make autocompleter available also in ftl lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930660 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 10:38:19 +00:00
Jacques Le Roux 8c6360bad0 A modified patch from BJ "Tenant login can cause a problem when contacting a delegator" (https://issues.apache.org/jira/browse/OFBIZ-3578) - OFBIZ-3578
If the tenantid has leading/trailing spaces


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930580 13f79535-47bb-0310-9956-ffa450edef68
2010-04-03 21:07:37 +00:00
Vikas Mayur ff81b42928 Extending the <required-permissions> tag in service model such that it can contain one or more occurrence of <permission-service> tag.
This is helpful when there is a need to check more then one permission using a permission service.

Applied framework only part from my patch from jira issue OFBIZ-3632 (https://issues.apache.org/jira/browse/OFBIZ-3632)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930536 13f79535-47bb-0310-9956-ffa450edef68
2010-04-03 16:07:18 +00:00
Jacques Le Roux 964c4c302d A modified patch (indentation done mostly) from Blas Rodriguez Somoza "XHTML validation errors (framework/widget) Tree widget and Date time field rendering issues" https://issues.apache.org/jira/browse/OFBIZ-3628 - OFBIZ-3628
htmlTreeMacroLibrary.ftl
Tree widget renders unclosed <li> tags.
Example from Accounting -> Global GL settings -> Navigate accounts
<ul class="basic-tree">
<li><ul class="basic-tree">
<li>
<li><a class="collapsed" href="/accounting/control/GlAccountNavigate?trail=null|100000"> </a><a href="/accounting/control/GlAccountNavigate?glAccountId=100000&trail=null">100000

htmlFormMacroLibrary (macro renderDateTimeField)
selected attribute without value
<option value="AM" selected>
input inside ul
<ul>
......
<input type="hidden" name="${compositeType}" value="Timestamp"/>
</ul>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930516 13f79535-47bb-0310-9956-ffa450edef68
2010-04-03 12:42:36 +00:00
Adrian Crum f152bcfdf9 Changed a demo data comment to help clear up some confusion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930470 13f79535-47bb-0310-9956-ffa450edef68
2010-04-03 04:41:21 +00:00
Adam Heath 5ec1f9cda5 Fix bad transaction pattern introduced with 927256.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930332 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 17:22:24 +00:00
Adam Heath 94604a3923 Last commit fixed the compile error, and allowed the test cases to pass.
However, there are no tests against the webtools webapp, and this change
finishes the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929849 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 05:42:11 +00:00
Adam Heath 6094c94ba2 Fix for buildbot failure, due to committing untested rebased code;
mea-culpa.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929847 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 05:21:21 +00:00
Adam Heath a147d7863e Add a new method, erase(), which just clears out the stored entries,
without clearing any counters.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929846 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:52:39 +00:00
Adam Heath 1bc6324970 Remove SoftReferences automatically in the background. This is the
final step in removing all polling code patterns from UtilCache.
Because of this, all helper methods that were used to clear elements
programmatically are now officially deprecated.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:51:14 +00:00
Adam Heath b6948771f4 Helper class to poll a ReferenceQueue with a background thread.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929844 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:50:21 +00:00
Adam Heath e4ce6146c7 Backround removal of items due to ttl expiration.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929843 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:49:37 +00:00
Adam Heath 3e4236b4fc Switch memoryTable to ConcurrentMap, which means it's no longer a
FastMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929842 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:49:00 +00:00
Adam Heath c50099a5ac No longer store CacheLine into the disk store, just store the value.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929841 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:48:30 +00:00
Adam Heath 6d5aa9b168 Remove CacheLine.getSizeInBytes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929840 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:47:58 +00:00
Adam Heath 5abf555503 New changeMemSize tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929839 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:47:25 +00:00
Adam Heath ccbc1646ca Inline CacheLineTable into UtilCache. This removes the CacheLineTable
class completely.  The getCacheLine() method now throws
UnsupportedOperationException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929838 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:46:53 +00:00
Adam Heath f530c596ed Add a feature to request CacheLine metadata as a simple list of maps.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929837 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:46:14 +00:00
Adam Heath eb7c6dfaeb Fetching of cache.file.store now also uses getPropertyParam.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929836 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:45:29 +00:00
Adam Heath 8278eb9ecf Refactored getPropertyParam, so it is responsible for logging exception
warnings.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929835 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:44:57 +00:00
Adam Heath ddce0bdf97 The non-serial methods now call the local serial variants, to help with
code coverage.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929833 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:44:26 +00:00
Adam Heath 492e748758 Remove helper method, incrementCounter, and just call incrementAndGet on
all the atomics.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929832 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:43:12 +00:00
Adam Heath 66c1064c08 Simplify logic in getNextDefaultIndex, so that it's possible to get full
coverage on all it's lines.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929831 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:42:21 +00:00
Adam Heath 7b81a38648 Slight tweak to getOrCreateUtilCache, to get better code coverage.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929830 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:41:49 +00:00
Adam Heath b182e5c92b Refactor createCacheLine slightly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929829 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:40:39 +00:00
Adam Heath 4d82b9565e Move the creation of the cache line instances to an internal helper
method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929828 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:40:07 +00:00
Adam Heath e6a5ab99bf Remove CacheLine constructor variants that don't take a loadTime.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929827 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:39:35 +00:00
Adam Heath b0182c1157 setExpireTime wasn't storing new lines back to disk when the expire time
changed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929826 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:38:55 +00:00
Adam Heath 3daeedc596 Support multiple different file store locations; not finished, as it
still only fetches a single global value from the properties file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929825 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:38:23 +00:00
Adam Heath e6acc7109a Refactored setUseSoftReference, to call a new method
CacheLine.changeLine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929824 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:37:50 +00:00
Adam Heath 7f1a64ba00 Inline getNoCheck method, which was only used in one place.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929823 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:37:10 +00:00
Adam Heath 478fd27742 Don't call get() when removing, so that an lru access is not recorded.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929822 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:36:35 +00:00
Adam Heath ca93e370fc In setLru, if memoryTable is a ConcurrentLinkedHashMap, then just call
setCapacity on it, which will cause the oldest entries to be removed
when the size is lowered.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929821 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:36:03 +00:00
Adam Heath e5b8e12d8a No longer use LRUMap, but a non-blocking variant,
ConcurrentLinkedHashMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929820 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:35:31 +00:00
Adam Heath 204dc4e8f7 Create the memoryTable during the constructor, instead of calling
setLru.  This removes a null check in the latter method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929819 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:34:49 +00:00
Adam Heath a5c9f50d5a In setLru, it's not nescessary to check memoryTable against null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929818 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:34:17 +00:00
Adam Heath 59cc3972ec Refactored null handling, so that isNullSet and nullValue are no longer
required.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929817 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:33:45 +00:00
Adam Heath bff9d9e655 Don't prefix jdbmMgr access with CacheLineTable classname.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929816 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:33:13 +00:00
Adam Heath d02a6bc2ff When removing a key, and calling fileTable.remove, be certain to call
jdbmMgr.commit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929815 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:32:40 +00:00