Jacques Le Roux
3b6a2ef490
Fix done from Sam Hamilton's demand on user ML (I used Fisheye ;o)
...
http://fisheye6.atlassian.com/browse/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?r1=673087&r2=678376
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689723 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 05:37:33 +00:00
Hans Bakker
a16c35484c
OFBIZ-1934: Ignore property for condition-expr tag, excellent contribution by Bruno Busco
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689713 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 04:17:48 +00:00
Andrew Zeneski
d3c9f3f289
added ant script for jboss deployment
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689211 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 20:37:07 +00:00
Andrew Zeneski
f42108441d
added option to disable log4j conifguration
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689210 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 20:36:42 +00:00
Andrew Zeneski
a737f00366
forced path changes due to problems with FTL and backslashes on non un*x environments
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689198 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 20:15:01 +00:00
Adrian Crum
04b1c1f098
PersistedServiceJob.java improved messages - no functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689179 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 19:34:06 +00:00
Scott Gray
d401ccbba3
A better fix for the work I committed in rev. 684244
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689040 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 11:58:19 +00:00
Jacques Le Roux
d9ea997381
Better French translation
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689036 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 11:34:40 +00:00
Scott Gray
92e100a004
Another groovy fix
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688968 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 06:07:15 +00:00
Scott Gray
5a7c81d4b5
Another groovy fix, this is actually more of a problem with the ModelService class which implements the Map interface but when groovy tries to determine the size of the map, the entrySet() call unexpectedly returns null
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688854 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 19:58:12 +00:00
Jacques Le Roux
d1587f0e0a
I crossed an error related to this, yesterday while trying to fix https://localhost:8443/facility/control/ViewFacilityInventoryByProductReport?action=Y&facilityId=WebStoreWarehouse&productTypeId=FINISHED_GOOD&productsSoldThruTimestamp=2008-08-25%2013:45:28.625
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688700 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 11:46:11 +00:00
Jacopo Cappellato
6bbb26c243
Fix for NPE happening for service implemented in Java in the service detail screen of the Artifact Info menu.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688631 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 06:23:45 +00:00
Jacopo Cappellato
b0a9ad29de
Fixed typo in new groovy file that was causing an error in the Artifact Info screen.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688627 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 06:04:13 +00:00
Scott Gray
43fd1226ec
Groovy fixes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688614 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 04:56:42 +00:00
Jacques Le Roux
1298fad3bd
i18n cleaning
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688535 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 17:30:37 +00:00
David E. Jones
3a461ea757
Added visitId persistence to EntityAuditLog stuff
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688498 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 12:09:37 +00:00
Jacques Le Roux
a92fbb545d
While at it some formatting
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688485 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 10:02:10 +00:00
Jacques Le Roux
e99e3f8174
I agree with Bilgin that 100 here is too much. Bilgin suggested 10 but I even prefer 5. I think that as an embedded part it's enough. Feel free to express your opinion and I will be happy to adapt following consensus.
...
This will avoid Bilgin to create a Jira issue ;o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688477 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 09:28:52 +00:00
Scott Gray
75e810a2d3
Converted the remaining framework bsh scripts to groovy
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688450 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 05:36:54 +00:00
Adrian Crum
eff5f89d39
Simplified Scott's FlexibleStringExpander NPE fix and updated the JavaDocs.
...
Many thanks to Scott for catching that, and many thanks to David Jones for his suggestions on the refactor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688348 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 15:56:17 +00:00
Scott Gray
eb425ac447
NPE fix
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688296 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 11:15:23 +00:00
Scott Gray
9b786b8159
Reverted the rest of Si's recent work since it doesn't look like he is going to complete/correct the RequestHandler part any time soon
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688265 13f79535-47bb-0310-9956-ffa450edef68
2008-08-23 06:17:06 +00:00
Adam Heath
839c7b6827
Stop deprecation warnings about ByteWrapper.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688220 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 23:02:17 +00:00
Scott Gray
a3cb1fb0b6
Recommitting r687578, changed slightly to follow Adam's lead
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688212 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 22:53:40 +00:00
Jacques Le Roux
3d050bde89
A couple of i18n and l10n stuff
...
Following Bilgin's recommendation, I almost successfully tested the iterate-section i18n using [<iterate-section entry-name="ownedFinAccount"...].
Almost, since I was unable to find the right paginate-target value as it's not a screen or a form but a screenlet.
Should we create an entry in the controller in such case? And if it's the case how, what to do ? In other words how do we call a screenlet ?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688167 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 18:23:42 +00:00
Adam Heath
06b236adae
Fix breakage with IN type operations.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687936 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 04:00:57 +00:00
Scott Gray
64c7041d3f
Reverted 687578, which will at least take the problem back to a minor bug rather than a major one, sorry everyone
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687918 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 01:09:14 +00:00
Adrian Crum
3ac5d11bb9
Added some synchronization code to FlexibleStringExpander.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687900 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 23:34:59 +00:00
Adrian Crum
65d194a557
Changed UtilObject.getByteCount(Object obj) exception handling to log verbose, since exceptions are regularly thrown and they were clogging up the console log.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687884 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 22:31:58 +00:00
Adrian Crum
4172761060
More FlexibleMapAccessor.java fixups.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687842 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 20:09:48 +00:00
Hans Bakker
dacfc87aa2
email poller seems to stop polling without notice...change log severity level
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687693 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 10:25:02 +00:00
Jacques Le Roux
750584e325
A patch from Bilgin Ibryam on dev ML
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687675 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 09:49:36 +00:00
Jacques Le Roux
a4f59ca86a
A patch from Luke Prentice "Sort related entities in ViewGeneric" ( https://issues.apache.org/jira/browse/OFBIZ-1921 ) - OFBIZ-1921
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687614 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 07:43:51 +00:00
Scott Gray
fd0e5ee7c0
Reverted some of the recent generics work which seems to be causing the issues reported in the user mailing lists by BJ Freeman and Sharan Foga.
...
Adam, it would be great if you could take another look at this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687578 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 06:31:02 +00:00
Adrian Crum
df34ed93d5
A small tweak of the FlexibleStringExpander.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687500 13f79535-47bb-0310-9956-ffa450edef68
2008-08-20 23:12:39 +00:00
Adrian Crum
3aa803f9bc
Small fix for UtilObject. The getByteCount(Object obj) method was returning unusual results for non-serializable objects. I also added an explanatory note in the JavaDoc.
...
An interesting article on getting the size of Java objects - http://www.javaworld.com/javaworld/javaqa/2003-12/02-qa-1226-sizeof.html?page=1 .
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687473 13f79535-47bb-0310-9956-ffa450edef68
2008-08-20 21:33:52 +00:00
Adrian Crum
ead3169d5c
FlexibleStringExpander refactor.
...
1. Improved parsing logic - the entire expression is pre-parsed now.
2. Factory method stores parsed expressions in the cache.
3. Single null/empty expression instance - saves on memory.
4. Class names and variable names shortened to reduce object size.
5. Small performance improvements.
The expression cache is set up with no limit. We'll have to see if that needs to be changed. Larger installations might need to limit the expression cache size.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@687422 13f79535-47bb-0310-9956-ffa450edef68
2008-08-20 18:50:04 +00:00
Adam Heath
c3054529c9
Allow joining of any item, not just string.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686845 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 18:51:08 +00:00
Scott Gray
3c0f8adf85
typo
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686695 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 08:29:28 +00:00
Adrian Crum
f7ab19876b
Removed availableLocales and availableTimeZones from screen rendering context - they are not needed anymore. Also deleted an unused ftl file.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686622 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 16:37:42 +00:00
Jacques Le Roux
e7905f2c8c
Fix the anti-pattern
...
if (* != null && *.size() > 0) {
where * is a variable name (String or Collection). Rewritten to
if (UtilValidate.isNotEmpty(*)) {
Done with Eclipse regex replace feature with
search = if \((\w+) *!= *null *&& *(\w+)\.size\(\) *> *0\) *\{
replace = if (UtilValidate.isNotEmpty($1)) {
And of course some hand-work for imports and cleaning. I compiled and tested with ant run-tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686591 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 07:47:18 +00:00
Scott Gray
c98e7dc59f
Removed unnecessary "error" response elements from the controller files, if no event is defined then "success" will always be the response name.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686577 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 00:00:49 +00:00
Adrian Crum
adc1d1d145
Collapsible masthead, based upon a patch provided by Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-1919 .
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686515 13f79535-47bb-0310-9956-ffa450edef68
2008-08-16 15:52:47 +00:00
Si Chen
c22c243cb9
reverted last commit
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686356 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 20:20:34 +00:00
Si Chen
a00fc0f160
more comments on OFBIZ-1915
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686311 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 18:32:58 +00:00
Si Chen
e5451f7f18
OFBIZ-1915 from Jeremy Wickersheimer for request-redirect-filter-param
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686301 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 18:15:39 +00:00
Adam Heath
a9084a6f0d
Add license header.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686256 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 15:41:20 +00:00
Adam Heath
fe7cddc3a2
More use of ServiceRegistry.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686251 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 15:29:29 +00:00
Andrew Zeneski
dae87c2e67
appears the the <include> sub-element cannot contain a list, instead each one needs to be named. Changed so that the properties are included again.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686027 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 20:41:34 +00:00
Adrian Crum
89245c4d92
Better handling of the masthead logo image link.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685969 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 17:33:29 +00:00