Commit Graph
9103 Commits
Author SHA1 Message Date
Michael Brohl 2a66a06aef Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.qrcode.
(OFBIZ-9633)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811427 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:10:50 +00:00
Michael Brohl 404139505e Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.period.
(OFBIZ-9631)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811426 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:08:49 +00:00
Michael Brohl 31a2e43496 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.login.
(OFBIZ-9630)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811424 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:06:21 +00:00
Michael Brohl 36492861ee Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.image.
(OFBIZ-9629)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811423 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:00:27 +00:00
Michael Brohl 17db653e57 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.email.
(OFBIZ-9628)

Applied modified patch due to intermediate changes and removed an
obsolete import.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811422 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:56:48 +00:00
Michael Brohl 2921eff056 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.authentication.
(OFBIZ-9627)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811421 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:49:20 +00:00
Michael Brohl 61d6a6ede0 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.string.test.
(OFBIZ-9589)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811418 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 12:47:36 +00:00
Michael Brohl 7279dec7c2 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.cache.test.
(OFBIZ-9576)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811416 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 12:28:52 +00:00
Michael Brohl 06fc59dbf5 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.cache.
(OFBIZ-9575)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811415 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 12:26:35 +00:00
Michael Brohl d55ec1f8bb Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.test.
(OFBIZ-9574)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811414 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 12:13:05 +00:00
Michael Brohl bfa9e5adf6 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.start.
(OFBIZ-9573)

I slighly modified the patch because of a conflicting change.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811413 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 12:07:16 +00:00
Michael Brohl 96601e4d22 Fixed: Exception in service semaphore in wait mode and with multi
thread calls.
(OFBIZ-9534).

Thanks Pierre Gaudin for reporting and providing the patch.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811406 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 10:23:02 +00:00
Nicolas Malin 8f447bdbc2 Fixed: InitTheme.groovy can't work without request (OFBIZ-9798)
When a sendOrderConfirmation runs it calls InitTheme.groovy. But then there is no request and InitTheme fails
The script was improved to escape if the request is empty and try before to resolve the visualThemeId from the context
Tanks Jacques for the catch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811042 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04 07:13:21 +00:00
Jacques Le Roux 456ad70aca Improved: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Programmatically replaces the web.xml <session-config> declarations and uses 
the @WebListener annotation to start the process. This avoid to duplicates 
things everywhere in web.xml files. Since the web.xml files have precedence 
on annotations, the setting can be easily overridden when necessary.

Now that we also use HTTPS in ecommerce the ecommerce session cookie is 
also secured.

I also noted that we had 8 weird <session-timeout> declarations:
    in solr component: <session-timeout>2</session-timeout>
    in themes: <session-timeout>1</session-timeout>

Also in Rainbowstone we lacked the <cookie-config> and <tracking-mode> 
declarations. I think it's not good.

I resolve these points by simply removing the <session-config> in web.xml files 
of themes and Solr.

Thanks: Pradhan Yash Sharma  for review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811041 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04 07:12:57 +00:00
Michael Brohl 2c2078768d Fixed: EmailServices.sendMailFromScreen improved to take multiple
attachments with appropriate type along with several email fixes.
(OFBIZ-9395).

This adds the missing service attributes for attachmentType and
attachmentTypeList which did not come with the initial patch. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1810260 13f79535-47bb-0310-9956-ffa450edef68
2017-10-01 10:39:18 +00:00
Jacques Le Roux 793f6c586a Reverted: Bug SQL Count Distinct command in GenericDAO.java
(OFBIZ-5701)

Reverts
trunk r1804319
R16.11 r1804320
R15.12 r1804321
R14.12 r1804322
R13.07 r1804323

This raised 2 issues:
  MSSQL as reported by Wei Zhang in OFBIZ-9676
  Dynamic View Entities as reported by Pawan Verma in OFBIZ-5701

I asked kieuanhvu to see if he can provide a new patch taking these 2 issues in
consideration


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1810054 13f79535-47bb-0310-9956-ffa450edef68
2017-09-29 06:21:16 +00:00
Jacques Le Roux 63938c6816 Improved: Add session tracking mode and make cookie secure
(OFBIZ-6655)

This completes r1809687, no need to secure when deleting. I will not backport

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809838 13f79535-47bb-0310-9956-ffa450edef68
2017-09-27 12:30:25 +00:00
Jacques Le Roux 1674e51b37 Fixed: Unable to run the MRP
(OFBIZ-9794)

This is only loosely related to this issue but I believe it could help and is 
needed anyway

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809821 13f79535-47bb-0310-9956-ffa450edef68
2017-09-27 09:43:10 +00:00
Jacques Le Roux 39e75f3a46 No functional change.
Clarifies in log when a weppabb is not mounted (overriding another)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809747 13f79535-47bb-0310-9956-ffa450edef68
2017-09-26 13:29:10 +00:00
Jacques Le Roux 6030547746 Fixed: Transaction Timeout in JavaEventHandler
(OFBIZ-9725)

