Commit Graph
334 Commits
Author SHA1 Message Date
Hans Bakker 59830ab104 instead of a NPE show an error message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778984 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 03:46:26 +00:00
Scott Gray 6aa97d6adb Typos
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@775821 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 05:55:45 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
David E. Jones daebb63942 Small improvement in error message for location parsing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771195 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 06:29:36 +00:00
David E. Jones 5f2671153d Changed to support component:// URLs, should fix issue reported by Hans in OFBIZ-2418
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771193 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 06:24:54 +00:00
Adam Heath 2f59201bbd Make this a bit nicer for generics users.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771123 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:35:00 +00:00
Adam Heath a2fb671036 Remove unused EnumMap import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771121 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:17:37 +00:00
Adam Heath 812b0e50d4 No more generics warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771120 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:16:24 +00:00
Adam Heath 37a3734593 Some tightening of generics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770034 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 01:59:21 +00:00
Adam Heath 9840b7cc1c Fix some StringBuffer usage that has crept in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770030 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 01:22:44 +00:00
Scott Gray 0444b960a2 Wrap EntityListIterator usage in a transaction
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768999 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 14:19:33 +00:00
Scott Gray 50380d2301 Allow GenericEntity.NULL values through without warnings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768984 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 13:52:31 +00:00
Jacques Le Roux 0594f35d91 A patch from Tamer Sezgin "ij.ofbiz does not work" https://issues.apache.org/jira/browse/OFBIZ-2355 - OFBIZ-2355
+ update of Derby to 10.4.2.0

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768608 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 21:43:34 +00:00
Jacques Le Roux 46038493c4 Revert r766443 commited by accident
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766446 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 11:06:54 +00:00
Jacques Le Roux 59dcd48d1b This was a commit error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766443 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 10:27:47 +00:00
David E. Jones a415efaaa3 Based on feedback from Philippe Mouawad in Jira issue #OFBIZ-2315 changed the non-ThreadLocal maps to be synchronized
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766429 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:49:58 +00:00
David E. Jones ba72c5edf8 Reverted change to prefix all sequenced IDs; new change to ofbiz extensions of UEL from Adrian should fix issues there, and this isn't needed in general
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765067 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 07:15:45 +00:00
Scott Gray 7531687fdd OFBIZ-2259: Implemented test data rollback per test-suite using the GenericDelegator
Provides the following benefits:
1. Test data independence per component suite
2. Ability to run tests repeatedly without reloading the database
3. Continued database independence for the testing tools
4. The possibility of future improvements for controlling when data is rolled back (per unit test, group of unit tests within a suite or
even tree structured tests where data is partially rolled back before continuing)
5. The future possibility to export data changes resulting from a test run
6. The future possibility to verify a test result automatically based on the output of #4

