Commit Graph
10472 Commits
Author SHA1 Message Date
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 82dfbe701e move service security data to seed data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350843 13f79535-47bb-0310-9956-ffa450edef68
2012-06-16 02:51:18 +00:00
Hans Bakker a64d64b80a Some security data is really seed data, added informational messages to indicate security data is not loaded when selected seed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350840 13f79535-47bb-0310-9956-ffa450edef68
2012-06-16 02:32:04 +00:00
Adrian Crum f6c8a9741a Deprecated MethodOperation.expandString and MethodOperation.rawString methods, moved their implementations from subclasses to the MethodOperation class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350375 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 19:05:13 +00:00
Adrian Crum 05e8237049 Mini-language API cleanup - removed ContextAccessor.java that is no longer used, and simplified the MethodContext.java API. With this commit all script behavior has been moved to the model classes, and all script state is contained in MethodContext.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350354 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 18:11:18 +00:00
Adrian Crum b44c8ee752 Overhauled Mini-language <property-to-field> element.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350337 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 17:00:53 +00:00
Adrian Crum 9538d837db Overhauled Mini-language <calculate> element.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350214 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 12:36:25 +00:00
Adrian Crum ada9b6e78a Fixed a bug in DateTimeConverters.java where the wrong converter was being selected. The bug was due to class detection in the java.util.Date hierarchy - so the fix uses explicit classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350081 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 03:32:18 +00:00
Adrian Crum cbf0c9bc0b Overhauled Mini-language <field-to-request>, <field-to-session>, <request-parameters-to-list>, <request-to-field>, <session-to-field>, <webapp-property-to-field> elements.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1349819 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 13:01:18 +00:00
Adrian Crum 405f59615f Overhauled Mini-language <order-map-list>, <set-calendar>, <string-append>, <string-to-list>, <to-string> elements. Added a format attribute to the <set> element - to be used for type conversions. Also removed deprecated StringToField class.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1349646 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 06:04:49 +00:00
Adrian Crum f299117fba Overhauled Mini-language <clear-field>, <create-object>, <field-to-list>, <first-from-list>, <list-to-list>, <map-to-map> elements.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1349182 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 08:16:03 +00:00
Adrian Crum 03271eee55 Overhauled Mini-language <set-current-user-login>, <set-nonpk-fields>, <set-pk-fields>, <store-list>, <store-value>, <transaction-begin>, <transaction-commit>, <transaction-rollback> elements.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1348620 13f79535-47bb-0310-9956-ffa450edef68
2012-06-10 16:21:41 +00:00
Jacques Le Roux ae3ba044a1 Closes "Deprecate ScreenWidgetViewHandler and move it to Attic" https://issues.apache.org/jira/browse/OFBIZ-4928
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1348429 13f79535-47bb-0310-9956-ffa450edef68
2012-06-09 15:43:42 +00:00
Jacques Le Roux 5cf7578d86 Small improvement:
* Adds "cross-redirect"
* Improve doc for 
  ** request-redirect
  ** request-redirect-noparam
  ** url
  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347762 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 19:25:30 +00:00
