Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 25a4a9997f Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636139 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 14:22:29 +00:00
Adrian Crum 9275221812 Delegate most tree widget actions to ModelWidgetAction. Tree nodes will support an <actions> element like other widgets, but that is still a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636137 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 14:03:02 +00:00
Adrian Crum 2ac5f3cb46 Delegate most menu widget actions to ModelWidgetAction.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636102 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 12:03:09 +00:00
Adrian Crum 21e094915a Delegate most form widget actions to ModelWidgetAction.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636096 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 09:08:21 +00:00
Adrian Crum 4a62dd6107 Move form widget artifact info code to a separate class. This eliminates a lot of duplicate code and it should speed up artifact info gathering. Also converted form widget to reuse some of the screen widget action models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636077 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 01:21:39 +00:00
Adrian Crum d389cdc2a9 Revert rev 1636071. I broke something.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636073 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 00:06:34 +00:00
Adrian Crum 89ad95e8d7 Move form widget artifact info code to a separate class. This eliminates a lot of duplicate code and it should speed up artifact info gathering. Also converted form widget to reuse screen widget action models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636071 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 23:47:47 +00:00
Adrian Crum 46f16abccd Add a form field visitor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636070 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 23:43:06 +00:00
Adrian Crum f69d5fbe73 Move screen widget artifact info code to a separate class. This eliminates a lot of duplicate code and it should speed up artifact info gathering.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636031 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 20:15:27 +00:00
Adrian Crum d96c82438c Add a screen widget action visitor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636030 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 20:13:41 +00:00
Adrian Crum de2bae353a Add a screen widget model visitor. This will enable us to externalize a lot of unrelated code that has been included in the models, as well as provide a cleaner API for the renderers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635990 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 16:57:07 +00:00
Adrian Crum 0b0aedacc6 Continue working on making widget models thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635984 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 16:11:46 +00:00
Adrian Crum 9b9ef5eea4 Remove unused rawString method from screen widgets. I will be committing a widget visitor soon, so if anyone really wants to generate screen widget XML they can create a visitor implementation for it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635964 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 15:13:12 +00:00
Adrian Crum 21c0969f4f Continue working on making widget models thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635961 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 14:56:07 +00:00
Adrian Crum a35f9e3b4e Continue working on making widget models thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635957 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 14:28:41 +00:00
Adrian Crum 6976bd1fa6 Begin working on making widget models thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635917 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 10:49:29 +00:00
Adrian Crum e7794e5824 Finish removing Javolution from the base component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635910 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 09:55:57 +00:00
Adrian Crum 8827dfa87a Remove Javolution from the webapp component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635909 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 09:32:53 +00:00
Adrian Crum df526ee5cf Remove Javolution from the testtools component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635907 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 09:31:51 +00:00
Adrian Crum c039bb0330 Remove Javolution from the entityext component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635906 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 09:31:06 +00:00
Jacopo Cappellato 3552f65800 Merged json-integration-refactoring into trunk:
* moved the json-lib jar (json-lib-2.2.3-jdk15.jar) from the framework/webapp to the framework/base component
* removed the SQL select Parser.jj (parser definition) and its unit tests: it was not used (and never used) by any OFBiz code
* removed the JSON.jj (parser definition) and its unit tests: it was not used (and never used) by any OFBiz code apart from the JSON Converters (now migrated to json-lib, see next items in this list) some utility methods in UtilIO.java (that have been removed too because they have never been used in OFBiz) 
* removed the JavaCC jar and related ant scripts because no more needed after the removal of Parser.jj and JSON.jj
* converted the JSONConverter code that was based on JSON.jj to Jackson
* added a new class org.ofbiz.base.lang.JSON that have been contributed by Adrian Crum that is a facade for simplifying the client code and for hiding the specific JSON library being used
* removed an unused method: ImageManagementServices.toJsonObject(...)
* added TestBooleanConverters to the list of tests
* new unit tests for the new JSON converters
* refactored Ajax code in applications to use the common request json response rather than a custom method
* OFBIZ-5790 Implemented ability to call a service event by passing its input parameters in the request body as JSON data. These classes provide a simple mechanism, based on the request's content type, that can be extended to support other formats (e.g. XML).

This commit resolves OFBIZ-4572, OFBIZ-3365, OFBIZ-5751, OFBIZ-5790



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635901 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 09:06:42 +00:00
Ashish Vijaywargiya e6600ee704 Applied patch from jira issue - OFBIZ-5842.
============================================
As we have Entity Query Builder implemented in trunk (OFBIZ-4053) and now we should add Junit tests for its methods.

