Commit Graph
75 Commits
Author SHA1 Message Date
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
Jacques Le Roux 38456812e0 <field-to-result(.*)field-name => <field-to-result$1field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730116 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:14:23 +00:00
Jacques Le Roux e01e175266 <entity-one(.*)value-name => <entity-one$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730111 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:07:14 +00:00
Jacques Le Roux e25c1d9c67 <create-value(.*)value-name => <create-value$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730108 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:01:09 +00:00
Jacques Le Roux 4ed4fcf8b9 same but with non
<set-pk-fields(.*)map-name => <set-pk-fields$1map
<set-pk-fields(.*)value-name => <set-pk-fields$1value-field
I was not very clever on this one ;)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730107 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:59:10 +00:00
Jacques Le Roux ec8447c72a <set-pk-fields(.*)map-name => <set-pk-fields$1map
<set-pk-fields(.*)value-name => <set-pk-fields$1value-field

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730104 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:55:26 +00:00
Jacques Le Roux 288c384783 <find-by-primary-key(.*)map-name => <find-by-primary-key$1map
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730101 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:51:58 +00:00
Jacques Le Roux 0f82bfeb3d <find-by-primary-key(.*)value-name => <find-by-primary-key$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730100 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:49:32 +00:00
Jacques Le Roux 5e38ebc0ea <make-value(.*)value-name => <make-value$1value-field
r730090 was naive fix also <iterate list-name and entry-name to <iterate list and entry

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730098 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:28:24 +00:00
Adrian Crum 7692f1851b Updated the job scheduler to use temporal expressions. Recurrence rules still work - so there is no rush to change existing installations.
I moved the recurrence count to the job sandbox. Keeping counters in the recurrence info was a bad idea. Any other code that relied upon counters in recurrence info will have to be redesigned to use temporal expressions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@695695 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 00:10:17 +00:00
Adrian Crum ead3169d5c FlexibleStringExpander refactor.
1. Improved parsing logic - the entire expression is pre-parsed now.
2. Factory method stores parsed expressions in the cache.
3. Single null/empty expression instance - saves on memory.
4. Class names and variable names shortened to reduce object size.
5. Small performance improvements.

