Commit Graph
2421 Commits
Author SHA1 Message Date
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
Adam Heath 284eecbe8f More space changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881683 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 06:20:15 +00:00
Adam Heath 4494ee3306 Use the location, instead of the url's file path, when parsing groovy
class files.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881659 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 03:44:06 +00:00
Adrian Crum 22b83c211f More Java object type converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881515 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 21:02:57 +00:00
Jacques Le Roux 834176ceaf A patch from Philippe Mouawad "Ofbiz freeze" (https://issues.apache.org/jira/browse/OFBIZ-2124) - OFBIZ-2124
In a certain scenario the application freezes, no more AJP connector threads are available.
After analysis the lock seems to come from very slow response time in GenericDelegator.clearAllCaches and particularily in CacheLineTable.keySet.
Furthermore, looking at org.ofbiz.base.util.cache.UtilCache, the class seems to have some synchronisation problems:
1) utilCacheTable.put calls are not synchronized
2) findCache synchronizes access to utilCacheTable while only getting an element which has big performance impact since utilCacheTable is static
3) clearExpiredFromAllCaches and clearAllCaches does not synchronize while clearCachesThatStartWith does, why ?

The patch synchronizes correctly the access to utilCacheTable and optimises findCache 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881194 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 08:36:35 +00:00
Scott Gray d79e59f640 Added java.sql.Date -> java.sql.Timestamp converter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881045 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 23:27:19 +00:00
Adam Heath 91050d9263 Very large update. SQL parser is fairly generic now. Can parse sql
that is compatible with features used by ofbiz.  Has support for
DELETE, INSERT, INSERT SELECT, SELECT, UPDATE, and VIEW.

Modified the delegator side of the above to handle the new
interfaces.  Now supports complex alias.  Only SELECT is supported,
and the parseCondition code is disabled for the time being.

The plan(sic) here is to obviously support the other sql statements.
Then, to have a jdbc wrapper around all this, so external tools, that
only know how to talk jdbc, can actually talk directly to the
delegator.