As per initial analyses, we can write Junit tests for following methods of Entity Query Builder:

1. queryList()
2. queryFirst()
3. queryCount()
4. queryOne()
5. distinct()
6. filterByDate()
7. orderBy()
8. select()
9. cursorForwardOnly()
10. cursorScrollSensitive()
11. cursorScrollInSensitive()
12. fetchSize()
13. maxRows()
14. cache()
15. queryIterator()
=============================================
Thanks Arun for the contribution. 
Thanks Scott, Jacopo and Adrian for your help in reviewing the patch content. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635894 13f79535-47bb-0310-9956-ffa450edef68
2014-11-01 05:59:31 +00:00
Adrian Crum b887db4aef Remove Javolution from the widgets component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635878 13f79535-47bb-0310-9956-ffa450edef68
2014-10-31 23:13:03 +00:00
Adrian Crum d6f7e2aa5a Fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635877 13f79535-47bb-0310-9956-ffa450edef68
2014-10-31 23:08:29 +00:00
Adrian Crum 159734866e Remove Javolution from the service component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635860 13f79535-47bb-0310-9956-ffa450edef68
2014-10-31 20:45:45 +00:00
Adrian Crum 79dc510f05 Remove Javolution from most of the base component. I didn't do the converters to avoid merge conflicts with the JSON branch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635846 13f79535-47bb-0310-9956-ffa450edef68
2014-10-31 19:29:46 +00:00
Adrian Crum 38a96bab6c Remove Javolution from the common component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635816 13f79535-47bb-0310-9956-ffa450edef68
2014-10-31 17:13:45 +00:00
Scott Gray 44e2c4fda1 Regex search/replace for delegator.findOne() to EntityQuery.queryOne()
Apologies for the large commit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1635383 13f79535-47bb-0310-9956-ffa450edef68
2014-10-30 04:18:05 +00:00
Jacques Le Roux 39c29b6092 A patch from Pierre Smits for "Update GeoData.xml with Dutch Postal Code format" https://issues.apache.org/jira/browse/OFBIZ-5841
Updates the GeoData.xml type data with the reg-exp for Dutch postal codes

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1634991 13f79535-47bb-0310-9956-ffa450edef68
2014-10-28 21:14:41 +00:00
Scott Gray 306bfa48e6 Add filterByDate(Date) method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1634039 13f79535-47bb-0310-9956-ffa450edef68
2014-10-24 09:56:43 +00:00
Scott Gray 96cd99914e Remove unnecessary imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1634027 13f79535-47bb-0310-9956-ffa450edef68
2014-10-24 08:28:47 +00:00
Jacopo Cappellato b136187618 Fixed two typos in a comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633781 13f79535-47bb-0310-9956-ffa450edef68
2014-10-23 10:01:06 +00:00
Jacopo Cappellato 99a72aff4a Some modifications to the default configuration of log4j2:
1) added a comment to summarize the default configuration, with a reference to the online log4j2 documentation for further customizations
2) added a new appender for errors (or greater); implemented using a filter to keep the logger definition as clean as possible
3) removed the external appender because the amount of log statements (warnings or greater) from external jars is not large and should not cause much confusion if we keep them with OFBiz log statements
4) increased the number of rolling files for ofbiz.log to 10
5) changed date format to "yyyy-mm-dd hh:mm:ss.sss"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633550 13f79535-47bb-0310-9956-ffa450edef68
2014-10-22 07:50:08 +00:00
Jacopo Cappellato aada10a520 Removed 4 no more needed configuration properties (and associated fields).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633380 13f79535-47bb-0310-9956-ffa450edef68
2014-10-21 13:53:24 +00:00
Scott Gray c638cf936b Fix NPE when filtering by date without having specified a where EntityCondition. Thanks to Arun Patidar for the report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633218 13f79535-47bb-0310-9956-ffa450edef68
2014-10-20 20:10:27 +00:00
Jacopo Cappellato ac7bfdfbed Cleaned up the way the classloaders are setup at startup by removing duplicate logic and responsibilities between the start and base components.
Before this change the following classloader hierarchy was setup:
1) the "application" classloader for the "start" component
2) one "native lib" classloader for the "base" component
3) one "native lib" classloader for the all the other (non "base") framework/application/specialpurpose/hot-deploy components
4) one "web app" classloader for each of the webapplications

