Commit Graph
307 Commits
Author SHA1 Message Date
Adrian Crum 9ee18d37c5 Updated client code to use the new Delegator factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823633 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:44:24 +00:00
Adam Heath 7f94829d66 Don't use the internal CacheLine value iterator, instead iterating
over the keys, fetching the value, and then removing when it matches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823319 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:49:17 +00:00
Adam Heath f4ce5e6276 Remove unneeded CacheLine import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823317 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:48:43 +00:00
Adam Heath 3162462a72 Remove protected method, that isn't used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823289 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:38:29 +00:00
Scott Gray ca09f69b94 Fix an inconsistency in GenericEntity's get methods when the key doesn't exist, get(String) throws an exception but get(Object) just logs a warning. Changed so that both methods just log a warning.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822276 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 14:07:04 +00:00
Adam Heath b15b30ddfd Simple factory lookup, DelegatorFactory switched to abstract class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821669 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 03:00:11 +00:00
Adrian Crum 7fa08f9079 Replaced GenericDelegator.getGenericDelegator(...) calls with new factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821649 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 01:53:50 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Adam Heath 124ebc7e8d Suppress deprecation warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821405 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 20:01:16 +00:00
Adam Heath 80d220afe8 Allow <default-resource-name> globally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821403 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 19:53:20 +00:00
Adrian Crum dd22f83c72 Improvements to the GenericDelegator refactoring - based on suggestions from Adam Heath.
I removed the deprecated methods from the Delegator interface. So, any replacements of GenericDelegator.getGenericDelegator(...) with the new factory method will have to include code to replace the deprecated method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821391 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 18:52:29 +00:00
Adrian Crum 2f063e3fd7 Refactored GenericDelegator.java based on a design proposed by Adam Heath on the dev mailing list.
DelegatorInterface.java has been replaced by Delegator.java.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819067 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 23:36:13 +00:00
Jacopo Cappellato 18415c98d0 Better variable name (removed jotm prefix), no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818123 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 14:44:48 +00:00
Jacopo Cappellato 5e61e31ffe New class to make it easier to test the usage of connections in the DBCP pool.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818106 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 14:01:17 +00:00
Adam Heath 9725979827 Add some more register variants, to support other lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817305 13f79535-47bb-0310-9956-ffa450edef68
2009-09-21 16:04:12 +00:00
Jacques Le Roux e8f9dec801 Changed DBCP parameter name at Jacopo's request (consistent with OFBiz style)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817194 13f79535-47bb-0310-9956-ffa450edef68
2009-09-21 08:48:49 +00:00
Jacques Le Roux e8874a4bf9 Allow to set timeBetweenEvictionRunsMillis for each DB type from entityengine.xml. Keep default value at 600000 (10 min)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@817082 13f79535-47bb-0310-9956-ffa450edef68
2009-09-20 19:14:41 +00:00
Adam Heath 123d02c2e5 Move this code to TransactionUtil.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815914 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 18:06:54 +00:00
Adam Heath 6d02f38a92 Fix AND and OR support when evaluating some conditions in memory;
namely, EntityExpr(Condition, Join, Condition) didn't work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814731 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 17:02:36 +00:00
Adam Heath 307f2f956b Remove the compare method from the base class, and make it abstract.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814512 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:54:41 +00:00
Adam Heath 0fc6bd8408 Bother, that'll teach for me fix this late night, with my glasses off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814511 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:49:59 +00:00
Adam Heath d6cf856b07 s/List/Comparable in a few places, to stop a CCE from occuring.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814508 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 07:47:38 +00:00
Adam Heath 1e6f7b7857 Start adding generics to the operators, to document what they
operate on(more to come).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814492 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 06:35:44 +00:00
Adam Heath 28474f80ac Remove generics markup on operator variables.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814491 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 06:28:21 +00:00
Adrian Crum 74ea95889c Reverted rev 802567.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812692 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 20:56:14 +00:00
Adam Heath b86756490a Add @Deprecated to silence javac.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812323 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 02:31:34 +00:00
Jacques Le Roux 3fedb9e5ed Some ASL2 headers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811870 13f79535-47bb-0310-9956-ffa450edef68
2009-09-06 19:54:25 +00:00
Scott Gray 00e1d034ea Fix a problem where empty Collections fail the field type check
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@811581 13f79535-47bb-0310-9956-ffa450edef68
2009-09-05 00:56:07 +00:00
Jacques Le Roux 372d9ce14e Fix an issue reported by André Herbst at http://markmail.org/thread/wgqhbyr5qo6j44yq. Related to r810438
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810465 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 11:55:44 +00:00
Scott Gray 044d8d6090 Fix some code that seems to cause problems for some non-Sun JDKs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810438 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 09:55:20 +00:00
Scott Gray 49fe2b05ce Switched back to using scroll insensitive cursors, fixes problem reported by Jacques and Jacopo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809425 13f79535-47bb-0310-9956-ffa450edef68
2009-08-30 22:15:01 +00:00
Scott Gray 9df4db06bd Fix problem reported by Jacques, the ResultSet API doesn't allow FORWARD_ONLY result sets to call the first() method even
if the current position is beforeFirst or first, worked around it by having the EntityListIterator handle the
situation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809324 13f79535-47bb-0310-9956-ffa450edef68
2009-08-30 12:36:49 +00:00
Scott Gray d185774026 Fix to make sure the ELI count handles distinct queries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808824 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 09:13:01 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Scott Gray 712364816b Changes to the EntityListIterator to use a separate COUNT query to determine the result size plus a few other changes to help the ELI deal with TYPE_FORWARD_ONLY resultsets.
The changes to SQLProcessor are unrelated and contains no functional changes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808812 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:35:45 +00:00
Jacques Le Roux 4c442ee379 Some fusiness
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804895 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:20:38 +00:00
Jacopo Cappellato d073d1db07 "admin" user is only in demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804131 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 08:54:01 +00:00
Hans Bakker 31a5a0c5f4 reverted 804104 because of compile error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804130 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 08:48:06 +00:00
Hans Bakker e40f03e356 adjustment of storing/retrieving timestamp in the proper timezone. In the database the time zone is always GMT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804104 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 07:42:30 +00:00
Adrian Crum 38f8588dea Small code cleanup in DelegatorData.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802881 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 18:22:40 +00:00
Adrian Crum 22dc76f12f Fixed a bug in DelegatorData.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802877 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 18:09:07 +00:00
Adrian Crum 6786aa4dbc Refactored GenericDelegator:
1. Converted GenericDelegator to an interface. We already have DelegatorInterface, but it isn't being used anywhere. Removed DelegatorInterface.java.

