Commit Graph
98 Commits
Author SHA1 Message Date
Erwan de Ferrieres 2b854ca29b groovy 1.7.4 bugfix release (notes : http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10242&version=16563)\n this time it's ok
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987905 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 13:57:31 +00:00
Erwan de Ferrieres ef9dbea9f9 reverting previous commit, sorry, I was a bit too speed on this one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987767 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 14:46:07 +00:00
Erwan de Ferrieres 5c4d25735d groovy 1.7.4 bugfix release (notes : http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10242&version=16563)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987766 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 14:27:49 +00:00
Hans Bakker 2d9b75a30f this is a revert of r731487 to downgrade freemarker from 2.3.15 to 2.3.10 because of speed problems. In order to make the older version work we changed the following:
- create new OfbizCatalogUrlTransform class
- delete CatalogUrlDirective.java class
- set ofbizCatalogUrl transform to OfbizCatalogUrlTransform class
- In htmlFormMacroLibrary.ftl file, change floor directive to floor method of Math class
- change freemarker version in .classpath and LICENSE files
We are in discussion with the freemarker developers to solve this problem there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986577 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 06:33:12 +00:00
Erwan de Ferrieres 926d4ea1dd Upgrading to Commons FileUpload 1.2.2, bug fix release from August 2010
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985714 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 17:09:49 +00:00
Adam Heath 8a23b9998c Missed some files in the tomcat 6.0.29 upgrade, and also updated LICENSE
and .classpath.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985309 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 18:00:36 +00:00
Erwan de Ferrieres 124f19b1b4 Finally adding Apache FOP 1.0, barcode generation is now working
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966662 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 14:02:39 +00:00
Erwan de Ferrieres 9a78318c28 Reverting FOP1.0 integration as it is breaking the barcode generation. Still some work to be done
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966392 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 19:56:00 +00:00
Erwan de Ferrieres d5020c9d5e Adding the new FOP 1.0 to OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966285 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 15:44:16 +00:00
Erwan de Ferrieres e710059ab7 OFBIZ-3798 Add xml-rpc engine on serviceengine - A new patch from Nicolas Malin (https://issues.apache.org/jira/browse/OFBIZ-3798) - Also updating xml-rpc libs from 3.0.1 to 3.1.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959261 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 10:52:12 +00:00
Erwan de Ferrieres 0803e3c6f1 Reverting previous commit as it wasn't fully reviewed and was producing errors. Sorry guys...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959076 13f79535-47bb-0310-9956-ffa450edef68
2010-06-29 19:19:55 +00:00
Erwan de Ferrieres ad183f5cea OFBIZ-3798 Add xml-rpc engine on serviceengine - (https://issues.apache.org/jira/browse/OFBIZ-3798)
A patch from Nicolas Malin - adding a generic service to call xml-rpc server. The goal is to have a technical interface to make calls directly from mini-lang.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959071 13f79535-47bb-0310-9956-ffa450edef68
2010-06-29 18:43:56 +00:00
Erwan de Ferrieres 35fed9293a Replacing groovy with the lastest stable release (we had a rc since december 2009)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@955036 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 20:17:17 +00:00
Adam Heath 6e07055341 Re-apply 948328, which brings us back to using the more efficient clhm,
but now UtilCache is not strictly least-recently-used.  Instead, it's
more of a less-recently-used.  This difference can be seen when reducing
the max-in-memory setting(but not reducing completely to 0).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948449 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 14:23:11 +00:00
Adam Heath 95e6fc9f7d Revert "As suggested by Ben Manes at "Upgrade ConcurrentLinkedHashMap" (https://issues.apache.org/jira/browse/OFBIZ-3779) - OFBIZ-3779"
The new library does *not* function correctly.  It breaks the
testChangeMemSize test case.  Reducing the memory size *must* still obey
the LRU settings; the new library removes items at random.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948328 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 05:52:11 +00:00
Jacques Le Roux 8a9c6ea716 As suggested by Ben Manes at "Upgrade ConcurrentLinkedHashMap" (https://issues.apache.org/jira/browse/OFBIZ-3779) - OFBIZ-3779
The UtilCache class should use v1.0 of the CLHM library. While the previous version is fully functional, I am no longer supporting it. The new design should be faster and more reliable due to not needing to use a pseudo LRU algorithm for performance (which has degradation scenarios). A true LRU is now supported with no lock contention issues. Please consider upgrading when convenient.

http://code.google.com/p/concurrentlinkedhashmap/

JavaDoc:
http://concurrentlinkedhashmap.googlecode.com/svn/wiki/release-1.0-LRU/index.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947993 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 10:08:04 +00:00
Erwan de Ferrieres 4588877bc2 forgot to remove those file from the SVN at r938061. Thanks Jacopo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938074 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 14:54:17 +00:00
Erwan de Ferrieres 6d82a3d889 Migration to Tomcat 6.0.26. Tests are running well
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938061 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 14:33:43 +00:00
Adrian Crum 84626504a0 Updated the ICU4J library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933324 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 17:06:42 +00:00
Adam Heath 426dc6fa7b Remove javacc from the runtime library path.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930731 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 18:47:22 +00:00
Adam Heath e5b8e12d8a No longer use LRUMap, but a non-blocking variant,
ConcurrentLinkedHashMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929820 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:35:31 +00:00
Adam Heath 548da39c81 Upgrade jdbm to a snapshop from svn, version 38; this new version
finally supports generics markup.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929809 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:26:40 +00:00
Adam Heath 8f84e88df1 Junit assertThat syntactic sugar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926922 13f79535-47bb-0310-9956-ffa450edef68
2010-03-24 03:21:38 +00:00
Adam Heath 90698c511a Removed concurrent backport, as it is only useful when running on java
1.5, and ofbiz requires 1.6 now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915167 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 03:51:02 +00:00
Adrian Crum 668e940a69 Added the XStream library to the project:
http://xstream.codehaus.org/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@909650 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 23:09:20 +00:00
Adam Heath fa8dc60733 Upgrade javolution library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@908678 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 22:12:50 +00:00
Adrian Crum 5cc09d78fc Updated the ical4j library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@905128 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 21:48:22 +00:00
Adrian Crum a1df25e132 Updated the commons-lang library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@905120 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 21:16:17 +00:00
Adrian Crum 93aea39578 Updated the commons-codec library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@905115 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 20:32:14 +00:00
Adrian Crum b416829c08 Upgraded JUEL library to 2.2.1.
The UEL specification (JSR 245) has been updated. Object method invocations are now supported.

http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html

The new JUEL library also supports method varargs, but keep in mind that it is a JUEL extension - not a part of JSR 245.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@904937 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:38:59 +00:00
Adam Heath ac8c6c51c0 Add trax support libraries, so that junitreport can work.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@892694 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 05:31:11 +00:00
Adam Heath c95c42b395 Upgrade ant to 1.7.1.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@892693 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 05:30:14 +00:00
Adam Heath d22fbbe257 Upgrade asm from 2.2 to 3.2; this required upgrading to an unreleased
version of groovy(ick), and a new webslinger snapshot.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@889836 13f79535-47bb-0310-9956-ffa450edef68
2009-12-11 22:21:36 +00:00
Jacques Le Roux fbae8a234f A patch from Patrick Antivackis "In owasp-esapi-java, htmlCodec.decode is broken for all entities where entity.substr(0, x) exists ." (https://issues.apache.org/jira/browse/OFBIZ-3135) - OFBIZ-3135
I checked the diff Patrick provided against http://code.google.com/p/owasp-esapi-java/source/detail?r=755 and found no differences (except test classes no present of course)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884781 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:26:54 +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
Hans Bakker 0de880f3ef adding docbook dtd/xsd, templates to generate html/pdf and more. Approval was obtained by email to Norman Walsh with the question: Is there any objections in including Docbook dtd/xsl/xsl files in Apache OFBiz, his answer: None at all. Share and enjoy! (Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808410 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 13:29:07 +00:00
Adrian Crum e4ee374a66 Conversion from java.util.Calendar to com.ibm.icu.util.Calendar. I didn't convert the Cloud component - I wasn't sure if the Calendar class was being passed through SOAP.
OFBiz users who have modifications or add-ons can make the same substitution to get them to compile.

I'll let the dust settle from this, then I'll add the user-selected calendar capability.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792987 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 15:39:21 +00:00
Adam Heath 04c6a9b2b1 New upstream; fixes line numbers in wrap, and improves the css rules
matching.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789866 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 18:31:12 +00:00
Adam Heath 03b030b475 Yet another update. Very very close. Hunting rabbits.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783564 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 23:00:26 +00:00
Adam Heath 783130b58d Add ability for simple methods to be wrapped with a custom compiled
class.  The resource location from where the simple method was read
is encoded as the classname of the proxy.  This makes debugging
simpler to do.  This feature is turned off by default.

The wrapping code has support for setting the line number, to include
in stack traces.  However, DOM-based xml parsing doesn't record line
numbers, so it's not possible to encode that into the wrapped proxy
class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783060 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 16:19:50 +00:00
Adam Heath 22adfe3826 Upgrade to a newer groovy.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783054 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 16:10:53 +00:00
Jacopo Cappellato 3b7e656368 As suggested by Joe Eckard in the ml, this will fix the barcode rendering that was broken after recent upgrade of FOP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769500 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 19:04:37 +00:00
Christian Geisert f66cfd956a added missing Jar for FOP (needed for SVG/Barcode generating)
Barcode still not working


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769030 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 15:42:11 +00:00
Adrian Crum a334c6d401 Updated Xerces to version 2.9.1. This update will generate some deprecation warnings at compile time. I will be working on updating the framework code to eliminate the warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768339 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 15:55:14 +00:00
Jacques Le Roux 2ca2feef1a Changes from Erwan de FERRIERES "Upgrade of the fop library (0.94 -> 0.95)" https://issues.apache.org/jira/browse/OFBIZ-2317 - OFBIZ-2317
+ LICENCE updated (libraries wiki page also updated)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 19:42:46 +00:00
Adrian Crum 21ff1c14e9 Updated the JUEL library. Added two UEL functions for handling sequence IDs used as Map keys.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764323 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 20:39:52 +00:00
Adam Heath 456003d059 Fix webslinger running against java 1.5.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753474 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 23:25:08 +00:00
Adam Heath c32dd093b8 Add janino, but nothing uses it yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753078 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:05:54 +00:00
Adam Heath f8b6cee335 Upgrade to a newer commons-vfs(a snapshot, unfortunately).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753077 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:02:45 +00:00
Jacques Le Roux cb74438cd4 Refactoring of ImageTransform, mostly
* Split into 2 classes one in framework/common : ImageTransform, one remains in product : ScaleImage.java
* Moved some labels used by ImageTransformCreated from ProductErrorUiLabels.xml in new CommonErrorUiLabels.xml  
* Moved Jdom from webapp/lib to base/lib, updated .classpath


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750018 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 14:22:55 +00:00