Author: jleroux
Date: Wed May 16 02:20:00 2012
New Revision: 1338972
URL: http://svn.apache.org/viewvc?rev=1338972&view=rev
Log:
Reverts r1338858+1338846, should have been deprecated and deprecation should
not be backported
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Reverse-merged /ofbiz/trunk:r1338845,1338856
Modified:
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1338972&r1=1338971&r2=1338972&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
(original)
+++
ofbiz/branches/release11.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Wed May 16 02:20:00 2012
@@ -891,7 +891,7 @@ public class CCPaymentServices {
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0, false);
+ UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0);
} catch (TransformerException e) {
throw new ClearCommerceException("Error serializing
requestDocument: " + e.getMessage());
}
Modified:
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java?rev=1338972&r1=1338971&r2=1338972&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
(original)
+++
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
Wed May 16 02:20:00 2012
@@ -127,7 +127,7 @@ public class UspsMockApiServlet extends
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true,
false, 0, false);
+ UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true,
false, 0);
} catch (TransformerException e) {
Debug.logInfo(e, module);
return;
Modified:
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1338972&r1=1338971&r2=1338972&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
(original)
+++
ofbiz/branches/release11.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
Wed May 16 02:20:00 2012
@@ -1713,7 +1713,7 @@ public class UspsServices {
OutputStream os = new ByteArrayOutputStream();
try {
- UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0, false);
+ UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true,
false, 0);
} catch (TransformerException e) {
throw new UspsRequestException(
UtilProperties.getMessage(resourceError,
Modified:
ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java?rev=1338972&r1=1338971&r2=1338972&view=diff
==============================================================================
---
ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
(original)
+++
ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java
Wed May 16 02:20:00 2012
@@ -484,7 +484,7 @@ public class UelFunctions {
File file = FileUtil.getFile(str);
if (file != null) {
FileOutputStream os = new FileOutputStream(file);
- UtilXml.writeXmlDocument(node, os, encoding,
omitXmlDeclaration, indent, indentAmount, false);
+ UtilXml.writeXmlDocument(node, os, encoding,
omitXmlDeclaration, indent, indentAmount);
os.close();
return true;
} else {
@@ -530,7 +530,7 @@ public class UelFunctions {
public static String toXmlString(Node node, String encoding, boolean
omitXmlDeclaration, boolean indent, int indentAmount) {
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- UtilXml.writeXmlDocument(node, os, encoding, omitXmlDeclaration,
indent, indentAmount, false);
+ UtilXml.writeXmlDocument(node, os, encoding, omitXmlDeclaration,
indent, indentAmount);
os.close();
return os.toString();
} catch (Exception e) {