2. Extracted the static, cached data from the GenericDelegator implementation and put it in its own class - DelegatorData. The GenericDelegator implementation holds a reference to the DelegatorData instance. This makes it possible to have per-thread instances of GenericDelegator.

3. Replaced the ThreadLocal variables with regular variables. ThreadLocal variables are no longer needed. Client code doesn't need to be concerned with pushing and popping the GenericDelegator state.

This commit paves the way for the forthcoming ExecutionContext.

User modifications will have to replace GenericDelegator.getGenericDelegator(...) with DelegatorFactory.getGenericDelegator(...). Also, replace the push code with the new setXxx methods, and remove the pop code. If modifications used DelegatorInterface, replace that with GenericDelegator.

Aside from those changes, this commit is backwards compatible.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802567 13f79535-47bb-0310-9956-ffa450edef68
2009-08-09 18:04:26 +00:00
David E. Jones 3f8f20e601 Added example of nested view-entity with entity-condition on a view member entity; adjusted view-entity entity-condition to handle naming consistent to other places for nested views, other small cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792836 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 08:47:16 +00:00
David E. Jones e550fc35ca Removed comments so that queries won't always show in the log; thanks to Adam for the reminder
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792546 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 13:17:08 +00:00
David E. Jones f8471fc20d Refactored implementation of view-entity entity-condition implementation to support the changes to the XSD and support the various new options; tested to work with the various cases in the entitymodel_view.xml file in the example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792420 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 06:48:05 +00:00
Scott Gray dec24b29f2 Sorry for the big commit, got a bit carried away.
Added override and deprecated annotations wherever they were missing
Removed the use of any deprecated classes/methods (except OutputFormat in UtilXml)
A few other random generics and misc. cleanups

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791212 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 10:01:19 +00:00
David E. Jones 9add252033 Added Override annotations as suggested by Adam Heath to avoid missing these again in the future and causing problems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791054 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 03:21:18 +00:00
David E. Jones 1bba575471 Small refactoring, changed so select count uses new entity-condition stuff under the view-entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790793 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 05:30:18 +00:00
David E. Jones d429bad707 Fixed bug reported by Hans and Adrian that broke the ByAndFinder class where string because method that overrides one on ListFinder wasn't doing that any more because the ListFinder method signature had changed; also did a few little cleanups related to this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790791 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 05:14:00 +00:00
David E. Jones 7e981d3cb3 Added ability to specify an entity-condition as part of a view-entity in order to encapsulate a full query definition in a view-entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790472 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 06:43:50 +00:00