Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 032960984a Bug fix in new ServiceConfigUtil code - do not use cached DOM object when creating models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488694 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 12:19:02 +00:00
Adrian Crum 86aef5bf36 Converted JobPoller.java over to the new service config design.
https://issues.apache.org/jira/browse/OFBIZ-5204


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488671 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 11:32:30 +00:00
Adrian Crum 38a3319174 Bug fix for NotificationGroup.java - if the <notification-group> element name attribute is being used as the key to a Map, then we should make it required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488646 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 06:41:54 +00:00
Adrian Crum 59633013b4 Clean up and format service-config.xsd so it is easier to read and understand.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488645 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 06:37:11 +00:00
Adrian Crum fac18de056 New models for the serviceengine.xml file. They are not used yet - the ServiceConfigUtil class needs to be updated to use them, as well as other code that uses ServiceConfigUtil. The new models were contributed by Christoph Neuroth and were refactored by me.
https://issues.apache.org/jira/browse/OFBIZ-5204




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488643 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 05:15:57 +00:00
Adrian Crum 6e88a24bcb Fixed some bugs in the form widget column sorting code:
1. URL parameters were being mangled by clunky string manipulation code.
2. The sort column logic was piggy-backed on the pagination event. I created a new choice for the form widget <on-event-update-area> element - "sort-column" - so column sort events can update their own areas.
3. The parameter name for the sort column was hard-coded, so column sorting in multiple lists on the same screen would not work. I added a new <form> attribute - "sort-field-parameter-name" - so each list can be sorted separately.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488315 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 17:07:00 +00:00
Adrian Crum babfc9bfdd Small improvement to the Ajax JS functions - allow a complete screen refresh if the specified area ID equals "window". This is helpful for form widgets that have certain events that require a screen update instead of a container update.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488240 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 14:10:17 +00:00
Adrian Crum 9b0094f191 Small fix for screen widget <container> element - allow expressions in the auto-update-interval attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1487966 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 18:48:28 +00:00
Adrian Crum bd2edf26f6 Fixed a bug in ajaxUpdateAreaPeriodic JS function - the interval parameter is seconds, not milliseconds.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1487923 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 16:44:23 +00:00
Adrian Crum 7d7407caba New feature - Column screen widgets. This enables easy layout of multi-column screens/reports. The columns are rendered as <table> elements - so no more broken layouts caused by unpredictable floats, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1487587 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 18:17:46 +00:00
Jacques Le Roux 33e003d376 Sometimes, when the server is a bit slow, it's enjoyable to know it. This spin waiter will help in those cases
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1487405 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 08:47:43 +00:00
Adrian Crum c1cc2308b0 Updated the HTML DOCTYPE declaration - paving the way for HTML5.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1486831 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 09:21:36 +00:00
Adrian Crum 57205498d6 Fixed some FIXMEs in MacroFormRenderer.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1486828 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 09:14:42 +00:00
Adrian Crum a67fd498c1 Clean up code formatting in MacroFormRenderer. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1486784 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 07:11:39 +00:00
Adrian Crum f1a85663d1 Entity engine optimization: Use SELECT * when the fields to select have not been specified.
There was some code to check for this, but it was testing a "fields to select" List that was never empty, so SELECT * was never used.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1486552 13f79535-47bb-0310-9956-ffa450edef68
2013-05-27 09:49:02 +00:00
Jacques Le Roux 334c716283 Add a mean to collect and show the Requests Events durations using Metrics https://issues.apache.org/jira/browse/OFBIZ-5198
This has involuntarily slipped in, thanks to Adrian who reviewed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1485620 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 09:05:38 +00:00
Jacques Le Roux eb9f05e7aa Add a mean to collect and show the Requests Events durations using Metrics https://issues.apache.org/jira/browse/OFBIZ-5198
Fulfill the goal with some more:
* makes the Metrics main parameters (estimationSize, estimationTime and smoothing) dynamically changeable (added in serverstats.properties)
* there is no threshold handling for event metrics


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1485601 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 07:55:14 +00:00
Adrian Crum fa77ee6655 Fixed a bug in the entity engine pk cache where view entities went stale - https://issues.apache.org/jira/browse/OFBIZ-5192.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484279 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 12:29:44 +00:00
Adrian Crum 00e0e6555d Fixed a problem in Web Tools that was caused by recent entity model changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484268 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 10:58:14 +00:00
Adrian Crum e0ccd44b0f Small improvement to the Performance Metrics feature - sort by name the list of metrics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484150 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 17:31:45 +00:00
Adrian Crum e5099432a0 Fixed a bug in the performance metrics feature where the wrong request Map was being updated in some cases.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484145 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:46:01 +00:00
Adrian Crum 9bd42ec3a2 Reverted revision 1483822.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484134 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:12:50 +00:00
Jacques Le Roux 929a06dfd5 Improves the Metrics stats by adding a new column used only by requests. It's quite useful to measure the real (not smoothed) durations of events in notably *chained* requests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1483822 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:21:02 +00:00
Jacques Le Roux 8ca89fc25d Reverts r1482796 and comments about no current implementation rather than removing attributes
Thanks to Jacopo's comment in dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 15:38:43 +00:00
Jacques Le Roux 3abb2933d6 When I moved XA Pool to the Attic I forgot to remove these XA Pool specific attributes. They were now misleading.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482796 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:50:54 +00:00
Adam Heath 7b9961afcd FEATURE: In NoTransaction.call, completely unwrap all nested exceptions, and re-wrap the innermost one. This is just like InTransaction.call.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482509 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:09:38 +00:00
Adam Heath 952e43cdb5 FEATURE: When calling services from an incoming http requests, allow for a different request and session attribute name to be specified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482508 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:09:31 +00:00
Adam Heath 8133384848 FEATURE: Add TimestampToString converter; this parallels the existing StringToTimestamp implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482507 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:09:22 +00:00
Adam Heath 01822c38e0 FEATURE: Add safeAdd, which protects against BigDecimal addition when the right operand is null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482506 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 18:09:16 +00:00
Adam Heath a4b4054c77 FEATURE: Remove use of empty ArrayList/HashMap, instead using
Collections emptyList/emptyMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482441 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 16:38:30 +00:00
Adam Heath dbfb52c701 FORMATTING: Improve formatting; no single-line if, use {} for if.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482440 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 16:38:23 +00:00
Hans Bakker e72c65e187 add an optional timeout parameter to the ftp service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482177 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 02:53:33 +00:00
Adam Heath 8b9c0e537b OPTIMIZE: Remove all SuppressWarnings("unchecked") from the entity
engine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482152 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 23:52:52 +00:00
Adam Heath ec142071b0 FEATURE: If the user gets forcibly logged out, store a message into the
request that mentions this; currently, nothing uses this, but that is
coming soon.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482132 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:31:20 +00:00
Adam Heath 4e5c0a7647 FIX: in urlEncodeArgs, don't call obj.toString if the obj is an Array or
a Collection; instead, iterate over each memeber and encode that.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482131 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:31:12 +00:00
Adam Heath e787885bb6 FEATURE: Allow events to return "none"; they can already return null,
which stops processing.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482130 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:31:04 +00:00
Adam Heath da1f1f92e6 FEATURE: Allow first-visit and preprocessor events to run "none"; this
is the same as null, and will stop processing.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482129 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:30:55 +00:00
Adam Heath 2b25d70adf FEATURE: Split checkLogin, creating checkLogout, which is a helper
method that returns a valid UserLogin entity, or null if permissions or
other reasons cause it to be invalid for the current scenario.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482128 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:30:47 +00:00
Adam Heath 2ebf5a22ed FEATURE: Make isUserLoggedIn(request), loginUserWithUserLoginId(request,
response, userLoginId) and hasBasePermission(userLogin, request) public,
instead of private/protected.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482127 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:30:40 +00:00
Adam Heath 2046bec01a FIX: Forgot to add this new file when I added the ability to disable ssl
certificate checking.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482126 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:30:32 +00:00
Adam Heath 805dce79b8 FIX: I have no idea why an explicit <mkdir> is neeeded for build/rmi; in
all cases I could find, it was already auto-created.  It's only the
buildbot that is broken.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482125 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:30:25 +00:00
Adam Heath 2cbd5ac701 FEATURE: Add a join() variant that takes a collection.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482069 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:06:11 +00:00
Adam Heath 92079f7a65 OPTIMIZE: join() now calls UtilValidate.isEmpty().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482067 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:06:03 +00:00
Adam Heath 105854b8f6 FEATURE: Add ability to disable client and server side certificate
checking.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482064 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:05:33 +00:00
Adam Heath a5385a682f FEATURE: Reworked to expose a getSSLContext helper method, called by
everything else.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482062 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:05:26 +00:00
Adam Heath 3cfa43e2b1 FIX: In stripNamedParamsFromQueryString, prevent && from occuring in the
resultant buffer.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482061 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:05:18 +00:00
Adam Heath 69671f1fe7 FEATURE: Instead of placing the rmi jar into build/lib, but with a .raj
extension, place it into build/rmi, and let it keep the correct .jar
extension. This means you don't need to rename the jar when you copy it
to the remote java virtual machine, but just have to move it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482060 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:05:11 +00:00
Adam Heath a9895a1c75 FEATURE: Split out the definition of all the handlers into a separate
file; this allows for webapps that need to do non-standard things, but
not have to define all the available handlers themselves.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482059 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:05:06 +00:00
Adam Heath 432ce20711 FEATURE: Switch derby <inline-jdbc> to use the external
passwords.properties.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482057 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:04:59 +00:00
Adam Heath 158bc8b1de FEATURE: Allow for passwords in entityengine.xml to come from an
external passwords.properties file; nothing actually uses this yet,
however.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482056 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:04:51 +00:00