The expression cache is set up with no limit. We'll have to see if that needs to be changed. Larger installations might need to limit the expression cache size.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687422 13f79535-47bb-0310-9956-ffa450edef68
2008-08-20 18:50:04 +00:00
Jacques Le Roux e7905f2c8c Fix the anti-pattern
if (* != null && *.size() > 0) { 
where * is a variable name (String or Collection). Rewritten to
    if (UtilValidate.isNotEmpty(*)) {

Done with Eclipse regex replace feature with
search = if \((\w+) *!= *null *&& *(\w+)\.size\(\) *> *0\) *\{
replace = if (UtilValidate.isNotEmpty($1)) {

And of course some hand-work for imports and cleaning. I compiled and tested with ant run-tests

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686591 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 07:47:18 +00:00
Adam Heath e410552cc9 No longer *copy* the extra support files into the classes dir;
instead, just add them straight to the final jar.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685934 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 15:08:14 +00:00
Adam Heath 99bf46f085 Switch most new File(string_with_path_separator) calls to
FileUtil.getFile.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@682266 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 06:08:42 +00:00
Adam Heath b6a1ae5e5e Another minor optimization; no longer need to specify classpathref in
all the build.xml files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@681935 13f79535-47bb-0310-9956-ffa450edef68
2008-08-02 03:41:46 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
David E. Jones 204d775174 More entitygroups gone, all of framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672910 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 20:49:10 +00:00
Adam Heath 89249b2432 Generics and java1.5 features.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672897 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 20:16:55 +00:00
David E. Jones 3797437015 Changed to support a default-group-name per delegator, so that they don't have to specified for each entity; also some cleanups of the DelegatorInterface to remove deprecated stuff and add some new things, I still don't think that needs to exist but oh well
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672821 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 17:04:43 +00:00
Adam Heath 18391f98a9 The build.xml files are now much smaller and simpler; they reuse a
few global definitions.  1585 lines removed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672657 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 18:39:36 +00:00
Scott Gray 5e401fcd53 Updated all simple methods to use the new attributes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667748 13f79535-47bb-0310-9956-ffa450edef68
2008-06-14 06:03:12 +00:00
David E. Jones 82df3529e2 More cleanups of now deprecated constructors and what what
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660840 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 07:16:36 +00:00
David E. Jones b9d6f8b524 Changed EntityExpr and EntityFunction subclasses to use the factory instead of constructor pattern, plus moved EntityExpr to EntityCondition factory methods; a number of EntityExpr cleanups, but many more to go
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660812 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 05:20:09 +00:00
David E. Jones 3543d6abe3 Changed the way EntityCondition sub-classes work so they use the javolution Reusable class for recycling objects; now all conditions should be created using the factory methods on the EntityCondition object instead of the direct constructors; there is a small variety of classes available there now for ease of use; also changed a bunch of old code to not use the deprecated constructors; note that still need to do a pass similar to this on EntityExpr
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660780 13f79535-47bb-0310-9956-ffa450edef68
2008-05-28 01:58:46 +00:00
Scott Gray 153653615b Removed the rest of the calls to deprecated GenericDelegator methods, except for the findListIteratorByCondition which takes a DynamicViewEntity as a parameter not sure what to do about that one.
There's still all the bsh files to check though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655235 13f79535-47bb-0310-9956-ffa450edef68
2008-05-11 03:29:04 +00:00
Scott Gray 0792342f2a Removed more calls to deprecated GenericDelegator methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655016 13f79535-47bb-0310-9956-ffa450edef68
2008-05-10 06:24:19 +00:00
David E. Jones 329631a4b5 A whole bunch of cleanups to use newer and more consolidated delegator find methods; still lots of deprecation warnings, bots of deprecation warnings but this is a first pass, and things still run as before
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@653029 13f79535-47bb-0310-9956-ffa450edef68
2008-05-03 09:40:51 +00:00
David E. Jones ccb4689365 Added entity set for fixed asset, was missed originally
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@639473 13f79535-47bb-0310-9956-ffa450edef68
2008-03-20 21:43:26 +00:00
Jacopo Cappellato 920dbb91c6 Added missing service and screen definitions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@638697 13f79535-47bb-0310-9956-ffa450edef68
2008-03-19 03:58:36 +00:00
David E. Jones 999834c2e8 Fixed incorrect package reference for the config entity group
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@635428 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 04:09:23 +00:00
David E. Jones f2bfb2e3e4 Some cleanups and fleshed out the detail and technical entity sets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@632727 13f79535-47bb-0310-9956-ffa450edef68
2008-03-02 09:18:04 +00:00
David E. Jones 3d8d9bff51 A start on the entity groups for detailed diagrams
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631869 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 06:37:42 +00:00
David E. Jones b58911fa4a Fixed exporting entity eomodeld by entityGroupId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631078 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 03:32:50 +00:00
David E. Jones 69f2a3beff Some cleanups and additions to top level entity diagram groups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631073 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 03:10:14 +00:00
David E. Jones bef729776b Added entity group definition file for some high level diagrams of top-level entities throughout the project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631072 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 02:53:28 +00:00
David E. Jones e8d61ef0b7 Added initial implementation of entity EOModelBundle export, including various utility methods and refactoring and such
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@630279 13f79535-47bb-0310-9956-ffa450edef68
2008-02-22 18:17:21 +00:00
David E. Jones 80acfcb716 Fixed tabs to spaces; it is evil that eclipse comes with this sort of default...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628703 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 12:34:08 +00:00
David E. Jones eb542c49ad A few misc cleanups/improvements; some generics stuff, use FastMap/List, convenience methods for meta data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628700 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 12:21:13 +00:00
David E. Jones edafa04bd7 Added seed-initial data set and changed all JobSandbox seed data entries to be in this instead; allows for reloading of seed data withows for reloading of seed data without redundant jobs scheduled
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627824 13f79535-47bb-0310-9956-ffa450edef68
2008-02-14 18:26:44 +00:00
Hans Bakker 9d4f24a0d3 improved implementation of rev 616995 as suggested by david.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@617966 13f79535-47bb-0310-9956-ffa450edef68
2008-02-03 09:14:56 +00:00
Hans Bakker 67a5ebe862 Entity sync did not work for deletes because the timestamps of the deleted record where also checked to be the same as the original record, this however was never true, even not after the copy of the complete database. Now the deleted record is only checked for the primary key.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@616995 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 03:59:59 +00:00
David E. Jones 75c26763e5 Fairly significant update to correct a long-standing problem; reverted ByteWrapper back for backward compatibility, and then replaced all use of ByteWrapper with java.nio.ByteBuffer; the main point is to both store only the byte[] data in the database and not a serialized object containing the byte[], and at the same time be able to read the old ByteWrapper objects, and there is a service to read and update all old data to be plan bytes instead of wrapped in a serialized object; this includes changing the java-type for blob fields to be java.sql.Blob to greater compatibility and flexibility, ie you can either set a plain byte[] or you can pass in a Blob object to be persisted, you can also get both as get returns java.sql.Blob, but getBytes always returns the byte[], converting as needed; this is tested a fair amount, but obviously needs to be watched as it is new code
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@587433 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 09:52:49 +00:00
Adam Heath c69096e93a Switch as much as possible from StringBuffer to StringBuilder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585805 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 02:56:02 +00:00
Adam Heath 2ff7a8a575 Make use of the single-arg variants of makePK/makeValue, removeAll,
and clearCacheLine


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585803 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 02:46:57 +00:00
Adam Heath 2a86a44888 Allow multiple files to be installed on the command line, by splitting
on comma.  Closes https://issues.apache.org/jira/browse/OFBIZ-1284


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585645 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 19:46:52 +00:00
David E. Jones 2e96095d1c A few extensions to the watchEntity service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@570297 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 03:23:23 +00:00