Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux c46b891ca8 Removes dead code, organize imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1363689 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 09:09:38 +00:00
Jacopo Cappellato 59aed51931 Removed some Geronimo/RMI specific code that was causing issues during system shutdown (several attempts to shutdown the RMIContainer); the code had also some tweaks that made the classes less readable; the static containerMap in ContainerLoader was breaking thread safety because the put operations were not atomic with the related add operations of the loadedContainers list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1363656 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 05:41:27 +00:00
Jacopo Cappellato 0b2643c740 Small improvement: better log messages during system shutdown.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1363655 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 05:33:35 +00:00
Adrian Crum 73f645bb43 Revert some local modifications that were unintentionally committed in rev 1360283.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362889 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 11:34:41 +00:00
Adrian Crum 3df18870cc Some trivial changes in the entity config classes - mostly JavaDocs, remove unnecessary calls to UtilValidate. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362790 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 07:15:45 +00:00
Adrian Crum ca716388f8 Added a new attribute to the entity definition - "redefinition" - which will suppress "Entity is defined more than once" warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 05:42:24 +00:00
Jacopo Cappellato 32165e83a7 Trivial cleanup: removed an unnecessary private field.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362492 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:41:27 +00:00
Jacopo Cappellato 2176d521e2 Removed an unnecessary synchronized block (because it was using as a lock the "this" instance and it was already inside of a synchronized method).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362485 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:32:16 +00:00
Jacopo Cappellato eed72271fb Changes to fix some thread unsafe code in the JobManager constructors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362469 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 12:28:24 +00:00
Adrian Crum 32697a7440 Fixed a bug in Mini-language <set> element validation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362445 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 11:09:13 +00:00
Jacopo Cappellato 8693969ac4 Refactored the very old code in the org.ofbiz.service.job package to leverage the Executor framework of java.util.concurrent rather than relying on ad-hoc synchronization and thread management: the new code is simpler, smaller and it is now easier to review and change the execution policy; two attributes of service-config.xsd have been deprecated as they are not used in the new version ("jobs" and "wait-millis").
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362422 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 09:20:42 +00:00
Jacopo Cappellato 6137a3bf47 Minor change to set a consistent naming format for all the threads started by OFBiz.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362417 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 09:05:33 +00:00
Adrian Crum 60c0ab03d6 Bug fix in ServiceDispatcher.java: restore GenericDelegator state before throwing exception. https://issues.apache.org/jira/browse/OFBIZ-4967
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361958 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:58:58 +00:00
Jacopo Cappellato 78a8738a8f Minor change to use the Runtime class to get the number of processors rather than MxBeans.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361955 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:54:27 +00:00
Jacopo Cappellato 16ce8dcb0f Removed no more used folder/image
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361951 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:31:06 +00:00
Jacques Le Roux 188353ef90 Tiny improvement in doc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361946 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:16:57 +00:00
Adrian Crum 7c5c1aa4a8 Fixed semaphore handling issues in ServiceDispatcher.java. https://issues.apache.org/jira/browse/OFBIZ-4967
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361944 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:05:14 +00:00
Adrian Crum b6fb21c822 Removed ugly checkDebug method from ServiceDispatcher.java. https://issues.apache.org/jira/browse/OFBIZ-4967
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361931 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 08:12:16 +00:00
Adrian Crum fe73aed662 Small cleanup in properties schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361922 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 07:16:35 +00:00
Adrian Crum 115e96c2f6 New feature - performance metrics. Web application integration.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361727 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 16:11:44 +00:00
Adrian Crum 43a9cbef12 New feature - performance metrics. Service engine integration.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361725 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 16:10:50 +00:00
Adrian Crum cfc9f619c3 New feature - performance metrics. Webtools UI.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361724 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 16:09:26 +00:00
Adrian Crum 2a0058a04b New feature - performance metrics. Basic code and services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361722 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 16:07:59 +00:00
Adrian Crum 7cfc77c5fd Removed webtools servlet context parameters that were pointing to non-existent files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361476 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 06:55:14 +00:00
Jacopo Cappellato 3aa85842f2 Moved the "birt" component out of framework to specialpurpose; moved all the birt reports from the applications to the birt component itself, where the application webapps are overriden to inject the reports; the end result is the same but since all these birt reports are simply a proof of concepts that cannot be used in production (for example they use hardcoded userlogin for authentication) the birt component should be probably disabled by default (but this will be discussed in the dev list).
Now it will be very easy to extract the birt component (for OFBiz Extras) or to disable it when deploying to production or when interested in sparing some hardware resources. I did some cursory tests but since the work has been challenging and rather complex I would appreciate testing help and also reviews to finds chunks of code that I could have missed and that could be moved out as well.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361130 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 09:48:32 +00:00
Adrian Crum b8b8a5fa49 Fixed booleanExpr type in Mini-language schema. Reported by Olivier on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361073 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 07:56:04 +00:00
Jacques Le Roux 870bf35ef6 Rhaaa, I had a svn changelist for OFBIZ-3913 pending and did not notice those changes for
r1356471 Housekeeping of jar files"  https://issues.apache.org/jira/browse/OFBIZ-4833
Moves Minerva and XAPool to Attic

Keeping changelists with no changes in it is a bad things, I should not forget that :/

