Commit Graph
3778 Commits
Author SHA1 Message Date
Jacques Le Roux 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Bilgin Ismet Ibryam 803f423dc6 - Fixed wrong style used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883444 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 18:16:46 +00:00
Jacques Le Roux 7c92156d1c Some other fixes in help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883333 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:15:09 +00:00
Jacques Le Roux 49b2961e9c Fix few things in help files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883329 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:02:53 +00:00
Scott Gray b94f973c30 Allow a target and additional parameters to be specified when defining a portal page menu item, for example:
<menu-item name="main" parent-portal-page-value="${parameters.parentPortalPageId}"/>

can now be customized to point to a specific target rather than the default "showPortalPage":
<menu-item name="main" parent-portal-page-value="${parameters.parentPortalPageId}">
    <link target="MyCustomRequest">
        <parameter param-name="myCustomParam" from-field="parameters.myCustomParam"/>
    </link>
</menu-item>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883239 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 04:06:27 +00:00
Scott Gray 0d359fca2c Allow a WidgetWorker.Parameter instance to be created without an Element
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883235 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:34:30 +00:00
Adam Heath 1e2d73707f Switch to ConcurrentHashMap for utilCacheTable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883230 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:07:01 +00:00
Adam Heath 10bc1da16b Remove all but one constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883229 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:06:21 +00:00
Adam Heath c4a0d6d66d Make utilCacheTable private.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883228 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:05:30 +00:00
Adam Heath e4718ddb62 Add a helper method, getUtilCacheTableKeySet, and use that in
FindUtilCache.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883227 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:04:50 +00:00
Adam Heath 07d88a3152 Use getOrCreateUtilCache here too.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883226 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:03:59 +00:00
Adam Heath 6e0fcf060a No longer access utilCacheTable from AbstractCache; this nescessatited
creating a getOrCreateUtilCache helper method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883225 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:03:20 +00:00
Adam Heath 95264791c2 Move getCacheName out of the synchronized block.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883224 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:02:27 +00:00
Adam Heath 760632627c Add another createUtilCache variant that allows for extra properties to
be looked upped for setting parameters.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883223 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:01:37 +00:00
Adam Heath 8c800494de Fix defaultIndices manipulation, by switching to ConcurrentHashMap; this
has a good side-effect of fixing the total lack of synchronization on
the previous version.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883222 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:00:49 +00:00
Adam Heath b625a1ff4d Make defaultIndex calculation field and method private and static.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883221 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 03:00:04 +00:00
Adam Heath 0a1ab8a989 Move utilCacheTable.put out of the constructors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883220 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:59:22 +00:00
Adam Heath f691ed6312 Make utilCacheTable final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883219 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:58:36 +00:00
Adam Heath b6788006fb Make all constructors private(removing deprecation while doing so), and
then make the name property private/final.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883218 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:57:47 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Adam Heath 60e0905b7f Fix generics in getUtilCacheTableValuesImage.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883216 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:52:29 +00:00
Scott Gray 393673369f Prevent errors when no portlet description is available
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883192 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 23:52:25 +00:00
Adam Heath c31e3499ed Add flags to disable joins on DELETE and UPDATE.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883138 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:07:29 +00:00
Adam Heath 4976cbb3da Plans that have condition objects now store those in the abstract classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883137 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:06:34 +00:00
Adam Heath be7b27b4cf Fix StackOverflowError in EntitySelectPlan.toString.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:05:01 +00:00
Jacopo Cappellato c3ee42f73a New improved version of an enhancement to the service framework after I reverted my first one because it was causing some issues with service validations.
Added two new IN parameter, internally (and automatically) set for service definitions:
login.username
login.password
They are already used by the authorization service ("userLogin") to authorize the user to the service call and to retrieve the userLogin object (if the user is authorized).
They can be passed to the service in the input context in place of the userLogin object: this is useful when the service is invoked from a remote system (thru SOAP etc...).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883056 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 10:23:09 +00:00
Jacques Le Roux d251bbf486 Not really forgotten in previsou commit (r883017) but was on ignore-on-commit Toirtoise changelist and anything in this list is not committed even if checked (lesson learned)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883019 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:24:59 +00:00
Jacques Le Roux fcb48aa971 A modified patch from Marco Risailit " Add the possibility to filter the list of available countries from the drop down." (https://issues.apache.org/jira/browse/OFBIZ-3192) - OFBIZ-3192
I have used StringUtil.split() and enhanced for loops instead

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883017 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 00:20:12 +00:00
Scott Gray 24b64728fe Throw a ContainerException if any tests are unsuccessful during a test run and have the run-tests target fail if that is the case
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882995 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 21:20:50 +00:00
Bilgin Ismet Ibryam 338f778a57 Fixed form header links.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882959 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 18:29:45 +00:00
Bilgin Ismet Ibryam 9053ef47d1 Used raw string literal to escape ${} chars in example labels. This fixes the error reported in user list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882948 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 18:01:50 +00:00
Bruno Busco 6a4aafa0ad Added license header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882935 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 15:57:34 +00:00
Jacques Le Roux ff15fe93e5 A patch from Carsten Schinzer "Seed data (GEO) for Gemany contains bugs." (https://issues.apache.org/jira/browse/OFBIZ-2759) - OFBIZ-2759
Commited in CTR mode...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882918 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 14:45:40 +00:00
Jacques Le Roux a5eae6afcc Add an EncryptedString format possibilities in datafile (use in Record.java, needed some changes to build in framework/build.xml and datafile/build.xml)
+ datafile/dtd/datafiles.xsd enhanced with some documentations, and an enumeration for the type: I used all occurrences found in Record.setString() method)
+ datafile/dtd/datafiles-catalog.xml added
+ Few generics cleaning in login/LoginServices.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882892 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 13:10:07 +00:00
Jacopo Cappellato c55722b2e3 Reverted change I did in 882187 because Bilgin Ibryam has reported an issue with it (it is causing an error in services which require auth).
I will investigate more and provide a better fix.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882836 13f79535-47bb-0310-9956-ffa450edef68
2009-11-21 07:28:20 +00:00
Bilgin Ismet Ibryam 6e05f75909 Made forms inside list forms with unique IDs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882794 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 23:52:31 +00:00
Bruno Busco aee9b7b437 Moved some application labels out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:50:31 +00:00
Jacopo Cappellato 6a845bf5a4 Added empty menu widget macro renderers for csv, xml, xsl-fo, text: they are require to properly render screens containing menu.
However they are empty and so the menu will not be rendered with this output (which should be fine).
OFBIZ-3207


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882601 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:26:45 +00:00
Jacques Le Roux 1f23dcaae0 A patch from Erwan de FERRIERES "Add an ant task to download the postgreSQL JDBC driver" (https://issues.apache.org/jira/browse/OFBIZ-3232) - OFBIZ-3232
This add a simple ant to download the postgreSQL JDBC driver, to simplify the installation of a database based on this engine
Currently it works only for the last drivers available : postgresql-8.4-701.jdbc4.jar. But this may be easily adapted.

I have also added an svn ignore for postgresql-8.4-701.jdbc4.jar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882502 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 11:06:44 +00:00
Adrian Crum f342a9804b Small fixup for last commit - intern() the field type name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882243 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 18:48:30 +00:00
Adrian Crum fdf56b40b0 Major code cleanup in ModelFieldTypeReader.java. Eliminated unused fields, made public fields protected, simplified code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882236 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 18:16:35 +00:00
Jacopo Cappellato 23a095ab67 Added two new IN parameter, internally (and automatically) set for service definitions:
login.username
login.password
They are already used by the authorization service ("userLogin") to authorize the user to the service call and to retrieve the userLogin object (if the user is authorized).
They can be passed to the service in the input context in place of the userLogin object: this is useful when the service is invoked from a remote system (thru SOAP etc...).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882187 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 16:06:43 +00:00
Jacques Le Roux 65601eeccd A patch from Abdullah Shaikh "SagePay payment gateway integrated" (https://issues.apache.org/jira/browse/OFBIZ-3180) - OFBIZ-3180
SagePay payment gateway integrated. All the gateway parameters are configurable using the Payment gateway configuration, also the transaction types that are available in sagepay are configurable.

I moved the httpclient httpcore jars to base/lib (also new jcip-annotations-1.0.jar)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 11:01:29 +00:00
Jacques Le Roux c28207e323 A patch from Philippe Mouawad "OutOfMemory provoked by Cache overflow" (https://issues.apache.org/jira/browse/OFBIZ-2186) - OFBIZ-2186
CacheLineTable and LRUMap do not synchronize on the same lock

    * CacheLineTable synchronization use the CacheLineTable instance monitor
    * LRUMap synchronization use the LRUMap instance monitor

the LRUMap (memoryTable) can be updated concurrently by 2 differents threads

    * one in the CacheLineTable #put or CacheLineTable#remove
    * another in the CacheLineTable#get

this leads to the corruption of the LRUMap which is not thread-safe

the CacheLineTable#get should be synchronized or the LRUMap should be replaced by a thead safe collection

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882072 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 08:25:48 +00:00
Scott Gray b9b0a55b55 When possible log the actual test case name, makes debugging a lot easier
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882060 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 07:09:18 +00:00
Bruno Busco e1b3275805 Moved some application labels out of the framework (more to come)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882011 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 00:10:52 +00:00
Bruno Busco 220705d2da A slightly modified patch from Sascha Rodekamp "Drag 'n' Drop for myPortal + update prototype and script.aculo.us"
(https://issues.apache.org/jira/browse/OFBIZ-3190) - OFBIZ-3190

- I changed some tabs to spaces
- It seems to me that everything works with the script.aculo.us version that is already present in the framework; so I did not commit the script.aculo.us update since could break some other thing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881999 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:31:59 +00:00
Jacques Le Roux 189e7ad383 A patch from Erwan de FERRIERES "Misc. French translations" (https://issues.apache.org/jira/browse/OFBIZ-3222) - OFBIZ-3222
Some translations for the accounting component, and for the CommonUiLabels file 

I have also changed some other labels in ProductEntityLabels.xml and ProductUiLabels.xml while I was at it 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881987 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:03:48 +00:00
Bruno Busco 57d4cb5ea9 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881944 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 21:34:56 +00:00