When you run a service from webtools (not scheduling it) the the duration of the
 service is limited to the transaction default timeout (60 seconds)

Thanks: Jeffrey Breault for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809741 13f79535-47bb-0310-9956-ffa450edef68
2017-09-26 13:15:12 +00:00
Jacques Le Roux d56833ae7c Improved: Add session tracking mode and make cookie secure
(OFBIZ-6655)

This is somehow related with OFBIZ-6655 because it's there that Deepak reverted
r1719762 (actually r1719939). It was right to do so at r1722379 for 
RequesHandler but not for the other files. Because it now does not handle 
security for cookies which are not session cookies. It's minor but still a risk,
notably for autoLoginCookie

This reapplies r1719762 for the other files to make other than session cookies
secure. I will not backport


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809687 13f79535-47bb-0310-9956-ffa450edef68
2017-09-26 07:17:40 +00:00
Arun Patidar 45a723e6df IMPROVED: Update UtilMisc.formatRuleBasedAmount() method to take rules and ruleSet and formatting can be done, rather than system providing all ruleset support. (OFBIZ-9490)
Thanks Pradhan Yash Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809425 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 13:18:41 +00:00
Arun Patidar fca6a917d5 ADDED: new Rule Based Number Format for Indian Number System in International Components for Unicode (ICU) OFBiz usage. (OFBIZ-9489)
Thanks Pradhan Yash Sharma for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809424 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 13:14:07 +00:00
Deepak Dixit 259a585512 Fixed: Manually changed the date locale js for cs locale
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809413 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:39:52 +00:00
Arun Patidar 33e8efb477 IMPROVED: Updated phone validation method to validate phone for specific geo. (OFBIZ-9358)
> Thanks Renuka Srishti for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809412 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:35:27 +00:00
Deepak Dixit 344e97909a Fixed: JsLanguageFilesMapping.java location in createJsLanguageFileMapping service, and commiting the auto generated java file for language mapping js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809410 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:11:31 +00:00
Deepak Dixit 69a3268067 Improved: Moved OfbizUtil.js and fieldlookup.js from images to common-theme and made changes accordingly. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809391 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 11:01:24 +00:00
Deepak Dixit 88493836bc Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809389 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:41:28 +00:00
Rishi Solanki 3d29d37572 Improved: Extend SecurityGroup entity and add name/groupName field. Added groupName field to entity SecurityGroup and related changes done in the data, services and UI. (OFBIZ-9620)
Thanks Suraj Khurana for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809386 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:16:17 +00:00
Jacques Le Roux a360a3ffc7 Improved: Missing foreign key constraint for fields userLoginId &
userPrefGroupTypeId in UserPreference entity
(OFBIZ-9678)

UserPreference.userLoginId is related to UserLogin.userLoginId.
UserPreference.userPrefGroupTypeId is related to 
UserPrefGroupType.userPrefGroupTypeId.

Fixes tests by using one-nofk for UserLogin relation
Uses uppercase for fk-name as remarked by Deepak


Thanks: Aditya and Deepak

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809383 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 09:59:24 +00:00
Jacques Le Roux c8e8e740e3 Improved: Missing foreign key constraint for fields userLoginId &
userPrefGroupTypeId in UserPreference entity

UserPreference.userLoginId is related to UserLogin.userLoginId.
UserPreference.userPrefGroupTypeId is related to 
UserPrefGroupType.userPrefGroupTypeId.

(OFBIZ-9678)


Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809375 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 08:24:08 +00:00
Rishi Solanki 25e99b2812 Fixed: Can enter empty content for product facility (OFBIZ-8323). A Generic Issue with EntityAutoEngine in which success message is appended to result after invoking create, update, delete, expire methods. Now engine would return success or error from invoking method and won't prepare the message its own. Same patch was committed and we receive test integration fails, minor modification in patch to put the message in the return map instead of map with key successMessage. Patch having problem with invokeUpdate.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1808833 13f79535-47bb-0310-9956-ffa450edef68
2017-09-19 07:49:37 +00:00
Rishi Solanki c0f2e5ee8f Reverted: Test Integration failed due to fix done in 1807908. OFBIZ-8323
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807915 13f79535-47bb-0310-9956-ffa450edef68
2017-09-09 16:01:39 +00:00
Rishi Solanki ec9cba10ed Fixed: Can enter empty content for product facility (OFBIZ-8323). A Generic Issue with EntityAutoEngine in which success message is appended to result after invoking create, update, delete, expire methods. Now engine would return success or error from invoking method and won't prepare the message its own.
Thanks to Lalit Dashora for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807908 13f79535-47bb-0310-9956-ffa450edef68
2017-09-09 14:11:51 +00:00
Jacques Le Roux e8a3c6f3d5 Fixed: Fix Default or Empty Catch block in Java and Groovy files
(OFBIZ-8341)