Fortunately not biggie at all

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360902 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 20:04:41 +00:00
Jacopo Cappellato d743e3853b Replaced usage of java.util.Timer with the more modern and reliable ScheduledThreadPool executor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360691 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 14:16:43 +00:00
Jacopo Cappellato 42db3b8ca8 Removed "loader" element and all supporting code that I had recently introduced and that it is no more needed now that I have completed (in rev. 1360637) the support to set loader profiles in the startup properties.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360681 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 13:50:25 +00:00
Jacopo Cappellato 20b343d1f5 Unified all the different variants of *-containers.xml files into one; this has been made possible because now you can declare the container loaders in the startup properties; also moved some container definitions from base/config to the proper component.
It is now very easy to control the way containers are loaded.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360637 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 11:34:41 +00:00
Adrian Crum a17298a06e Removed unused "authz" security code - https://issues.apache.org/jira/browse/OFBIZ-4839.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360283 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 16:34:26 +00:00
Adrian Crum f5c4810955 Documentation work on the Mini-language schema to make the schema documentation and the Mini-language Reference the same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1359600 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 11:06:39 +00:00
Adrian Crum eaaff20b2e Small change to Mini-language <set-calendar> element - removed the set-if-empty attribute, which is unnecessary because a Timestamp will never be empty.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1359599 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 11:03:56 +00:00
Sascha Rodekamp 17db70f01a fixed a js bug in the lookups - worng link parsing if there's a slash '/' in the data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1358988 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 09:13:54 +00:00
Jacques Le Roux 88f88ba007 A patch from Daniel Riquelme "Not getting right behavior of use-when when using in multi" https://issues.apache.org/jira/browse/OFBIZ-4932
The problem is that on multi forms the bshInterpreter gets pushed to higher levels on the context stack when iterating the form rows.
What is intended in the code is to reset the bshInterpreter (this.resetBshInterpreter(context) for each row iteration, this reset translates into a key object being removed from context, this context is stored in a stack data structure. The removal assumes the value will always be at level 0, yet what happens is that the value resides at a higher level.
The fix is to perform the removal prior to context modification, this way the bshInterpereter object would be at level 0 upon removal.

jleroux: since the BshInterpreter is reseted just after with localContext this should not have any bad side effects

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1358735 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 13:15:56 +00:00
Sascha Rodekamp c46513daa0 Lookup filed with target-parameter attribute set cannot be displayed (https://issues.apache.org/jira/browse/OFBIZ-4950) A patch from Leon: if <lookup> field has attribute "target-parameter" set, then there's javascript error in front end and lookup icon disappears.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1357098 13f79535-47bb-0310-9956-ffa450edef68
2012-07-04 06:24:57 +00:00
Adrian Crum 6d987730ef Mini-language JavaDocs and added missing @Override directives.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356836 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 17:08:16 +00:00
Adrian Crum f34a9f1881 Added some Mini-language unit tests. These only test the <assert> and <check-errors> elements for now. More to come later.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356762 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 14:44:13 +00:00
Adrian Crum fc32bb4cde Trivial, non-functional changes to SimpleMethod.java: JavaDocs, trace messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356761 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 14:41:57 +00:00
Adrian Crum 237abc3592 Added trace support to Mini-language <assert> and <check-errors> elements. Also fixed a bug in the <assert> element where it created an error list when there were no errors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356759 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 14:40:12 +00:00
Adrian Crum ba24e91346 EmptyCondition.java bug fix - fixed the toString method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356758 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 14:37:38 +00:00
Adrian Crum df13fee9c3 SimpleMethod.java bug fix - make sure the exec method always returns a non-null result when run as a service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356707 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 12:59:17 +00:00
Jacques Le Roux feecb15093 "Housekeeping of jar files" https://issues.apache.org/jira/browse/OFBIZ-4833
Moves Minerva and XAPool to Attic

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356471 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 20:29:54 +00:00
Adrian Crum cc2d6989e5 Overhauled the Mini-language schema. The schema elements have been reorganized to match the order in the Mini-language Reference (https://cwiki.apache.org/OFBADMIN/mini-language-reference.html) - which makes it easier to keep the two documents in sync.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356263 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 14:36:12 +00:00
Adrian Crum db6b939afe Some code optimization work on Calculate.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356245 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 14:23:33 +00:00
Adrian Crum dfb74cc196 Fixed some bugs in EntityFinderUtil.java:
1. LimitRange and LimitView classes treated ELI and List indexes the same - causing inconsistent results because ELI indexes are one-based and List indexes are zero-based.
2. LimitRange and LimitView classes returned different results at the end of the list depending on whether an ELI or List was being used.
3. LimitView class view index calculation was wrong.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356201 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 12:16:36 +00:00
Adrian Crum 83c60b16da Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356168 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 10:33:49 +00:00
Jacopo Cappellato 9ccc542a28 Moved "naming-container" to the base component configuration file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356087 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:28:55 +00:00
Jacopo Cappellato 0b16982849 Moved rmi-dispatcher container definition to the service component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356074 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 05:55:25 +00:00
Adrian Crum 523436cb76 Some optimizations in EntityFinderUtil.java:
1. Made the Condition implementations immutable and thread-safe.
2. Moved operator lookup from run-time to parse-time.
3. Removed unnecessary calls to UtilValidate.
4. Replaced LinkedList with ArrayList.
5. Optimized code in the ConditionExpr.createCondition method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356024 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 20:54:23 +00:00