Plus, many more people can understand sql syntax.  This allows them
to do things with ofbiz, that they would find much more difficult if
they had to write <view-entity> definitions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880835 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 16:31:32 +00:00
Jacques Le Roux 03ac565c90 No functional changes just a clean-up : no intermediate var is needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835851 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:01:47 +00:00
Adrian Crum 7a5509a277 Small improvement to the Converters class. A converter is registered only once.
Now client code can create local instances of specific converters without interfering with the operation of the factory method.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:31:39 +00:00
Adam Heath eb02b4e77d Simplied the object graph, removed AbstractCollectionConverter. All
collection conversions now have proper generification.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835453 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:15:01 +00:00
Adam Heath edf7210d88 Remove extraneous blank lines, and trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835451 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:12:02 +00:00
Adrian Crum be36dd70be Changed the String to Timestamp converter code to fix a problem reported by Hans.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835440 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:52:23 +00:00
Scott Gray 6fa4e52764 Passed in locale was being discarded, fixes OFBIZ-3177 reported by Willem Janssen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835309 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:15:42 +00:00
Adrian Crum 19f8bf0228 More converter improvements. Better handling of strings supplied to formatting classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835197 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:31:59 +00:00
Adam Heath 172a135a56 Move getSourceClass and getTargetClass into the base class; removes a
bunch of code.  This also nescessitated the creation of a helper class
for collection containment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835164 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:47:03 +00:00
Adrian Crum 3fe7e1f03e Oops, I forgot to include one of the Converter collections in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835159 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:29:21 +00:00
Adrian Crum a55f49fce5 More improvements to the conversion framework, plus bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835032 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:35:34 +00:00
Adrian Crum ae236a6b7d Conversion framework improvements, fixed bugs reported on mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834978 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 17:45:33 +00:00
Adrian Crum 7ec17ed148 Some work on CachedClassLoader.java. Fixed non-thread-safe code, converted HashMap and HashSet to Javolution classes, added a registerClass method, and simplified the Init interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 00:39:44 +00:00
Adrian Crum 2f53c75789 Revert unintended change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:08:31 +00:00
Adrian Crum b4d02def78 Modified ObjectType.java to use only the new conversion framework.
This change can be reverted if any major issues come up. I will monitor the dev mailing list and fix any issues that are reported.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834552 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:18:34 +00:00
Adrian Crum 3fcdc998af Minor improvements to the new object type Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:14:58 +00:00
Jacques Le Roux 107acdde60 I prefer to revert as it's not needed anymore since r834444. I had an intuitive feeling that something was wrong, and forgot to check :( Thanks to Todor it's ok!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834447 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:16:43 +00:00
Adrian Crum ee835d014a Added Java type converters for the entity engine.
This commit demonstrates how the object type converter framework can be extended by other components.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833964 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:48:23 +00:00
Adrian Crum 5babe48c44 File missing in last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833828 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:12:20 +00:00
Adrian Crum 6d4917f304 Added Collection Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833827 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:08:26 +00:00
Adrian Crum 2070f32b2e Modified ObjectType.java to use the new Java object type conversion framework.
Since the new converters aren't finished, I set it up so conversions fall back on the old ObjectType.java conversion code when needed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:48:19 +00:00
Adrian Crum 99d3b54cb8 The new Java object type conversion framework. It isn't complete, but there is enough there to grasp the general idea.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:43:17 +00:00
Adrian Crum fba568b7bc Fixed incorrect framework/base test class binary name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833781 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:01:06 +00:00
Jacques Le Roux ac889d7a13 A modified patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 4 while loops by for loops. Doing that I removed the empty checks. So I also used a FastList in StrungUtile.split() which I also refactored a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:14:22 +00:00
Scott Gray f4c8abb56c Reverted changes to the trunk from r833294 that appear to have been intended for the birt branch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833303 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 05:22:58 +00:00
Hans Bakker 99f2b600db 1. fix framework for using jsp tag in freemarker.
2. change order building birt component to after common component in framework/build.xml file
3. specific birt container before beanshell container in framework/base/config/ofbiz-containers.xml file
4. specific loading birt component after bi component in framework/component-load.xml
5. list all birt's jar files that have Eclipse Public License - v 1.0 in LICENSE file
6. change example report's path in mail form's tooltip.
7. delete four duplicated jar files.
  - framework/birt/lib/axis.jar
  - framework/birt/lib/commons-discovery-0.2.jar
  - framework/birt/lib/axis-ant.jar
  - framework/birt/lib/commons-cli-1.0.jar

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833294 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 03:55:56 +00:00
Adrian Crum f30d44ccdc TimeDuration.java improvements. This is the first step in a duration data type implementation discussed here - https://issues.apache.org/jira/browse/OFBIZ-3125.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832574 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 21:58:00 +00:00
Adrian Crum f046004995 Remove Eclipse compiler warnings from framework/base component. Patch contributed by Marc Morin with additional work by me - https://issues.apache.org/jira/browse/OFBIZ-3102.
This commit requires an ant clean + build.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831550 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:22:05 +00:00
Jacques Le Roux 21488d7924 We don't need Telnet for the POS alone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830490 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 10:25:56 +00:00
Jacopo Cappellato 1755bb5560 Added demo truststore file to be used by client applications invoking services using the RemoteDispatcher (see for example the ExampleRemoteClient class).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 01:00:28 +00:00
Jacopo Cappellato 49da966a43 Fixed typo in comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829466 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 23:28:27 +00:00
Jacques Le Roux 1f46c6f5cc Now that it works OK, cleans things a bit about -pos and -both
Needs OFBiz to be build before it works (classloader)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828795 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 17:45:22 +00:00
Jacques Le Roux 1f9804b03b This slipped in with r825046. Thanks to Erwan who noticed it in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825057 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 08:38:35 +00:00
Jacques Le Roux 8bfd6d2c75 A patch from Erwan de FERRIERES "Translation of the OFBiz help system in French" (https://issues.apache.org/jira/browse/OFBIZ-3036) - OFBIZ-3036
Here is the beginning of the translation for the OFBiz help system in French. This is only the root page.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825046 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 07:36:33 +00:00
Jacques Le Roux 5dbe1fe524 I put a modified file in, this fix it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824967 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 22:58:19 +00:00
Jacques Le Roux 7beb1ad4a9 In this case I don't need to persist the property.
This changes just do that : set temporary the property in memory, and reset it back to its original value

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824937 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 21:37:49 +00:00
Jacques Le Roux a6fefdbeab When working with the POS I often need to use it in conjunction with back-end and sometimes even eCommerce.
This Windows batch file and container configurations just allow that. 
    startofbizBoth.bat loads the POS+EPR+eCommerce
    startofbizPos.bat loads only the POS
I did not care to write scripts for Linux yet because I do not have any needs.
I will certainly later if nobody has done it before...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824935 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 21:30:00 +00:00
Jacques Le Roux 8221fd7899 New feature : in the POS adds the possibility to create a client profile (for now : name, email, phone#, card id for promo), email is also used to create an user login with card id as pwd (login/pwd couple follows changes).
The card id is stored in the Person.memberId field. It's used as a promo code. So if the same id is defined as a promocode, any promotion using this promo code will be added to the cart when you select a client from the Client Profile screen. Else a message will pop when selecting the client.
The idea is to generate promo codes and to use them as card id when creating the physical card.

The Client Profile screen (from Promo button in promo panel) allow you to search for all client (all fields empty) or to focus on a client (at least one field files). For now the search use a stric equals but I plan to allow also contains (ie %like%)
You may edit the client profile and as explained above select a client to apply promotions related to his/her card id.
I plan to add a status bar at bottom of the POS screen to see promocodes used (you may still enter arbitrary promo code with the Promo Code button) or even maybe rather the related promotions (but I doubt there will enough place).
The promo code is used as long as the cart is open.

There are also some generics enhancement in PosTransaction not all related to this new feature.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 09:24:54 +00:00
Adam Heath d9b4865da7 Misssed a few createCache calls, bother.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823299 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:51:50 +00:00
Adam Heath 2275cb5b78 Don't create CacheLineTable each time setPropertiesParam is called.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823298 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:49:57 +00:00
Jacques Le Roux 8583100478 Fix a recursive bug
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823175 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:43:11 +00:00
Jacques Le Roux 73c3ef546d Anymore BSH scripts but Groovy (while struggling with something that seems related to cache in POS, still investigating, really weird...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822532 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 23:10:12 +00:00
Adrian Crum dd22f83c72 Improvements to the GenericDelegator refactoring - based on suggestions from Adam Heath.
I removed the deprecated methods from the Delegator interface. So, any replacements of GenericDelegator.getGenericDelegator(...) with the new factory method will have to include code to replace the deprecated method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821391 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 18:52:29 +00:00