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
Adam Heath
f685831073
Fix several generics warnings that have crept in.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958273 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 19:40:39 +00:00
Adam Heath
c20e5a2ac7
Fix bug forwarded by BJ, from the user list; namely,
...
FastList.subList().add(Object) throws UnsupportedOperationException.
This commit should be undone when javolution is fixed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958270 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 19:40:16 +00:00
Jacques Le Roux
d931ca6dfc
Organize imports (found by chance), no functional changes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958040 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 17:16:29 +00:00
Adam Heath
af5a7f91fe
Remove useless check for non-null bundle, immediately after a null
...
check, in UtilResourceBundle.getBundle().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956472 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 07:09:13 +00:00
Adam Heath
8c90119420
s/safeWait/Thread.sleep/
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956471 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 07:09:08 +00:00
Adam Heath
08e5f40d52
Make use of makeMapWritable and makeListWritable to copy the list and
...
map.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956470 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 07:09:02 +00:00
Adam Heath
7fea76ce97
Fix formatting issues.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@956469 13f79535-47bb-0310-9956-ffa450edef68
2010-06-21 07:08:57 +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
Jacopo Cappellato
c287fa6126
Reverted change based on feedback from Adam Heath and Adrian Crum; the issue with Oracle will be resolved with a different approach.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953220 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 05:20:31 +00:00
Jacopo Cappellato
7cf599d103
Implemented sql date to time converter to avoid errors with Oracle.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@952997 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 13:20:21 +00:00
Jacques Le Roux
e57c2599a9
A patch from Sumit Pandit "Issue in rendering Freemarker Template from String." ( https://issues.apache.org/jira/browse/OFBIZ-3782 ) - OFBIZ-3782
...
With the help of Bob Morley (it was more a cache issue than what Sumit thought)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950866 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 04:11:32 +00:00
Adam Heath
b2e13f2a28
Add a new marker interface, IsEmpty.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950764 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 21:24:00 +00:00
Adam Heath
e8ad94f1f2
Revert wrongly committed 950253
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950283 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:02:06 +00:00
Adam Heath
ca13adff80
Revert wrongly committed 950254
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950281 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 22:01:42 +00:00