Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 73cc6c2cbf ModelWidgetAction.java code formatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649280 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 01:40:36 +00:00
Adrian Crum 88a71146d1 Tree widget documentation, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649275 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 00:12:24 +00:00
Adrian Crum 9cbe119625 Final pass at making tree widget thread-safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649272 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 00:02:04 +00:00
Adrian Crum 2f920b837c Renamed ModelWidgetAction factory method to newInstance - which better describes what it does.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649248 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 21:00:04 +00:00
Adrian Crum 9db32ed762 Fixed a bug in tree rendering - https://issues.apache.org/jira/browse/OFBIZ-5313
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649239 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 19:52:21 +00:00
Adrian Crum 34fcdd98b7 Small code cleanup in MacroTreeRenderer.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649238 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 19:50:42 +00:00
Adrian Crum 9344bbcc2f Second pass at making tree widget thread-safe. This is a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649230 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 18:40:39 +00:00
Adrian Crum 98b1b64741 First pass at making tree widget thread-safe. This is a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649096 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 19:26:30 +00:00
Adrian Crum e46c5a3bc5 Tree widget - remove stored references to Delegator and LocalDispatcher.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649090 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 18:55:48 +00:00
Adrian Crum c8604d941a Code formatting in ModelTree.java, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649086 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 18:11:11 +00:00
Adrian Crum ee0093ae71 Refactor tree widget to reuse common condition models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649084 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 17:52:29 +00:00
Adrian Crum 18cf8f749a Reverting rev 1646969 because it breaks tree rendering.
I need this fixed so I can begin working on tree widget refactoring. During refactoring I will most likely solve the problem rev 1646969 was trying to fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649083 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 17:49:49 +00:00
Adrian Crum 55761dfeb3 Rewrite ModelMenuItem.java to make it thread-safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649072 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 16:12:09 +00:00
Jacopo Cappellato 9ce782f90b Removed a bunch of dependencies of Owasp Esapi classes after I realized (by studying the Esapi source files and the integration in OFBiz) that we were using a small part of that product; this made it possible to upgrade to the latest release of Owasp Esapi (2.1.0) without having to include a bunch of jars.
I had to comment out two lines in the unit tests because they were failing after the upgrade; still investigating on this.
This commit resolves OFBIZ-5343.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648747 13f79535-47bb-0310-9956-ffa450edef68
2014-12-31 17:31:16 +00:00
Jacques Le Roux 2739265d35 A slightly modified patch from Divesh Dutta for "The <delete> action in <entity-engine-xml> definitions throw an error in tests" https://issues.apache.org/jira/browse/OFBIZ-5906
Data loading for xml data was working fine when <delete>,<create>, <create-update> tag were used . But these tags were not working when data was loaded at the time of running J-unit tests. So after researched that how data loading was working fine for simple data load. So I used the same way than in EntityDataLoader.java to parse the XML file. 

jleroux: I simply removed the old code Divesh commented out in his patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648668 13f79535-47bb-0310-9956-ffa450edef68
2014-12-31 10:01:56 +00:00
Jacopo Cappellato a5879b6f8f Moved code dependent on OWASP ESAPI and utilities for codec tasks from StringUtil to a new UtilCodec class: now the UtilCodec class is the only class dependent on OWASP ESAPI.
The DefaultEncoder from OWASP ESAPI, used internally by UtilCodec is now built with the default constructor that also adds the JavascriptCodec to the list of codecs used to canonicalize and validate the input.
Renamed the UrlEncoder class to UrlCodec in order to better describe its behavior.
Misc minor cleanups.
Added to the list of tests of the base component a series of Junit test classes that were missing.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648403 13f79535-47bb-0310-9956-ffa450edef68
2014-12-29 18:24:57 +00:00
Jacopo Cappellato b969e376ed A series of cleanup to the integration with OWASP ESAPI. Isolated dependencies on the external OWASP ESAPI jar into the StringUtil class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648298 13f79535-47bb-0310-9956-ffa450edef68
2014-12-29 09:24:46 +00:00
Adrian Crum dfb9f37a1f Refactor menu widget to reuse common condition models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648153 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 08:13:28 +00:00
Adrian Crum 51f7152723 Extract screen widget condition models to a separate class so they can be reused in other widgets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648152 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 07:37:03 +00:00
Adrian Crum 1fc589d681 Some fixups for the Form widget refactor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648142 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 02:22:06 +00:00
Adrian Crum 5f231ec005 Fixed a NPE I introduced in rev 1647606. Reported by Pierre Smits on dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648139 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 00:58:44 +00:00
Adrian Crum cd3ed9f83d Begin work on ModelMenu.java thread safety.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648093 13f79535-47bb-0310-9956-ffa450edef68
2014-12-27 19:18:12 +00:00
Adrian Crum e5fcf293ae Merged revision(s) 1635411 from ofbiz/branches/boostrap_theme:
MacroScreenViewHandler.java improvement: get macro library locations from Visual Theme resources. Themes can create their own HTML now.