The rollback currently doesn't catch changes resulting from async service calls and also doesn't rollback changes to SequenceValueItem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765057 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 06:01:36 +00:00
David E. Jones b502c14948 Small change to have a prefix for all sequenced IDs by default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764947 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 20:50:23 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Adam Heath 722aca2618 Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759234 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:56:58 +00:00
David E. Jones 8c423bc529 Moved EntityDiagramGroupData.xml from entityext to commonext to resolve framework dependency; a few other little cleanups as well
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757639 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 02:53:31 +00:00
Adam Heath 99cc621f3b Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757065 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:22:45 +00:00
Si Chen b63fc30e8c OFBIZ-1266 patch from Jeremy Wickersheimer to fix issue with IN FALSE on some queries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755320 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 17:00:38 +00:00
Jacques Le Roux f796e230d2 catch( => catch(
}else => } else

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Jacques Le Roux 639a784790 while( => while (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750998 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:38:03 +00:00
Jacques Le Roux fc6db9e886 if( => if (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750997 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:36:09 +00:00
Jacques Le Roux 13a934f823 In spirit of Adam's r749341 and following http://java.sun.com/docs/codeconv/html/CodeConventions.doc7.html#489
The idea is also that a lot of code is duplicated and then changed (copy/paste). Hence having a rightly formatted code help to keep it rightly formatted
1st (simple) step : ){ => ) { (I checked all occurrences but of course other pairs of eyeballs are welcome)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750993 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:31:13 +00:00
Adam Heath bea3dc678b Move some entity-specific code out of base, by making use of
javax.imageio.spi.ServiceRegistry, and META-INF/services.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749893 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 04:21:13 +00:00
Hans Bakker b021dfe8f6 improve error message, corrected creation of a primamry key sequence
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742842 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 04:06:32 +00:00
David E. Jones ebd5c3e78f Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00
David E. Jones 4d9382e887 Cleanup and pretty-up a bunch of log statements; moved some less helpful ones to verbose, combined some, and generally tried to make logs in various places more user friendly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741424 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:04:58 +00:00
David E. Jones da0f617961 Small change to make use-cache easier to parameterize; since cache conflicts with the iterator, have the use-cache setting override the use-iterator setting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741396 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 04:18:20 +00:00
Jacopo Cappellato 900ddd63cf Added ability to define entity-data-readers on the fly.
For example, if in a custom ofbiz-component.xml file you have:

<entity-resource type="data" reader-name="prod1" loader="main" location="data/ProdData1.xml"/>

you can load it running the ant task:

ant run-install-readers -Ddata-readers=prod1

even if the reader is not defined in entityengine.xml.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739782 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:43:05 +00:00
Hans Bakker 741e725f95 give an error message instead of NPE when a field is not found
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739188 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 06:02:31 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
David E. Jones b2ef316f79 Added more comments about seed vs seed-initial
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733627 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 05:19:55 +00:00
David E. Jones fd152ab960 Improved GenericValue.checkFks method so that is dummy fk value is created then it will inherit the values create/update stamps so it doesn't seem like newer data; should fix issue reported by Sam Hamilton about 2-way entity sync erasing data when dummy fks are needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733423 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 06:53:05 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
David E. Jones 0d32641db0 Fixed issue where the attribute value was used for two things, so where it means an entity generic value it is now value-field and an actual String or other type of value is just plain value
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729707 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 08:40:44 +00:00
David E. Jones 65b455ac9b The last batch of the major changes to make naming in simple-method attributes more consistent and simplify due to simpler tools; again see the Simple Method Cleanup Effort docs page for details on changes; some additional cleanups may be done based on feedback but this should be most of it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729704 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 08:17:47 +00:00
David E. Jones 461cde8932 These messages are logged as warnings but have the word error in them, so changing that to warning so hopefully we wont have multiple messages per week asking about it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727827 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 21:07:41 +00:00
Christian Geisert 48554c95b0 Fix for delegator.removeByAnd(entityName)
(it failed because of empty where condition)
Submitted by Marco Ruocco
See OFBIZ-1952


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727342 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 10:52:06 +00:00
Adrian Crum 03ae66d708 Implemented FlexibleMapAccessor.getInstance() in the remaining classes. Deprecated the FlexibleMapAccessor constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726260 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:25:33 +00:00
Hans Bakker 949345f912 adding solution for oracle problem running services
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@723336 13f79535-47bb-0310-9956-ffa450edef68
2008-12-04 14:22:44 +00:00
Jacques Le Roux 7f2cd293c4 I forgot a Luke Prentice's remark in https://issues.apache.org/jira/browse/OFBIZ-1045?focusedCommentId=12630930#action_12630930
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721904 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 22:12:46 +00:00
Jacques Le Roux 5a9c25deeb A patch from Luke Prentice "EntityOperator does not correctly construct SQL for BETWEEN clause" (https://issues.apache.org/jira/browse/OFBIZ-1045) - OFBIZ-1045
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721887 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 20:16:04 +00:00
Jacques Le Roux 6882531dcd Allow to use BETWEEN operator in widget action int he same way IN operator is used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@721839 13f79535-47bb-0310-9956-ffa450edef68
2008-11-30 16:13:00 +00:00
Jacques Le Roux 9279e3c7d8 To allow clear separation with real ERRORs when searching in log (lowercase is enough for that)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@713422 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 16:47:51 +00:00