Commit Graph
7103 Commits
Author SHA1 Message Date
Adrian Crum 2d651e0f6d Changed some information-only logging from WARN to INFO.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464001 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 13:29:44 +00:00
Jacopo Cappellato e66239876f Small improvements to error log messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463885 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 08:56:31 +00:00
Adrian Crum fa4e931206 Log message cleanup in ServiceDispatcher.java. Removed confusing text about services taking too long.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463863 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 07:57:24 +00:00
Adrian Crum 24f64fe28b Log message cleanup in ModelReader.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463859 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 07:55:02 +00:00
Adrian Crum 19e3b14945 Fixed bug in BaseUnitTests.java where the original debugging levels were not restored.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463856 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 07:53:11 +00:00
Jacques Le Roux 7c323b902d A refactored patch from Leon for "Bug introduced by OFBIZ-4769, it makes <entity-one> failed if the context contains incorrect data" https://issues.apache.org/jira/browse/OFBIZ-5148
How to reproduce:
1. open "https://demo-trunk.ofbiz.apache.org/partymgr/control/editpartygroup?create_new=Y" (try to create a new party group)
2. input any words in group name field, input any "incorrect" non-digits characters (e.g. "abcd" blah blah) to field "Annual revenue"
3. click save
It leads to an "exception" page instead of original input form with error message.

I digged some codes and found it's related to r1426231 commit (of OFBIZ-4769).