resourceTypeEnumId=VT_SCRN_MACRO_LIB - screen macro library location
resourceTypeEnumId=VT_FORM_MACRO_LIB - form macro library location
resourceTypeEnumId=VT_TREE_MACRO_LIB - tree macro library location
resourceTypeEnumId=VT_MENU_MACRO_LIB - menu macro library location


Merged revision(s) 1635465 from ofbiz/branches/boostrap_theme:
Fix ClassCastException.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648013 13f79535-47bb-0310-9956-ffa450edef68
2014-12-26 19:06:30 +00:00
Adrian Crum 124b003d0d Rewrite ModelFormField.java and related classes. Most of this is thread-safe now. Implemented a builder design because the original ModelForm design makes several passes over the fields - modifying them incrementally. Now ModelForm modifies builders instead, then when the parsing process is complete, the builders create the thread-safe field models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647936 13f79535-47bb-0310-9956-ffa450edef68
2014-12-26 06:47:13 +00:00
Adrian Crum 9be5ed5e06 UtilMisc.java improvements:
1. Replace DCL code with lazy-initializer class.
2. Small code cleanup.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647873 13f79535-47bb-0310-9956-ffa450edef68
2014-12-25 05:41:13 +00:00
Adrian Crum fc86aee024 UtilProperties.java improvements:
1. Replace DCL code with lazy-initializer class.
2. Remove class name from static method calls.
3. Remove some @Deprecated annotations.

When they were written, the deprecated methods simulated forthcoming Java 6 functionality - with the intent that they would be replaced with Java 6 equivalents, but the Java 6 functionality behaves differently than the deprecated methods. So, replacing the deprecated methods with Java 6 equivalents would cause undesired behavior.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647866 13f79535-47bb-0310-9956-ffa450edef68
2014-12-25 00:45:18 +00:00
Adrian Crum 06b7bcbb8b UtilDateTime.java improvements:
1. Replace DCL code with lazy-initializer class.
2. Remove class name from static method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647861 13f79535-47bb-0310-9956-ffa450edef68
2014-12-24 23:37:06 +00:00
Adrian Crum 6731e764ef Bug fix: Make DateRange.java truly immutable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647839 13f79535-47bb-0310-9956-ffa450edef68
2014-12-24 20:21:46 +00:00
Adrian Crum 209a0261fb Remove references to immutability from ComparableRange.java - because its contained objects might be mutable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647838 13f79535-47bb-0310-9956-ffa450edef68
2014-12-24 20:19:42 +00:00
Jacques Le Roux 464fd93aec Implements "Improve the way FOP handles fonts notably for currency symbols" https://issues.apache.org/jira/browse/OFBIZ-5917
Adds
<auto-detect/>
in the fonts section of our fop.xconf

Adds the Google NotoSans font which is Apache licensed
* http://www.google.com/fonts/specimen/Noto+Sans
* https://www.google.com/get/noto/#/

Uses NotoSans as the default FOP font. For that puts the NotoSans font 4 files in framework/resources/fonts and add <directory>framework/resources/fonts/NotoSansFonts</directory> in fop.xconf
Renders ₹ in content/control/fonts.pdf as we do for €. Other symbols could be added later when needed, backed by Google NotoSans font...
Renders the NotoSans content/control/fonts.pdf  as we do for other main fonts

Adds the rupee symbol (₹) to antisamy-esapi.xml file like we have the euro symbol (€)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647782 13f79535-47bb-0310-9956-ffa450edef68
2014-12-24 13:45:03 +00:00
Adrian Crum 7aa7ea5769 Fixed a bug in UtilDateTime.java where SimpleDateFormat instances were not initialized with the locale.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647606 13f79535-47bb-0310-9956-ffa450edef68
2014-12-23 16:21:14 +00:00
Jacopo Cappellato 4384b31ed9 Removed two unnecessary overloaded methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647289 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 11:08:07 +00:00
Jacques Le Roux b567828392 A patch from Anahita Goljahani for "EntityListIterator closing issue with EntityQuery.queryCount() when using DinamicViewEntity" https://issues.apache.org/jira/browse/OFBIZ-5921
When using the queryCount() method of EntityQuery with a DinamicViewEntity, I get an error message about the EntityListIterator not being closed.