Jacopo Cappellato a610e70049 As discussed in the dev list, removed the experimental jcr component; its development will continue in the proper branch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347478 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 08:14:28 +00:00
Jacopo Cappellato 1555db10e1 Set cache flag for findByAnd method calls in PreferenceServices; improved logic to avoid to run the same query twice when user is not passed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347442 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 07:36:47 +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
Hans Bakker 8f0c926dbb allow the fop configuration to be different between tenants
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345849 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 07:33:24 +00:00
Jacques Le Roux e4432d69e2 We agreed on that on dev ML: easier to use
GroovyUtil.runScriptAtLocation()
than 
executeScript()
In case of error or debugging

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345840 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 06:07:19 +00:00
Adrian Crum 0d892adf1f Overhauled Mini-language <find-by-primary-key>, <get-related>, <get-related-one>, <make-next-seq-id>, <make-value>, <order-value-list>, <refresh-value>, <remove-by-and>, <remove-list>, <remove-related>, <remove-value>, <sequence-id> elements. Also, consolidated NowDateToEnv.java and NowTimestampToEnv.java into Now.java.
The overhaul includes: removing unnecessary object creation, make the class thread-safe, add syntax validation, and misc code cleanups.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345652 13f79535-47bb-0310-9956-ffa450edef68
2012-06-03 11:13:32 +00:00
Jacques Le Roux 8ac851b7bc Forgot to commit some files at r1345379 (A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345533 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 17:15:37 +00:00
Jacques Le Roux 2dcc132c41 A patch from Ankit Jain "Replaces != nullpattern in ftl file by ?? (which replaces deprecated ?if_exist)" https://issues.apache.org/jira/browse/OFBIZ-4916
jleroux: I simply removed some useless ?? when ?has_content was enough. I also found 3 other cases in returnPolicy.ftl that I fixed the same way than Ankit (using ??)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345532 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 17:10:52 +00:00
Jacques Le Roux e8ded2674d A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759
fixed few issues, 3 remains, Tri will have to choice

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345379 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 22:32:57 +00:00
Jacopo Cappellato d7a92cea27 Improved error messages that notify when a service's time to run was over some given threasholds.
Refactored code (simplified and removed duplicated block) that logs, in these cases, the output of the service; now the service output is only printed in verbose mode (of course if the other conditions hold true).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345005 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 08:12:46 +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
Adam Heath 27e88264a0 FIX: Prefix all log file names with ${ofbiz.home}, so when code is run directly from a subdir(when doing api testing), the logs are still placed at the top level. Previously, you'd end up with $PWD/runtime/logs scattered all around.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1344771 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:23:21 +00:00
Jacopo Cappellato fcdf07a0e6 Improved code that manages the cache:
* protected some UtilCache objects (static fields) by making them private and final

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343815 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:18:02 +00:00
Jacopo Cappellato a203b75d3d Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343792 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 15:52:14 +00:00
Jacopo Cappellato 9d80b40c8d Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343785 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 15:40:17 +00:00
Jacopo Cappellato 06267026e8 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization
* refactored code to be more inline with best practices for thread safefy: removed the method readNotificationGroups() (that was only used by the same class in one place) that was called with a lock held and inlined its logic into the colling method; this simplifies thecode and its readability



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343783 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 15:37:03 +00:00
Jacopo Cappellato 36737ad059 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343729 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:01:45 +00:00
Jacopo Cappellato 4eb06e3e00 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343728 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:57:19 +00:00
Jacopo Cappellato 126a9d40d5 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343727 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:52:32 +00:00
Jacopo Cappellato 2130bc14e8 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343724 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:46:49 +00:00
Jacopo Cappellato e316284fc9 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* replaced some put with putIfAbsentAndGet to slightly simplify the code



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343717 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:33:29 +00:00
Jacopo Cappellato 9fe920a3f7 Improved code that manages the cache:
* removed unnecessary synchronization
* protected the UtilCache object (static field) by making it private and final
* replaced non atomic containsKey+put+get with get + putIfAbsentAndGet
* replaced containsKey + null check + get with get + null check



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343692 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 12:10:54 +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
Adam Heath e3c2dac101 DEPRECATION: framework: GenericValue.getRelated(ByAnd|OrderBy)(|Cache)
replaced by the single getRelated variant.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343527 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:20:26 +00:00
Adam Heath fb698e509b Deprecate all GenericValue.getRelated and GenericValue.getRelatedCache,
and add a version that takes a cache parameter.

Continuing the simplication of the entity api, this is the final step to
replacing all the GenericValue.getRelated(and cache versions as well)
with a variant that takes a boolean useCache parameter.

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

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

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

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

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

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343526 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:20:19 +00:00
Adam Heath 83d37a796b DEPRECATION: framework: GenericValue.getRelated/getRelatedCache variants replaced with a single getRelated variant that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343509 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:17:17 +00:00
Adam Heath 21c0cef59e DEPRECATION: Add a new GenericValue.getRelated() variant that takes a
boolean useCache parameter.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343508 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:16:57 +00:00
Adam Heath fb3e3bb557 Deprecate all Delegator.getRelated and Delegator.getRelatedCache
and add a version that takes a cache parameter.

This Continuing the simplication of the entity api, this is the final step to
replacing all the GenericValue.getRelated(and cache versions as well)
with a variant that takes a boolean useCache parameter.

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

Delegator.getRelatedCache(String, GenericValue) is replaced by
Delegator.getRelated(String, Map, List, GenericValue, boolean).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343507 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:16:51 +00:00
Adam Heath c9eaf52fc9 FEATURE: Add new Delegator.getRelated that takes a boolean useCache
parameter; all internal calls from GenericDelegator and GenericValue
have been modified to use the new method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343506 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:16:42 +00:00
Adam Heath 5bc50ed5f2 Deprecate GenericValue.getRelatedOne/getRelatedOneCache, and add
a version that takes a cache parameter.

Yet again, another simplication of the delegator api.  This replaces
all simple getRelatedOne type methods with a single version that takes
all possible arguments.

GenericValue.getRelatedOne(String) is replaced by
GenericValue.getRelatedOne(String, boolean).

GenericValue.getRelatedOneCache(String) is replaced by
GenericValue.getRelatedOne(String, boolean).

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