Commit Graph
1462 Commits
Author SHA1 Message Date
Adrian Crum cd9808ddb3 Enable FETCH and OFFSET keywords for Derby database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460455 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 20:23:27 +00:00
Jacopo Cappellato 08166bdc4c Unified redundant blocks "if (Debug.infoOn())" into one to improve readability of code: no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 07:25:56 +00:00
Jacopo Cappellato bd81b76dd8 Minor fix to indentation and to a typo in a comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460274 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 07:16:43 +00:00
David E. Jones 1c6adf2f0a Fixed issue with deserialization from XML of an entity value with null fields
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1458429 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 17:48:28 +00:00
Jacques Le Roux 56c153168a A patch from Nicolas Malin for "Adding unit test for new element to load data" https://issues.apache.org/jira/browse/OFBIZ-5112
With the issue commit OFBIZ-4949, it' necessary to complete unit test on this feature.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1449279 13f79535-47bb-0310-9956-ffa450edef68
2013-02-23 08:26:21 +00:00
Jacques Le Roux 8afa159480 A patch from Chatree Srichart for "Ignore "tenant" data files if the multitenant property is "N"" https://issues.apache.org/jira/browse/OFBIZ-4934
The system does not need to load tenant data files if the multitenant property in general.properties is "N". I created a patch to ignore the tenant data files when run ./ant load-demo command.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1444370 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 14:39:29 +00:00
Jacques Le Roux 8e737e4107 At Jacopo's request assign PoolableConnectionFactory super class rather
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1431249 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 10:02:58 +00:00
Jacques Le Roux 787ac84f63 In "Memory leak due to transaction management using DBCP and MySQL" https://issues.apache.org/jira/browse/OFBIZ-5122 Jose Manuel Vivó Arnal reported that I missed to apply the patch from OFBIZ-2599, just handled the DBPC part, and Philippe Mouawad did not notice.
OK, so it was just a matter of replacing 
PoolableConnectionFactory factory = new PoolableConnectionFactory(xacf, pool, null, null, true, true);
by
PoolableManagedConnectionFactory factory = new PoolableManagedConnectionFactory(xacf, pool, null, null, true, true);

The rest are only imports cleaning.

