Commit Graph
178 Commits
Author SHA1 Message Date
Adrian Crum 18b5135a31 Third pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490938 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 09:34:47 +00:00
Adrian Crum 964a1d956d Second pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490678 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 15:18:27 +00:00
Adrian Crum 934d162622 Small fixup for EntityEcaCondition.java accessor method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447638 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 09:02:24 +00:00
Adrian Crum 88d0052633 Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447114 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 01:13:10 +00:00
Adrian Crum 4ec75ee3c7 Small enhancements to Entity ECA classes: improve thread safety, eliminate null checks on fields that are never null, add some accessor methods, small code cleanups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447112 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 01:03:58 +00:00
Adrian Crum b0014ab3f6 Small enhancements to EntityEcaRule.java: parse <eca> element only once, improve thread safety, add some accessor methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447108 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 00:10:25 +00:00
Adrian Crum 6dec952bc7 EntityEcaSetField.java bug fixes: test for null on field that was never null, not thread-safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447107 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 00:01:52 +00:00
Jacques Le Roux 76da9bea54 A patch from Shi Jinghai for "Chinese localizations (zh) for trunk" https://issues.apache.org/jira/browse/OFBIZ-5134
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446849 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 08:08:38 +00:00
Scott Gray 206d159601 Avoid potential NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1400574 13f79535-47bb-0310-9956-ffa450edef68
2012-10-21 05:09:46 +00:00
Erwan de Ferrieres a41366e95f as suggested by Adrian, replacing @see by @Override in commit 1367751
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1369357 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 16:15:36 +00:00
Erwan de Ferrieres 6f363f4480 updating javadoc for Container#init
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1367751 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:25:26 +00:00
Jacopo Cappellato 955ae9eee1 A rather important refactoring of service related code:
* new factory interface for LocalDispatcher objects
* new factory implementation of GenericDispatcher
* new ServiceContainer container that initializes the factory (based on a configuration parameter)
* moved the getLocalDispatcher method out of GenericDispatcher and refactored (in a thread safe way) into ServiceContainer/GenericDispatcherFactory
* ServiceContainer also maintains the cache of LocalDispatchers that was managed by GenericDispatcher
* added code to ServiceContainer to deregister LocalDispatchers at shutdown: this finally fix the current code that was broken because the thread pool maintained by the JobPoller was never closed because of an issue with LocalDispatchers not being deregistered when not started by the ContextFilter
* change all code to call the ServiceContainer rather than GenericContainer to get a LocalDispatcher: now the implementation is no more directly referenced by calling code


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1364952 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 09:16:26 +00:00
Jacopo Cappellato ea54b4ff18 Added new getName method to the Container interface and to all the implementations; added info messages to inform when containers are started/stopped.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355854 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 07:32:07 +00:00
Jacopo Cappellato c386b7fc9a Added new "name" argument to the "init" method of the Component interface: now the name of the container (set by the xml attribute container.name) is passed to the init method and it is used to retrieve the container's configuration; before of this the container's name was hardcoded preventing the ability to define (and load) two containers (with different settings) of the same type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355652 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 06:32:00 +00:00
Jacopo Cappellato 068430fb8b Moved a few container definitions from the base/config/*-containers.xml files to their own component's ofbiz-component.xml file; this is a demonstration of the usage of the new ability to define component level containers; this is still experimental and there is room for improvements (and I am working on them and going to discuss a few details in the dev list) but this should already give a good idea of how we can remove redundancy from the various *-containers.xml files, remove dependencies between framework components and make the components self deployable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355466 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 16:43:51 +00:00
Hans Bakker bd16dfb598 split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352431 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:21:49 +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 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 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
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 1aa422773b DEPRECATION: framework: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343478 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:11:19 +00:00
Adam Heath 9e5f405a4d DEPRECATION: framework: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338403 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 20:59:54 +00:00
Adam Heath 64a9662c25 DEPRECATION: framework: findByPrimaryKey variants replaced with findOne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:17:55 +00:00
Erwan de Ferrieres 8e0642a575 Adding consistency in log messages, 3 chars between square brackets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337462 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 07:39:56 +00:00
Ashish Vijaywargiya e0971b304c Applied similar fix as we did on trunk r1300463.
On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-)

Bad use of Debug statement. On production system you will get false alarm that you are having error in code base although the resultant statement is only giving additional information instead of error message.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335927 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 05:28:17 +00:00
Adrian Crum d66f311eb7 Updated all Mini-language xml files to use the new schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328827 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 09:18:24 +00:00
Jacques Le Roux aa27c73baa A patch from Nicolas Malin "Label not loading on entityext components" https://issues.apache.org/jira/browse/OFBIZ-4717
The configuration directory config isn't loaded on the entityext's ofbiz-component.xml file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1293557 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 09:30:35 +00:00
Jacques Le Roux a3c423a3a3 A patch from Nicolas Malin "French uilabels for EntityExt components" https://issues.apache.org/jira/browse/OFBIZ-4716
French label in EntityExtUiLables.xml config file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1293556 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 09:27:02 +00:00
Hans Bakker f484f7b9d0 revert r1238954 some local changes were added
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238991 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:13:21 +00:00
Hans Bakker 204b9eb01a Wrong commit reverted in r1238991
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238954 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:22:12 +00:00
Hans Bakker f5970ffc66 add ant target for loading a file using a specific delegator and extend load message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1236044 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 06:01:03 +00:00
Jacques Le Roux 6eaf5b54e4 A slightly modified patch from Patrick Antivackis "Entity synchronization is skipping values to create, store and remove" https://issues.apache.org/jira/browse/OFBIZ-4601
assembleValuesTocreate, assembleValuesToStore and assembleKeysToRemove are called multiple times during a synchronization (depending on the syncSplitMillis and the time period to synchronized). There is in theses methods a check to see if at the next call, the method needs to look for values. This check depends only on entity without values at the current run, which is not enough

Solving issue described and fixing the assembleKeysToRemove that was using nextUpdateTxTime instead of nextRemoveTxTime

jleroux: functional changes from patch, only formatting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222105 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 09:06:18 +00:00
Hans Bakker 005916c7c1 another small error correction to the tenant load data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1174525 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 05:30:10 +00:00
Hans Bakker cea83127a0 correcting the ordering of loading the data for tenants
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1173994 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 08:28:59 +00:00
Hans Bakker b64da95ceb add 2 new tenant ant commands to load seed/demo data for a specific tenant only: './ant run-install-tenant -DtenantId' and './ant run-install-tenant-all' for all tenants in the tenant enttity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172989 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 06:23:02 +00:00
Jacques Le Roux 79df4f2ecb Typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144626 13f79535-47bb-0310-9956-ffa450edef68
2011-07-09 09:58:44 +00:00
Adam Heath 835a9ae7c1 FEATURE: Parsing of eecas.xml files are now done in parallel, using the
global thread pool.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141316 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 23:09:50 +00:00
Adam Heath d5d86ead4d OPTIMIZE: Don't do ecaCache merging in addEcaDefinitions, instead do it
once after everything it loaded.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141280 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 22:11:43 +00:00
Adam Heath 30569f1651 FEATURE: Expose several of the internal variables thru bean accessors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141279 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 22:11:38 +00:00
Adam Heath ee2f15f195 OPTIMIZE: Make these classes final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141278 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 22:11:32 +00:00
Adam Heath 6676048162 WHITESPACE: Do a bunch of whitespace transformative operations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1141276 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 22:11:20 +00:00
Marco Risaliti 49559c94dc Removed some javadoc warning (wrong param/return) into entityext component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1127256 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 20:13:33 +00:00
Marco Risaliti 538b0c5bbb Remove some unused variable or commented it in EntityPermissionChecker (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1076850 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 22:31:22 +00:00
Marco Risaliti aea7c7d82e Remove a compile warning/add some @SuprpressWarning("serial") in EntitySyncContext (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069079 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 20:45:32 +00:00
Marco Risaliti d2085687ff Remove a compile warning in EntityWatchServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069077 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 20:42:23 +00:00
Marco Risaliti b6d51c138b Add a @SuppressWarning("serial") in EntityEcaCondition/EntityEcaException/EntityEcaRule (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069076 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 20:40:57 +00:00
Marco Risaliti 3e3fed9669 Add a @SuppressWarning("serial") in EntityEcaAction (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069074 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 20:38:28 +00:00
Marco Risaliti 733d4d5207 Remove an unused private method of EntityDataServices instead of suppress it as unused (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068513 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 18:36:34 +00:00
Marco Risaliti 8c821fb62a Remove compilation warnings of an unused private method in EntityDataServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068134 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 21:06:18 +00:00
Marco Risaliti 591af0f270 Internationalization of return messages of java services of entityext/webtools component (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1066909 13f79535-47bb-0310-9956-ffa450edef68
2011-02-03 18:59:46 +00:00