Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 03084330a8 Merged rev 1462755 from the 2013_RemoveJavolution branch.
Removed Javolution from Mini-language.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465427 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 17:15:10 +00:00
Jacques Le Roux 36872419e7 billhuang noticed at https://issues.apache.org/jira/browse/OFBIZ-5172 that "description is incorrect":
int org.ofbiz.base.util.UtilValidate.java file:
    public static final String isMinuteMsg = "The Hour must be a number between 0 and 59.";
    public static final String isSecondMsg = "The Hour must be a number between 0 and 59.";
should be 
    public static final String isMinuteMsg = "The Minute must be a number between 0 and 59.";
    public static final String isSecondMsg = "The Second must be a number between 0 and 59.";


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465351 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 09:35:26 +00:00
Jacques Le Roux 54ece545d9 I missed to commit security.properties with r1465185. Thanks to Leon for warning
+ French labels


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465347 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 09:08:21 +00:00
Jacopo Cappellato 6a72085f8b Updated commons logging to the latest bug fix release 1.1.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465345 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 08:41:21 +00:00
Jacopo Cappellato 42e11fe17d Replaced Commons Beanutils jar with the "core" (slightly lighter) version that doesn't contain Beanutils Collections classes that shouldn't be required by OFBiz.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465334 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 07:29:29 +00:00
Jacopo Cappellato 3cad56e33b Moved Jetty component from framework to specialpurpose
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465283 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 18:04:11 +00:00
Jacopo Cappellato c04409e2eb Removed two jar files that contain classes already available in other jars:
* el-api-2.2.jar is a duplicate of juel-2.2.1.jar
* geronimo-qname_1.1_spec-1.0.jar is a duplicate of xml-apis-2.9.1.ja



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465281 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 17:47:02 +00:00
Jacopo Cappellato 27c1c384a4 Moved the appserver component from framework to specialpurpose.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465276 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 17:25:01 +00:00
Jacopo Cappellato 62d02aaea9 Removed the GroovyShellContainer, that was disabled by default for security reasons, mostly because it was based on some code distributed with unclear license terms.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465254 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 14:48:10 +00:00
Adrian Crum 8b122612cd Removed Javolution from UtilMisc.java. Also removed the SimpleMap class - which provided no benefit because it was converted to a "real Map" 99.8% of the time.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465253 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 14:44:34 +00:00
Jacopo Cappellato 012c598c2f Moved Axis1 jars to specialpurpose/birt because it is now the only component that still uses these old jars while the framework runs on Axis2.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465252 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 14:35:05 +00:00
Jacques Le Roux 1b6a4204e6 Adds again the possibility to use the previous way about detecting slow services in logs.
Now it uses properties for the 2 Thresholds
0 to get the same behaviour as Adrian's last commit
1000 to get almost the same behaviour than before Adrian's last commit. But with no distinctions with slow and very slow services and a higher level for slow services. This value makes sense for instance for web services (SOAP, RMI, REST) served by external systems.
The properties can be used to set as desired. I believe it's no confusing OOTB and still flexible enough.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465223 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 10:58:20 +00:00
Jacques Le Roux 524aee52f9 A slightly modified patch from Sumit Pandit for "Enforce user to reset his password in a pre-defined regular interval of time." https://issues.apache.org/jira/browse/OFBIZ-5009
Reference requirement for the feature: http://markmail.org/message/sihxekwk6655t5gh#query:+page:1+mid:bcw2vva2hjxhsodq+state:results

For a user account in system, we can set password age for an additional security.
Proposed system will start suggesting to user to reset his password few days before password expiration. Then Once password expired, system will enforce him to reset his password before processing further.
Following will be control points and would be part of system configuration- 
* *Control Points -*
** Admin can enable/disable the reset password functionality.
*** -It will control by a flag in propriety file where admin can enable/disable it by setting true/false.
** Number of days in which password will expired.
*** - It will defined in propriety file so that admin can control it.
** Number of days before when password expiration alert display at user's screen.
*** - It will defined in propriety file so that admin can control it.

* *How should it processed -*
** After user logged-in, display password expiration notification message to user if his password will expire in comming days.
** After user logged-in, display change password screen, when password is expired. i.e. The difference in days since last time password updated is exceed to number of days specified in system policies. Enforce user to reset his password.

* *What will be the out-put -*
** Password is about to expire : : alert message after login.
** Password is expired : Password-Expired-Alert : alert message with reset password screen.

Following is implementation plan -

    security.properties : Provide configuration for following control points :
        Enabling / Disabling of the functionality.
        Maximum number of days within user has to change the password.
        Number of days back to password expire date, when user start getting password expiration alerts.

    Data model
        Entity name : UserLoginPasswordHistory : Existing entity.

    Business logic
        Create UserLoginPasswordHistory record when a new user is created (if configured).
        Expire and then Create UserLoginPasswordHistory record when user update existing password.
        Everytime, when user login check for password expiration. If password expired then display change password screen to user. And if password not yet expired but it is close to expire display alert message to user about its expiration.

jleroux: I just changed 
from 
if (reqToChangePwdInDays != 0) {
tp
if (reqToChangePwdInDays > 0) {

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465185 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 04:54:14 +00:00
Jacques Le Roux 94990b2ce3 A patch from Iurii Volosheniuk "Russian translation for framework/common/config/CommonUiLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-5171
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465125 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 20:49:46 +00:00
Jacques Le Roux ca43c6a2c4 Just adds a date-time to clarify the moment all caches were cleared
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465103 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 19:41:42 +00:00
Adrian Crum ecae60f467 Small optimization for location resolvers - don't go to the file system while building URLs. This will benefit single box (app server + DB server) installations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464750 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:57:46 +00:00
Adrian Crum 25928aba2a Small fixup for CachedClassLoader.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464744 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:53:21 +00:00
Adrian Crum 01fcde7134 Some optimizations in FlexibleMapAccessor.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464032 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 14:10:01 +00:00
Adrian Crum 48c26a3216 CachedClassLoader.java - replaced Javolution with non-blocking java.util.concurrent.* classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464015 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 13:54:10 +00:00
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