Too bad we did not notice that for 3.5 years. It seems it does not affect servers with plenty of memory, or updated often enough. But I recommend to upgrade of course...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1431191 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 05:32:48 +00:00
Jacques Le Roux d1e94dde53 A patch from Deepak Dixit "Editing of product suppliers is not working for the Germany locale" https://issues.apache.org/jira/browse/OFBIZ-4769
Thanks to Christian, Paul, Deepak, Adrian and I :)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426231 13f79535-47bb-0310-9956-ffa450edef68
2012-12-27 15:51:10 +00:00
Hans Bakker 68d5842339 Nice contribution from Nicolas, now be able to modify and delete database records using the framework import function: https://issues.apache.org/jira/browse/OFBIZ-4949
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1425813 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 04:19:34 +00:00
Jacques Le Roux 5ab0bb220f Reverts r1425716, 3 tests don't pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1425731 13f79535-47bb-0310-9956-ffa450edef68
2012-12-25 09:06:51 +00:00
Jacques Le Roux 7069d5e374 Fix "Editing of product suppliers is not working for the Germany locale" https://issues.apache.org/jira/browse/OFBIZ-4769
Thanks to Christian, Paul, Deepak and Adrian


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1425716 13f79535-47bb-0310-9956-ffa450edef68
2012-12-25 04:26:42 +00:00
Jacques Le Roux f4240a19ff Commented out testLimitOffsetOptions() because it makes the framework dependent on the content component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1422796 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 08:46:53 +00:00
Jacques Le Roux a59da36f7a A patch from Shi Jinghai for "Support MySQL and Postgres's LIMIT and OFFSET options" https://issues.apache.org/jira/browse/OFBIZ-4346
Change the existing code to support the different syntax variations, and add an attribute to the datasource element in the entityengine.xml file so that the proper variation can be chosen for each database.
Inspired by Moqui code. Test successful


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1422221 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 11:20:13 +00:00
Scott Gray 04df9cb162 Add a bunch of missing Override annotations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418651 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:06:40 +00:00
Scott Gray 0af4184d61 Remove a bunch of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418650 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:06:01 +00:00
Scott Gray f180a447c7 Remove redundant implements declarations where the interface is already implemented by the base class
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418649 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:04:37 +00:00
Scott Gray 5df3e3f70b Remove a bunch of unused imports, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418646 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:03:52 +00:00
Adam Heath bca838aa2a OPTIMIZE: Now that absolute() does the correct thing for 0, fix
getPartialList() to use absolute(start - 1), instead of working around
the bug itself.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1417213 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 21:54:49 +00:00
Adam Heath 9c7c925a4c OPTIMIZE: Remove the use of numRetrieved as a check to see how much has
been fetched.  Either list.size() could be used, or, even better, just
decrement the number wanted, and continue until everything is fetched.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1417212 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 21:54:42 +00:00
Adam Heath 7228abe497 TYPO: s/numRetreived/numRetrieved/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1417211 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 21:54:35 +00:00
Adam Heath fc81ed5fb1 FIX: Some jdbc drivers don't like absolute(0), even though this is
allowed.  As such, call beforeFirst() instead.  Technically, these
broken jdbc drivers should have the same kind of work-around.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1417210 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 21:54:28 +00:00
Jacques Le Roux 0323d6f48c No functional changes, just organizes imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1387567 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 12:55:58 +00:00
Jacques Le Roux 678a145d75 A patch from Chatree Srichart for "Fields in extended entity do not override attribute enable-audit-log" https://issues.apache.org/jira/browse/OFBIZ-4844
Tested with NoteData.noteParty


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1381559 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 11:24:01 +00:00
David E. Jones 358f61fdbc Added ext-test and ext-demo to all datasources so that install without specifying readers behaves as expected (ie loads all readers)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1376379 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 06:09:36 +00:00
Adrian Crum 25c04f28af Partially reverting rev 1372738. As Scott pointed out on the dev mailing list, the conditions requiring a cast are rare - rendering those optimizations ineffective.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1373239 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 07:08:57 +00:00
Adrian Crum afd4e8b3c0 Small GenericEntity optimization - remove instanceof checks in getXxx methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1372738 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 06:02:58 +00:00
Erwan de Ferrieres 342c56d85c correcting javadoc for DynamicViewEntity.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1369406 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 18:47:26 +00:00
Erwan de Ferrieres ebad9a93df missing ending } in javadoc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1367750 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:24:42 +00:00
David E. Jones 3ec005ae79 Changed so that cus-obj element value is not in a CDATA block; it is already hex encoded so does not need to be in a CDATA block, and in entity exports of the RuntimeData entity it ends up being causing a nested CDATA block, which is not allowed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1364822 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 22:10:29 +00:00
Jacopo Cappellato 519465c113 Made constructor private according to the design of this class (instances are created using the static getModelReader that also takes care of managing the cache).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1364045 13f79535-47bb-0310-9956-ffa450edef68
2012-07-21 08:39:11 +00:00
Adrian Crum 3df18870cc Some trivial changes in the entity config classes - mostly JavaDocs, remove unnecessary calls to UtilValidate. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362790 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 07:15:45 +00:00
Adrian Crum ca716388f8 Added a new attribute to the entity definition - "redefinition" - which will suppress "Entity is defined more than once" warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 05:42:24 +00:00
Jacopo Cappellato 6137a3bf47 Minor change to set a consistent naming format for all the threads started by OFBiz.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362417 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 09:05:33 +00:00
Jacques Le Roux feecb15093 "Housekeeping of jar files" https://issues.apache.org/jira/browse/OFBIZ-4833
Moves Minerva and XAPool to Attic

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356471 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 20:29:54 +00:00
Adrian Crum dfb74cc196 Fixed some bugs in EntityFinderUtil.java:
1. LimitRange and LimitView classes treated ELI and List indexes the same - causing inconsistent results because ELI indexes are one-based and List indexes are zero-based.
2. LimitRange and LimitView classes returned different results at the end of the list depending on whether an ELI or List was being used.
3. LimitView class view index calculation was wrong.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356201 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 12:16:36 +00:00
Adrian Crum 83c60b16da Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356168 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 10:33:49 +00:00
Adrian Crum 523436cb76 Some optimizations in EntityFinderUtil.java:
1. Made the Condition implementations immutable and thread-safe.
2. Moved operator lookup from run-time to parse-time.
3. Removed unnecessary calls to UtilValidate.
4. Replaced LinkedList with ArrayList.
5. Optimized code in the ConditionExpr.createCondition method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356024 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 20:54:23 +00:00
Jacopo Cappellato 15fe323128 Removed some junk and unused code left over after the commit:
Author: jleroux
Date: Fri Jun  3 19:05:07 2011
New Revision: 1131144