jleroux: the logic of code seemed good to me, I just refactored the cod a bit (in a previous refactoring attempt I missed the point that parametersObjExists might not be present. This new code is a simplified version of what does setAllFields internally. The PK fieldValues are set before being possibly overriden by context values. There is no Map casting. I tested the previous issues, all are resolved. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462948 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 13:41:34 +00:00
Adrian Crum 909bed712c Some optimization work in UtilURL.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462942 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 13:12:20 +00:00
Jacques Le Roux 0e341837a5 Revert r1462902, there are 3 tests failing and I have not the time to look at it yet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462912 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 10:27:41 +00:00
Jacques Le Roux a4d71dd61e A refactored patch from Leon for "Bug introduced by OFBIZ-4769, it makes <entity-one> failed if the context contains incorrect data" https://issues.apache.org/jira/browse/OFBIZ-5148
How to reproduce:
1. open "https://demo-trunk.ofbiz.apache.org/partymgr/control/editpartygroup?create_new=Y" (try to create a new party group)
2. input any words in group name field, input any "incorrect" non-digits characters (e.g. "abcd" blah blah) to field "Annual revenue"
3. click save
It leads to an "exception" page instead of original input form with error message.

I digged some codes and found it's related to r1426231 commit (of OFBIZ-4769).

jleroux: the logic of code seemed good to me, I just refactored the cod a bit. This new code is a simplified version of what does setAllFields internally. The PK fieldValues are set before being possibly overriden by context values. There is no Map casting. I tested the previous issues, all are resolved. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462902 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 09:20:30 +00:00
Ashish Vijaywargiya e5c7297a41 Adding Method to retrieve form-label from model parameter object in freemarker. Thanks Ankush for providing method for this missing functionality.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462265 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 19:15:50 +00:00
Ashish Vijaywargiya 1ed8f39ed2 Applied bug fix from jira issue - OFBIZ-5165 - Broken renderLabel functionality of screenfop view handler.
If we use label inside widget tag then renderLabel macro skip the label rendering due to wrong condition check.
-- Corrected the conditions for label rendering.
-- Also replaced fo:inline with fo:block as fo:inline can't render directly.
Thanks Deepak.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462257 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 18:51:26 +00:00
Jacopo Cappellato c1ae34b45d Upgrade from Ant 1.8.4 to Ant 1.9.0: in the process I have also switched the naming convention of jars to the new one we are adopting for example for Tomcat jars that is <NAME-OF-THE-EXTERNAL-PROJECT>-<RELEASE-NUMBER>-<ORIGINAL-NAME-OF-JAR-FILE>.
For example, in in the release package apache-ant-1.9.0.zip we have the jar ant-launcher.jar, the name of the jar in OFBiz is: ant-1.9.0-ant-launcher.jar



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1461709 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 17:01:12 +00:00
Jacopo Cappellato 88005f87ab Upgrade from Log4j 1.2.16 to Log4j 1.2.17
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1461681 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 16:03:32 +00:00
Jacopo Cappellato 50858f3a6d Upgrade to Tomcat 7.0.39
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1461665 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 15:49:14 +00:00
Paul Foxworthy efd5104e1d Fix spelling of successful and some other words
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460654 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 13:33:09 +00:00
Paul Foxworthy 94c2bac40f reapplied Adrian's change r1460455
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460652 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 13:26:42 +00:00
Paul Foxworthy 0079816733 Undid r1460637, should be two separate commits
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460647 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 13:14:10 +00:00
Paul Foxworthy 4882b2b62d Add grams to Product Shipment Uom labels (Jira OFBIZ-5154)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460637 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 12:46:16 +00:00
Adrian Crum cd9808ddb3 Enable FETCH and OFFSET keywords for Derby database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460455 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 20:23:27 +00:00
Jacopo Cappellato 08166bdc4c Unified redundant blocks "if (Debug.infoOn())" into one to improve readability of code: no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 07:25:56 +00:00
Jacopo Cappellato bd81b76dd8 Minor fix to indentation and to a typo in a comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1460274 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 07:16:43 +00:00
David E. Jones 1c6adf2f0a Fixed issue with deserialization from XML of an entity value with null fields
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1458429 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 17:48:28 +00:00
Ashish Vijaywargiya 8c62ee7787 Bug Fix: Added check to avoid NPE if result-to-result is true.
If we set result-to-result true then for some cases actionResult may be empty so it throws an NPE action while executing eca action. Thanks Deepak.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1455407 13f79535-47bb-0310-9956-ffa450edef68
2013-03-12 04:51:28 +00:00
Hans Bakker 56323a459b make the webtools screens use the decorator location from web.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1455024 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 07:35:16 +00:00
Adrian Crum 008501055f Bug fix in FtpServices.java - close resources in finally block. Also made logging more consistent.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1453793 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 12:02:39 +00:00
Adrian Crum cc8d5e42fd Code formatting in FtpServices.java - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1453770 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 10:57:39 +00:00
Jacques Le Roux 87a9e9b312 This prevented to load both web and pos simultaneously (both-containers.xml does not exist anymore).
It needs a compilation to work again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1451879 13f79535-47bb-0310-9956-ffa450edef68
2013-03-02 12:32:11 +00:00
Adrian Crum ae07fca011 Fixed a bug in one of my recent commits:
https://issues.apache.org/jira/browse/OFBIZ-5140


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1449429 13f79535-47bb-0310-9956-ffa450edef68
2013-02-24 00:27:33 +00:00
Jacques Le Roux 56c153168a A patch from Nicolas Malin for "Adding unit test for new element to load data" https://issues.apache.org/jira/browse/OFBIZ-5112
With the issue commit OFBIZ-4949, it' necessary to complete unit test on this feature.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1449279 13f79535-47bb-0310-9956-ffa450edef68
2013-02-23 08:26:21 +00:00
Jacques Le Roux 830f9f7b91 A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137
Translated missing zh labels for projectmgr, scrum, service, webpos and webtools components. These are the last 5 components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1448350 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 18:50:33 +00:00
Jacques Le Roux b591e84b2a A slightly modified patch from Gil Portenseigne for "Missing PartyCountryCode uiLabel" https://issues.apache.org/jira/browse/OFBIZ-5138
The label ${uiLabelMap.PartyCountryCode} is used several times in the project but i could not find the definition of PartyCountryCode in label definition files.
I looked further and found CommonCountryCode in label file which is not used and fill the need for PartyCountryCode. To solve this I propose to rename all PartyCountryCode to CommonCountryCode.

jleroux: I also moved CommonCountryCode, CommonCountryCodeMissing and CommonCountryMissing from PartyUiLabels.xml to CommonUiLabels.xml





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447664 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 10:55:10 +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
Sascha Rodekamp 7b0fd3e806 In an exception case the ServiceUtils.setServiceFields method should throw an exception and don't hide it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447603 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 07:18:10 +00:00
Sascha Rodekamp e8ff62f756 Add a small method to the ServiceUtil Class which checks all incoming service attributes and look for fields with the same name in the incoming map and copy those onto the outgoing map. Also includes a userLogin if service requires one.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447246 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 13:26:00 +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
Adrian Crum 3caa1e66d3 Small improvements to ApacheFopWorker: check for file/folder existence before applying settings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446940 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 20:43:38 +00:00
Adrian Crum 9b6b06c44a Reverting revision 1345849 because it is not thread-safe and it doesn't work.
It appears this was an attempt to create per-tenant FOP factories, but instead each tenant overwrites the previous FOP factory settings.

A proper implementation would require a FOP factory cache keyed by delegator name.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446913 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 16:31:31 +00:00
Adrian Crum a0402a0d38 Small improvement to Web Tools services screen: Add service definition location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446885 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 12:37:20 +00:00
Jacques Le Roux 975a7dc9ce A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137
Translated missing zh labels for several components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446852 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 08:49:01 +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
Jacques Le Roux 364b3cd1e6 A patch from Nicolas Malin for "fieldGroup will ignored if all contains fields are ignored" https://issues.apache.org/jira/browse/OFBIZ-5136
When you have a fieldGroup that contains fields with use-when attribute, if all fields aren't use, the fieldGroup is empty.
Improvment: to not display the field group



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446847 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 07:49:28 +00:00
Jacques Le Roux e18c34f93d 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@1446482 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 09:11:54 +00:00
Jacques Le Roux 8afa159480 A patch from Chatree Srichart for "Ignore "tenant" data files if the multitenant property is "N"" https://issues.apache.org/jira/browse/OFBIZ-4934
The system does not need to load tenant data files if the multitenant property in general.properties is "N". I created a patch to ignore the tenant data files when run ./ant load-demo command.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1444370 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 14:39:29 +00:00
Ashish Vijaywargiya 54935d7db8 No functional changes, Formatted the file as per best practice that we follow in FTL files. Thanks Deepak!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1442197 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 17:40:56 +00:00
Jacques Le Roux 82b9ee64f3 A patch from Taher Alkhateeb for "Corrections and improvements to dependent drop-downs" https://issues.apache.org/jira/browse/OFBIZ-5126
* The getDependentDropdownValues function in miscAjaxFunctions.js is modified with a new argument to allow for empty selections. Therefore, copying the behavior of form widget drop-down's "allow-empty"
* There is only one file affected by item number 2 above, therefore, I fixed it to include the argument in getDependentDropdownValues

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1438501 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 13:27:54 +00:00
Jacques Le Roux 8699dd1f03 A patch from Taher Alkhateeb for "Corrections and improvements to dependent drop-downs" https://issues.apache.org/jira/browse/OFBIZ-5126
The setDependentDropdownValuesJs.ftl is using an incorrect argument which usually happens to work because it is a duplicate of another.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1438498 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 13:22:58 +00:00
Jacques Le Roux 54dfb7ea95 A patch from Martin Kreidenweis "Delegator creation fails with new ExecutionPool on trunk" https://issues.apache.org/jira/browse/OFBIZ-4335
The problem is that the wrong class loader is used for the "ofbiz-config-*" threads (NativeLibClassLoader instead of CachedClassLoader). This happens when the threads are created by the static code in ExecutionPool.java when it is executed before the ClassLoaderContainer.init() initializes the CachedClassLoader.

This also causes other problems like: The local resolution of XML Schema files won't work any more because it's also using the wrong classloader, which can't find the XSD files:

[java] 2011-07-21 12:21:45,333 (ofbiz-config-0) [                 UtilXml:1022:WARN ] [UtilXml.LocalResolver.resolveEntity] could not find LOCAL DTD/Schema with publicId [null] and the file/resource is [service-eca.xsd]

You can trigger this behavior in current ofbiz trunk by setting an expire time for the properties cache in cache.properties

properties.UtilPropertiesResourceCache.expireTime=10000

The Debug.log() statements in the ContainerLoader then load the logging configuration properties file and cache it. If an expire time is set, the ExecutionPool is used and creates the "ofbiz-config-*" threads too early.

By not pre-starting the "ofbiz-config-*" threads in the static code (patch above), the threads are then created later on, when the "main" thread classloader has become the CachedClassLoader and everythings starts working again. 

jleroux: 
* I don't see any issues, but performance, to not start the whole core threads. This is BTW the default behaviour. So I'd recommend to use it for GLOBAL_EXECUTOR.
* I also removed the useless deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1435701 13f79535-47bb-0310-9956-ffa450edef68
2013-01-19 21:05:23 +00:00