Commit Graph
2421 Commits
Author SHA1 Message Date
Adam Heath a2fd254167 Make FreeMarkerWorker.getWrappedObject auto-cast to whatever type the
caller wants.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044232 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:21:09 +00:00
Adam Heath d61ce6486f Move variable declarations until they are actually used, instead of
assigning null, then force-reassigning the real value later.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044230 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:49 +00:00
Adam Heath 90c849bb36 Remove unnecessary cast when fetching the compiled template from the
UtilCache cache.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044229 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:42 +00:00
Adam Heath 762a3b6630 Fix some spacing issues, no code changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044228 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:35 +00:00
Adam Heath 2f6217251a Set svn:eol-style properly on all java files. This needs to be done on other text files as well, but that would cause undo conflicts in the jquery branch(due to .js being heavily modified there). Also, some files were committed to the repository with DOS line endings; those are fixed as well.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044202 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 02:40:02 +00:00
Adam Heath 192418385b Several utility methods for copying streams and
readers/writers/appendable.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040798 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 22:03:40 +00:00
Jacques Le Roux 66c5dd10a0 A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
Jacques Le Roux e7bdf3d27e This comment is not true anymore (you can set things using POP/IMAP transfer menu option in your GMail account).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004238 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 13:54:25 +00:00
Jacques Le Roux ad6c8a8341 Deprecates renderTemplateFromString from Scott's remark on dev ML.
I also removed a wrong @Override annotation for OFBizTemplateExceptionHandler

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004148 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 08:55:13 +00:00
Jacques Le Roux 8372d0cf87 A patch from Sascha Rodekamp "Additional parameter for FreeMarker to tell if it should load ftl files from cache or not" (https://issues.apache.org/jira/browse/OFBIZ-3970) - OFBIZ-3970
This patch allows you to tell FreeMarker if it should load the ftl files from cache or not as extension for the method description. If you have a few screens which shouldn't use the cache you can configure them separately. The use case is loading content with templates which are stored in the DB and can be modified during the runtime (CMS). 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003943 13f79535-47bb-0310-9956-ffa450edef68
2010-10-03 10:03:14 +00:00
Hans Bakker 3a4caa0038 add role set for 'th' locale into 'Rule Base Number Format Rule Sets'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003459 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 09:56:20 +00:00
Ashish Vijaywargiya 58b5d276a6 Correcting the condition. Thanks Akash for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998061 13f79535-47bb-0310-9956-ffa450edef68
2010-09-17 10:40:20 +00:00
Jacques Le Roux ace6cf5af1 Reverts r991485 and adds a comment to avoid this in the future
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997526 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 22:19:26 +00:00
Ashish Vijaywargiya 7126bb1f03 For now reverting my commit r995384 as it was creating issues for others.
Very soon I will get back here with better fix, till then I will maintain patch for my own work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996122 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 11:21:42 +00:00
Ashish Vijaywargiya 4f8585623a Fixing bug of reading node name. When we read first child element of the response of any third party integration for example ups etc, node name can't be read using "node.getLocalName()". So changing node.getLocalName() --> node.getNodeName().
Thanks Vivek for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995384 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 11:32:28 +00:00
Adam Heath 32fd7f2533 Add systemId to xml node location tracking; this is based on the
docDescription passed in, which in normal cases is the URL.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995202 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:18 +00:00
Jacques Le Roux 427d8fc258 A patch from Liu Xiangqian "method writeObject(StringBuilder sb, Object value, boolean allowJsonResolve) in UtilIO always throw an IOException" (https://issues.apache.org/jira/browse/OFBIZ-3916) - OFBIZ-3916
Tried to invoke method UtilIO.writeObject() but found the following code

try {
StringWriter writer = new StringWriter();
if (encodeObject(writer, value, allowJsonResolve)) { sb.append(writer.toString()); return; }
} catch (Exception e) {
}
throw new IOException("Can't write (" + value + ")");

It caused the method to always throw an IOException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991485 13f79535-47bb-0310-9956-ffa450edef68
2010-09-01 09:15:14 +00:00
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
Jacques Le Roux b7642843fd Fixes 2 typos in Javadoc found by chance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983946 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 11:55:44 +00:00
Jacques Le Roux b552004b9b A patch from René Scheibe ""setShippingOption" service called from one page checkout throws Exception" (https://issues.apache.org/jira/browse/OFBIZ-3886) - OFBIZ-3886
The shippingTotal has to be a BigDecimal for the methods called...

    * org.ofbiz.base.util.UtilFormatOut.formatCurrency(...)
    * org.ofbiz.order.shoppingcart.ShoppingCart.setItemShipGroupEstimate(...)

...so in case it's null, initialize it with BigDecimal.ZERO instead of 0.00

Fixes also some JavaDoc in UtilFormatOut.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@983920 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 10:43:01 +00:00
Adam Heath 5b4e8071c5 Add appendTo/append variant that allows for a prefix and suffix around
the separator.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981533 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 14:46:21 +00:00
Adam Heath cb1646e320 More StringUtil tests; This also tests double-encoding detection, which
required changing the type of defaultWebEncoder.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981532 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 14:46:15 +00:00
Adam Heath 77912ea777 StringUtil now has a private constructor; all uses of it must use the
singleton static INSTANCE(only one such use is in ofbiz).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981531 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 14:46:09 +00:00
Adam Heath ce409cd671 Start adding StringUtil tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981530 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 14:46:02 +00:00
Adam Heath 509532a3d4 Add methods for testing iterability.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981529 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 14:45:54 +00:00
Scott Gray ad81f1d1f1 Null check was incorrectly being used to determine if the directory existed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981104 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 23:47:55 +00:00
Scott Gray 4448c4a866 No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +00:00
Adrian Crum 86c11b0eaf Documentation improvements in Assert.java and TimeDuration.java. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980982 13f79535-47bb-0310-9956-ffa450edef68
2010-07-30 22:13:48 +00:00
Adrian Crum 46d6ef4c83 Added two new annotations, and did some code cleanups. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980645 13f79535-47bb-0310-9956-ffa450edef68
2010-07-30 03:40:16 +00:00
Jacques Le Roux 725f40b9d0 A patch from Sascha Rodekamp "Method to get a child element attribute from a specific XML file" (https://issues.apache.org/jira/browse/OFBIZ-3874) - OFBIZ-3874
Just a good method to return a named attribute of a named child node or a default if null. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@967151 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 16:06:41 +00:00
Erwan de Ferrieres c39c604127 Manage compositeTypes in multi handler
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@967012 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 09:27:59 +00:00
Adam Heath 827c205352 Fix file leak problem in KeyStore, the stream must be closed by the
caller(which also generally means doing it in a finally clause).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966785 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 18:30:51 +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
Adam Heath b198a80d4e Fix typo s/espacing/escaping/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965919 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:32 +00:00
Adam Heath 695cc497f2 Fix coverage reports; the coverage for base was reporting 100%, which is
not correct.  With real numbers on base, it shows a lot of missing
lines.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965914 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:14:06 +00:00
Adrian Crum 9c11c2c261 Added Boolean converter tests - copied from Apache Commons Convert.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965843 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 13:39:05 +00:00
Adrian Crum b8ad20ea06 Import cleanups and compiler warning fixes - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965841 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 13:36:13 +00:00
David E. Jones 127bc8cba1 Small change so that formatted intervals don't have superfluous commas
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963630 13f79535-47bb-0310-9956-ffa450edef68
2010-07-13 09:34:29 +00:00
Adrian Crum d898b0b695 Fixed UtilCache.java JavaDoc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960373 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 18:07:14 +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
Adam Heath e780a65555 Convert Arrays.asList() to a normal, modifiable List.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958274 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 19:40:45 +00:00