In many Java and Groovy files we have auto generated catch blocks or empty catch 
blocks. 
To avoid such exception swallowing this should be improved to at least log the 
error and also return error in case of service.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807162 13f79535-47bb-0310-9956-ffa450edef68
2017-09-03 19:27:49 +00:00
Jacques Le Roux 15cc03f9c0 Improved: CommonEvents improvements
(OFBIZ-9673)

Reverts r1807045. There is no justification to remove private for "no modifier"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807142 13f79535-47bb-0310-9956-ffa450edef68
2017-09-03 12:43:15 +00:00
Jacques Le Roux db7448fdfb Improved: CommonEvents improvements
(OFBIZ-9673)

Replaces private to protected so that CommonEvents.java is more usable to 
derived classes.

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807045 13f79535-47bb-0310-9956-ffa450edef68
2017-09-02 12:25:13 +00:00
Jacques Le Roux 8087b20f19 No functional change, removes trailing blanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806945 13f79535-47bb-0310-9956-ffa450edef68
2017-09-01 12:23:30 +00:00
Nicolas Malin dcdc3855a6 Fixed: Missing to convert a showDescription from widget.properties to modelTheme on the macroFormRendere.java to prepare the lookup macro (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806821 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 16:19:29 +00:00
Nicolas Malin db7872484c Fixed: Missing to use the modelTheme for the attached screen on email (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806815 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:39:29 +00:00
Nicolas Malin b15e57df9b Fixed: correct JsLanguageFilesMapping template path from framework/common to common-theme (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806812 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:15:25 +00:00
Nicolas Malin de11d898ad Fixed: HtmlFormMacroLibary.ftl contains direct call to widget.properties (OFBIZ-9138 Create a common theme)
Instead of use the properties on the current theme, some ftl macro present in the file HtmlFormMacroLibary.ftl used a directl call to widget.properties.
To help the code reader, the modelTheme has been set on the root ftl context, and the previous widget.properties call replace by modelTheme call

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806742 13f79535-47bb-0310-9956-ffa450edef68
2017-08-30 21:40:33 +00:00
Nicolas Malin 2555742bf3 Fixed: the lookup property showDescription not present in common-theme (OFBIZ-9138 Create a common theme)
Display or not a description hasn't been loaded in the theme definition. I finished this migration to be sure to found all properties linked to lookups in the same place.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806741 13f79535-47bb-0310-9956-ffa450edef68
2017-08-30 21:33:47 +00:00
Deepak Dixit 29461cdc47 Fixed: Found some more vlaue=dollor pattern in set element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806329 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:33:37 +00:00
Deepak Dixit 1a7aee6685 Improved:Use from-field pattern instead of value=dollor pattern in 'set' element
Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607)
Thanks Suraj Khurana and Rohit Rai for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806326 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:23:40 +00:00
Deepak Dixit 90181172a1 Fixed: Updated images component reference path, as we removed images component and now these files are part of common-theme componnet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806273 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 08:30:02 +00:00
Jacques Le Roux f973dc8283 Fixed: LabelManager doesn't search labels in all elements in xml
(OFBIZ-9606)

Currently, label manager for xml search only for fail-property elements in xml 
files, it should also search for the property-to-field, default-message element 
in xml files.

Thanks: Suraj Khurana

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806269 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 07:43:54 +00:00
Jacques Le Roux 3cb8812782 Fixed: Improvements in LabelReferences class
(OFBIZ-9623)

For Java:
Current support is only for occurrences like "UtilProperties.getMessage(",
 but there are other occurrences such as "uiLabelMap.get(" 
in Java as well. Need to add support for same.

For groovy:
After some recent improvements for groovy handling, still, there is a 
possibility that someone is using "UtilProperties.getMessage(" in groovy files 
as well, so IMO, that must also be handled.

For XML forms:
In XML forms current support in handled for auto-fields-service and 
auto-fields-entity but there are some occurrences of tooltip element of 
field tag as well, that must also be handled.

For XML Simple Methods:
Doesn't handle case of property-to-field and default-message elements. 
(Separate ticket created OFBIZ-9606, just adding it here for reference)

Thanks: Suraj Khurana

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806266 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 07:37:49 +00:00
Rishi Solanki 8d9b566605 Reverted: Local changes mistakenly committed in revision 1806258
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806259 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 06:05:15 +00:00
Rishi Solanki b0651cbe4d Improvement: Move all data in applications to the datamodel component. (OFBIZ-9501)
Moved the data which belongs to content with seed reader.
Thanks Saurabh Dixit for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806258 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 05:54:15 +00:00