was "reverted" as part of:
 
 Author: jleroux
 Date: Fri Sep 23 19:22:40 2011
 New Revision: 1174964
 
 The code is still broken.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-23 08:33:01 +00:00
Hans Bakker 5ea30aab8f tenant data in the entity component is meant for demo, so demo data. comment from Adam
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351213 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 06:40:31 +00:00
Hans Bakker 14f4e5a292 reverted recent security file changes revisions: 1350847,1350843,1350840,1348534,1347908,1347213,1346264, need more investigation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351206 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 04:36:20 +00:00
Hans Bakker a8040d7806 security should be loaded first
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347213 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 00:04:08 +00:00
Hans Bakker f6a992b6ee tenant data in the entity component is meant for demo, so demo data. comment from Adam
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1346713 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 02:20:54 +00:00
Hans Bakker d2ae6af774 enable tenant demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1346269 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 07:35:26 +00:00
Hans Bakker fff7f99081 introduced a new data-reader : 'security'
Security is now by default not loaded because not part of seed anymore this will make all component hidden and not accessible .
It is still loaded as part of the reader 'demo'

to load the security files:
./ant load-readers -Ddata-readers=security

Now it is possible to load only a selection of the security files in your hot-deploy component as follows:

<entity-resource type=data reader-name=seed loader=main location=../../framework/security/data/SecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../framework/webtools/data/WebtoolsSecurityData.xml/>
<entity-resource type=data reader-name=seed loader=main location=../../applications/party/data/PartySecurityData.xml/>

This will enable only standard groups, the party and the webtools application.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1346255 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 06:37:06 +00:00
Jacopo Cappellato df927cd6dd Fixed lock that was set to the wrong class (this was probably caused by a copy and paste error).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345001 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 07:13:59 +00:00
Jacopo Cappellato f6fc46c679 Removed default value for the attribute for inline-jdbc used to specify an XA wrapper class: it was set to a specific implementation (Enhydra).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1344999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 07:10:39 +00:00
Jacopo Cappellato c4c79f58e8 Improved code that manages the cache:
* removed unnecessary synchronization
* protected the UtilCache object (static field) by making it private and final



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 10:54:16 +00:00
Adam Heath d9a34a8c8c Deprecate EntityUtil.getRelated(ByAnd|OrderBy)(|Cache), replaced with
the single getRelated variant.

EntityUtil.getRelatedByAnd(String, Map) replaced by
EntityUtil.getRelated(String, Map, List, boolean)

EntityUtil.getRelatedByAndCache(String, Map) replaced by
EntityUtil.getRelated(String, Map, List, boolean)

EntityUtil.getRelatedOrderBy(String, List) replaced by
EntityUtil.getRelated(String, Map, List, boolean)

EntityUtil.getRelatedOrderByCache(String, List) replaced by
EntityUtil.getRelated(String, Map, List, boolean)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343532 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:21:38 +00:00
Adam Heath 4a0f383a5a Deprecate GenericValue.getRelated(ByAnd|OrderBy)(|Cache), replaced with
the single getRelated variant.

GenericValue.getRelatedByAnd(String, Map) replaced by
GenericValue.getRelated(String, Map, List, boolean)

GenericValue.getRelatedByAndCache(String, Map) replaced by
GenericValue.getRelated(String, Map, List, boolean)

GenericValue.getRelatedOrderBy(String, List) replaced by
GenericValue.getRelated(String, Map, List, boolean)

GenericValue.getRelatedOrderByCache(String, List) replaced by
GenericValue.getRelated(String, Map, List, boolean)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343531 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:21:21 +00:00