After this commit the hierarchy is simplified by merging #2 and #3:
a) the "application" classloader for the "start" component
b) one "native lib" classloader for the all the framework/application/specialpurpose/hot-deploy components (including the "base" component)
c) one "web app" classloader for each of the webapplications

This has been achieved by merging the code that was setting up classloader #2 in the start component (for the "base" component) with the code that was setting up the classloader #3 in the base component: now all the code is in the start component.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633182 13f79535-47bb-0310-9956-ffa450edef68
2014-10-20 16:13:33 +00:00
Ashish Vijaywargiya 63349b6a5f Applied patch from jira issue - OFBIZ-3382 - inter-app hyperlink generates incorrect url.
Thanks Pranay for the contribution and thanks Nathan for reporting the issue. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1632803 13f79535-47bb-0310-9956-ffa450edef68
2014-10-18 15:02:12 +00:00
Anil Patel a828e60213 [OFBIZ-3329] Removing framework code on resources in commonext.
Thanks Divesh and Mridul for helping with resuluation.
Thanks Adrian for reporting it. 
Thanks Chris Snow for reporting the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1632793 13f79535-47bb-0310-9956-ffa450edef68
2014-10-18 14:11:50 +00:00
Ashish Vijaywargiya b0dbca57c2 I forgot to commit a file in one of my recent commit r1626425. Committing it now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1632747 13f79535-47bb-0310-9956-ffa450edef68
2014-10-18 09:29:33 +00:00
Ashish Vijaywargiya 78497d4497 Applied bug fix from jira issue - OFBIZ-5632 - Changing Visual theme in Order manager results in error message.
===========================================================
The reported issue has been observed in the order manager application. It happens when there's no shopping cart in the session.

Steps to test -
1. Try changing visual theme in the order manager application.

Observations -
1. Returns ERROR MESSAGE - org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryOrderScreens.xml#quickFinalizeOrder: java.lang.IllegalArgumentException: Error running script at location [component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy]: java.lang.NullPointerException: Cannot invoke method getRelated() on null object (Error running script at location [component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy]: java.lang.NullPointerException: Cannot invoke method getRelated() on null object)

Thanks.
===========================================================

Thanks Vyom for reporting the issue and Thanks Pranay for providing the patch for the same. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1632733 13f79535-47bb-0310-9956-ffa450edef68
2014-10-18 06:17:49 +00:00
Scott Gray f01b2ef574 Improve filterByDate(Timestamp) to not filter by date when the passed in Timestamp is null. Better mimics the behavior of EntityUtil.filterByDate(Timestamp)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1631963 13f79535-47bb-0310-9956-ffa450edef68
2014-10-15 07:35:24 +00:00
Jacopo Cappellato e1c2fae001 Forgot to include the jars in my previous commit. Upgraded to the latest, now official, release of Freemarker: 2.3.21 Freemarker is now released under the Apache License 2.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1631300 13f79535-47bb-0310-9956-ffa450edef68
2014-10-13 06:53:21 +00:00
Jacopo Cappellato 5e106b124d Upgraded to the latest, now official, release of Freemarker
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1631299 13f79535-47bb-0310-9956-ffa450edef68
2014-10-13 06:45:42 +00:00
Scott Gray 827289c9bc Remove dead code
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1631019 13f79535-47bb-0310-9956-ffa450edef68
2014-10-11 04:52:32 +00:00
Scott Gray 13383b8abb Fix dead code warning by moving null check to the correct spot
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1631018 13f79535-47bb-0310-9956-ffa450edef68
2014-10-11 04:48:12 +00:00
Scott Gray dec29460dd Parameter name correction
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1630983 13f79535-47bb-0310-9956-ffa450edef68
2014-10-10 20:39:09 +00:00
Scott Gray c4f1e66527 Add where(EntityCondition...) to EntityQuery
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1630978 13f79535-47bb-0310-9956-ffa450edef68
2014-10-10 20:30:13 +00:00
Jacques Le Roux f0592e695c Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1630226 13f79535-47bb-0310-9956-ffa450edef68
2014-10-08 20:21:38 +00:00
Nicolas Malin 37bb53af64 Add junit test to control entity-auto on create, update and delete to ensure no regression when the entity-auto engine will be improve (like OFBIZ-5800)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1630079 13f79535-47bb-0310-9956-ffa450edef68
2014-10-08 12:17:55 +00:00
Nicolas Malin 52d93e3ef3 No functional change, clean end line space
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629816 13f79535-47bb-0310-9956-ffa450edef68
2014-10-07 07:35:55 +00:00