Commit Graph
120 Commits
Author SHA1 Message Date
Scott Gray d4e34a244a Fixed a ton of pointless ServiceUtil.returnError(...) calls, I've left the ones that aren't inside services for now since they require a little more thought to fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935164 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 10:28:18 +00:00
Adrian Crum 7a73dc39a1 Fixed broken compile.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930740 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:41:27 +00:00
Adam Heath 9a1b52fc36 Don't always recreate the nameSet each time; instead, make it a global
static.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930738 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 19:08:52 +00:00
David E. Jones 8e3edae07f Merged multitenant20100310 branch into the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927271 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 04:42:26 +00:00
Adam Heath b17eb127ec Fix trailing whitespace, and mixed tab/space at the beginning of lines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899812 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:00:23 +00:00
Adam Heath 93cc17b5b0 Remove a bunch of wildcard imports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894106 13f79535-47bb-0310-9956-ffa450edef68
2009-12-27 19:54:58 +00:00
Adam Heath 18d0ceeaf9 Remove most docs targets, they are all the same anyways.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894031 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:28:48 +00:00
Adam Heath 1c269fc012 Convert all javadoc calls to use fileset instead of sourcepath; this
allows excludes to be processed correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894030 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:24:20 +00:00
Adam Heath 56dac0bf9e Add a classes target to common.xml, and switch most build.xml to use it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894024 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:16:56 +00:00
Adam Heath 47b0a876ed Switch all javac15 to javac16.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894022 13f79535-47bb-0310-9956-ffa450edef68
2009-12-26 22:12:04 +00:00
Jacques Le Roux 569a4afeea Some cleaning related to isEmpty
* remove duplicate ()
* remove casts no longer needed

I'm doing these last tasks around isEmpty and isNotEmpty mostly to be sure that nothing has slipped in. Despite I have been very careful, I prefer double check.

+ one typo in ofbizSelenium help (not sure this file is used yet though, seems to be missing some parts which are commented out, for now I guess)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:08:16 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Jacques Le Roux 99bcbcc08a Fixes/enhances the help description, from Cimballi's comment on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-15 16:08:31 +00:00
Jacques Le Roux 437de8786a A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 3 while loops by for loops

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833715 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 17:10:43 +00:00
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 05f7b61a95 Generics markup for service method signatures.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823313 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:39:32 +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
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
Jacques Le Roux 7befd1d25e no tabs but 4 spaces in code files (*.ftl, *.gro*, *.java, *.xml)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804935 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 11:01:25 +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
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
Adrian Crum e4ee374a66 Conversion from java.util.Calendar to com.ibm.icu.util.Calendar. I didn't convert the Cloud component - I wasn't sure if the Calendar class was being passed through SOAP.
OFBiz users who have modifications or add-ons can make the same substitution to get them to compile.

I'll let the dust settle from this, then I'll add the user-selected calendar capability.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792987 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 15:39:21 +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
Andrew Zeneski 7b2d865ab7 added command line options to the install directive which drops/re-creates indices/fks/pks and adjusts column widths; updated the -install -help option to detail these changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@787287 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 15:56:54 +00:00
Hans Bakker 9dec93e375 show full eca location in startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785512 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 08:48:02 +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
Jacques Le Roux f29b4787b4 As suggested by David, these lines are not needed anymore
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771090 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 17:19:37 +00:00
Adrian Crum 9a753b9865 Fixed a problem where service definitions were using "GenericValue" as attribute types, but that threw exceptions because the service definitions needed the full class name - "org.ofbiz.entity.GenericValue". The problem was reported in https://issues.apache.org/jira/browse/OFBIZ-2268 and https://issues.apache.org/jira/browse/OFBIZ-2311.
I checked the commit logs and I don't see what changed to cause these services to stop working, so I took the shotgun approach and changed all occurrences of GenericValue service attributes.

If anyone has a better solution, please feel free to revert this commit and change it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765864 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 06:33:43 +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
Jacques Le Roux 5dd48e08bf Fix a bug (data reader move not done)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 12:30:31 +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
Adam Heath 1f45b2448a Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759233 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:56:29 +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 c43fd04b17 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757070 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:23:34 +00:00
Jacques Le Roux 274ee4287e entityext component
Following best practice.
Changed location="org/ofbiz/......... to location="component:// in the service location attribute.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755947 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 11:54:08 +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 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
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
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 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
Jacques Le Roux 94225b1a34 Fix issues with now-timestamp-to-env and sequence-id-to-env : their factories names where missing in org.ofbiz.minilang.method.MethodOperation$Factory file
also
<sequenced-id-to-env(.*)env-name => <sequenced-id$1field
<now-timestamp-to-env(.*)env-name => <now-timestamp$1field
both on *SimpleMethods*.xml, *events*.xml, *formula*.xml, *services*.xml, *tests*.xml (previously I only used *events*.xml, *services*.xml, but I guess it's not a big deal for now)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730433 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 17:47:37 +00:00
Jacques Le Roux 0272162a99 revert both
sequenced-id(.*)field to <sequenced-id-to-env$1env-name
<now-timestamp(.*)field => <now-timestamp-to-env$1env-name
Something is wrong with these 2 tags (inconsistency between xsd and java, I'll look at it)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730397 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 13:59:08 +00:00
Jacques Le Roux dbc4228779 <now-timestamp-to-env env-name => <now-timestamp field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730194 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:25:18 +00:00
Jacques Le Roux c1dd5bc296 <remove-value value-name => <remove-value value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730191 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:21:47 +00:00
Jacques Le Roux 79f471e380 <sequenced-id-to-env(.*)env-name => <sequenced-id$1field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730189 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:19:35 +00:00