This properly closes the EntityListIterator

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647275 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 10:01:53 +00:00
Jacopo Cappellato 99b7f462f2 Refactoring of Visit/Visitor/ServerHit* (and related) entities in order to be able to maintain them in a database separate from the main transactional database:
1) removed foreign key relationship from/to this group of entities and the other entities of the OFBiz data model; the fields are still available but they are not enforced by a foreign key constraint
2) removed one view entitiy joining Visit with Party entities and refactored the code that was using it in order to provide the same behavior
3) added a new entity group ("org.ofbiz.stats") for the Visit/Visitor/ServerHit* (and related) entities; for now the group is not active so that the entities are still in the same database as before; however assigning them to a different database is now a matter of uncommenting the group file definition in framework/webapp/ofbiz-component.xml and provide the new datasource definition
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647271 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 09:19:33 +00:00
Ashish Vijaywargiya 4656af219d Based on Adrian's comment on Dev list removing the ternary operator check which was not needed actually.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647239 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 05:04:18 +00:00
Jacques Le Roux 936e72817e Completes "Deprecate doCacheClear in Delegator interface and class and related minilang classes" https://issues.apache.org/jira/browse/OFBIZ-5325
Removes useless deprecated things in trunk


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647132 13f79535-47bb-0310-9956-ffa450edef68
2014-12-21 12:47:38 +00:00
Ashish Vijaywargiya c572355faf Applied patch from jira issue OFBIZ-5313 - Tree rendering is missing labels.
Thanks Sumit for creating the issue and providing the patch for the same. Thanks Arun for verifying the issue. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646969 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 12:37:07 +00:00
Ashish Vijaywargiya 0877607603 Bug fix, one small conditional check got missed in OFBIZ-5844 - Convert java files to EntityQuery.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646917 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 05:48:51 +00:00
Jacopo Cappellato 21dda83a53 Fixed a few unit tests that were failing due to recent updates for EntityQuery calls.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646787 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 16:13:08 +00:00
Jacques Le Roux 5e6077d737 Adds the rupee symbol (₹) to antisamy-esapi.xml like we have the euro symbol(€)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646781 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 15:56:21 +00:00
Jacopo Cappellato f9d619b103 OFBIZ-5004: an IllegalArgumentException is thrown if an attempt to select an invalid field is performed; the code was just logging a warning message. Thanks to Christoph Neuroth, Adrian Crum, Paul Foxworthy, Scott Gray, Jacques Le Roux, Adam Heath for their valuable feedback and comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646666 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 10:54:13 +00:00
Jacques Le Roux 73e1958d50 No functional changes
Removes a tab found by chance. 
My Eclipse setting automatically adds Override annotations when needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646656 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 09:35:55 +00:00
Ashish Vijaywargiya 80687f8fc2 Minor fix that got missed in 1646212.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646433 13f79535-47bb-0310-9956-ffa450edef68
2014-12-18 10:34:14 +00:00
Jacopo Cappellato fa57185832 Replaced zh-TW with zh_TW
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646252 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 14:22:45 +00:00
Ashish Vijaywargiya f8927d3d3e Applied patch from jira issue OFBIZ-5902 - Fetch configurable settings data driven by replacing UtilProperties.getPropertyValue() method with EntityUtilProperties.getPropertyValue().
We have removed the recent changes that we did for <property-to-field> in XML file because those changes was not actually needed.
Thanks Arun for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646214 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 12:28:02 +00:00
Ashish Vijaywargiya 039f0608bc Applied framework related patch from jira issue - OFBIZ-5844 - Convert java files to EntityQuery.
Thanks Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646212 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 12:13:46 +00:00
Jacques Le Roux 80587c18c2 Fixes "FTL error message is displayed on Return screen, when clicked on Return selected items button" https://issues.apache.org/jira/browse/OFBIZ-5909
This is a trivial error, I don't want to spend too much time on that, user should be careful else use the browser back button!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646204 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 11:38:04 +00:00
Ashish Vijaywargiya f19b8bdfe7 Reverting r1646165. It seems that changes that we did for <property-to-field> are not needed. I will commit the new changes soon.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646191 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 10:49:41 +00:00
Ashish Vijaywargiya d3e50d1e18 Applied patch from jira issue - OFBIZ-5892 - Replace all occurences of dispatcher.runSync in groovy files with runService() of DSL.
Thanks Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646167 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 08:10:12 +00:00
Ashish Vijaywargiya fa7cb8eb15 Applied recent patch from jira issue - OFBIZ-5902 - Fetch configurable settings data driven by replacing UtilProperties.getPropertyValue() method with EntityUtilProperties.getPropertyValue().
Thanks Arun for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646165 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 07:57:56 +00:00