svn commit: r1338973 - in /ofbiz/branches/release10.04: ./ framework/base/dtd/ framework/base/src/org/ofbiz/base/util/ framework/common/config/ framework/webtools/src/org/ofbiz/webtools/labelmanager/

Author: jleroux
Date: Wed May 16 02:40:09 2012
New Revision: 1338973

URL: http://svn.apache.org/viewvc?rev=1338973&view=rev
Log:
Reverts r1338843, should have been deprecated and deprecation should not be backported

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/base/dtd/base-catalog.xml
    ofbiz/branches/release10.04/framework/base/dtd/ofbiz-properties.xsd
    ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilXml.java
    ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/release10.04/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Reverse-merged /ofbiz/trunk:r1338831

Modified: ofbiz/branches/release10.04/framework/base/dtd/base-catalog.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/dtd/base-catalog.xml?rev=1338973&r1=1338972&r2=1338973&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/base/dtd/base-catalog.xml (original)
+++ ofbiz/branches/release10.04/framework/base/dtd/base-catalog.xml Wed May 16 02:40:09 2012
@@ -29,5 +29,4 @@ under the License.
     <system systemId="http://ofbiz.apache.org/dtds/jndi-config.xsd" uri="jndi-config.xsd"/>
     <system systemId="http://ofbiz.apache.org/dtds/ofbiz-component.xsd" uri="ofbiz-component.xsd"/>
     <system systemId="http://ofbiz.apache.org/dtds/ofbiz-containers.xsd" uri="ofbiz-containers.xsd"/>
-    <system systemId="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd" uri="ofbiz-properties.xsd"/>
 </catalog>

Modified: ofbiz/branches/release10.04/framework/base/dtd/ofbiz-properties.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/dtd/ofbiz-properties.xsd?rev=1338973&r1=1338972&r2=1338973&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/base/dtd/ofbiz-properties.xsd (original)
+++ ofbiz/branches/release10.04/framework/base/dtd/ofbiz-properties.xsd Wed May 16 02:40:09 2012
@@ -36,12 +36,4 @@ under the License.
     <xs:attributeGroup name="attlist.property">
         <xs:attribute type="xs:string" name="key" use="required"/>
     </xs:attributeGroup>
-    <xs:complexType name="valueType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute ref="xml:lang"/>
-                <xs:attribute ref="xml:space"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
 </xs:schema>

Modified: ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=1338973&r1=1338972&r2=1338973&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/branches/release10.04/framework/base/src/org/ofbiz/base/util/UtilXml.java Wed May 16 02:40:09 2012
@@ -159,26 +159,20 @@ public class UtilXml {
 
     // ----- TrAX Methods ----------------- //
 
-    /**
-     * Creates a JAXP TrAX Transformer suitable for pretty-printing an XML document. This method is provided as an alternative to the deprecated
-     * <code>org.apache.xml.serialize.OutputFormat</code> class.
-     *
-     * @param encoding
-     *            Optional encoding, defaults to UTF-8
-     * @param omitXmlDeclaration
-     *            If <code>true</code> the xml declaration will be omitted from the output
-     * @param indent
-     *            If <code>true</code>, the output will be indented
-     * @param indentAmount
-     *            If <code>indent</code> is <code>true</code>, the number of spaces to indent. Default is 4.
-     * @param keepSpace
-     *            If <code>true</code> spaces are preserved, else striped
+    /** Creates a JAXP TrAX Transformer suitable for pretty-printing an
+     * XML document. This method is provided as an alternative to the
+     * deprecated <code>org.apache.xml.serialize.OutputFormat</code> class.
+     * @param encoding Optional encoding, defaults to UTF-8
+     * @param omitXmlDeclaration If <code>true</code> the xml declaration
+     * will be omitted from the output
+     * @param indent If <code>true</code>, the output will be indented
+     * @param indentAmount If <code>indent</code> is <code>true</code>,
+     * the number of spaces to indent. Default is 4.
      * @return A <code>Transformer</code> instance
      * @see <a href="http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.html">JAXP TrAX</a>
      * @throws TransformerConfigurationException
      */
-    public static Transformer createOutputTransformer(String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount, boolean keepSpace)
-            throws TransformerConfigurationException {
+    public static Transformer createOutputTransformer(String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount) throws TransformerConfigurationException {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
         sb.append("<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns:xalan=\"http://xml.apache.org/xslt\" version=\"1.0\">\n");
@@ -196,11 +190,7 @@ public class UtilXml {
             sb.append(indentAmount <= 0 ? 4 : indentAmount);
             sb.append("\"");
         }
-        if (keepSpace) {
-            sb.append("/>\n<xsl:preserve-space elements=\"*\"/>\n");
-        } else {
-            sb.append("/>\n<xsl:strip-space elements=\"*\"/>\n");
-        }
+        sb.append("/>\n<xsl:strip-space elements=\"*\"/>\n");
         sb.append("<xsl:template match=\"@*|node()\">\n");
         sb.append("<xsl:copy><xsl:apply-templates select=\"@*|node()\"/></xsl:copy>\n");
         sb.append("</xsl:template>\n</xsl:stylesheet>\n");
@@ -223,29 +213,21 @@ public class UtilXml {
         transformer.transform(source, result);
     }
 
-    /**
-     * Serializes a DOM <code>Node</code> to an <code>OutputStream</code> using JAXP TrAX.
-     *
-     * @param node
-     *            The <code>Node</code> to serialize
-     * @param os
-     *            The <code>OutputStream</code> to serialize to
-     * @param encoding
-     *            Optional encoding, defaults to UTF-8
-     * @param omitXmlDeclaration
-     *            If <code>true</code> the xml declaration will be omitted from the output
-     * @param keepSpace
-     *            If <code>true</code> spaces are preserved, else striped
-     * @param indent
-     *            If <code>true</code>, the output will be indented
-     * @param indentAmount
-     *            If <code>indent</code> is <code>true</code>, the number of spaces to indent. Default is 4.
+    /** Serializes a DOM <code>Node</code> to an <code>OutputStream</code>
+     * using JAXP TrAX.
+     * @param node The <code>Node</code> to serialize
+     * @param os The <code>OutputStream</code> to serialize to
+     * @param encoding Optional encoding, defaults to UTF-8
+     * @param omitXmlDeclaration If <code>true</code> the xml declaration
+     * will be omitted from the output
+     * @param indent If <code>true</code>, the output will be indented
+     * @param indentAmount If <code>indent</code> is <code>true</code>,
+     * the number of spaces to indent. Default is 4.
      * @see <a href="http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.html">JAXP TrAX</a>
      * @throws TransformerException
      */
-    public static void writeXmlDocument(Node node, OutputStream os, String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount,
-            boolean keepSpace) throws TransformerException {
-        Transformer transformer = createOutputTransformer(encoding, omitXmlDeclaration, indent, indentAmount, keepSpace);
+    public static void writeXmlDocument(Node node, OutputStream os, String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount) throws TransformerException {
+        Transformer transformer = createOutputTransformer(encoding, omitXmlDeclaration, indent, indentAmount);
         transformDomDocument(transformer, node, os);
     }
 
@@ -344,9 +326,9 @@ public class UtilXml {
             return;
         }
         // OutputFormat defaults are: indent on, indent = 4, include XML declaration,
-        // charset = UTF-8, line width = 72, strip spaces
+        // charset = UTF-8, line width = 72
         try {
-            writeXmlDocument(node, os, "UTF-8", false, true, 4, false);
+            writeXmlDocument(node, os, "UTF-8", false, true, 4);
         } catch (TransformerException e) {
             // Wrapping this exception for backwards compatibility
             throw new IOException(e.getMessage());

Modified: ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml?rev=1338973&r1=1338972&r2=1338973&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml Wed May 16 02:40:09 2012
@@ -2178,7 +2178,6 @@
         <value xml:lang="zh_CN">电子邮件</value>
     </property>
     <property key="CommonEmptyHeader">
-        <!-- do not  remove this! -->
         <value xml:lang="en" xml:space="preserve"> </value>
     </property>
     <property key="CommonEnabled">

Modified: ofbiz/branches/release10.04/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java?rev=1338973&r1=1338972&r2=1338973&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java (original)
+++ ofbiz/branches/release10.04/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java Wed May 16 02:40:09 2012
@@ -34,8 +34,10 @@ import org.ofbiz.base.util.UtilPropertie
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.cache.UtilCache;
+
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.ServiceUtil;
+
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -146,7 +148,7 @@ public class SaveLabelsToXmlFile {
                         if (apacheLicenseText != null) {
                             fos.write(apacheLicenseText.getBytes());
                         }
-                        UtilXml.writeXmlDocument(resourceElem, fos, "UTF-8", !(apacheLicenseText == null), true, 4, true);
+                        UtilXml.writeXmlDocument(resourceElem, fos, "UTF-8", !(apacheLicenseText == null), true, 4);
                     } finally {
                         fos.close();
                         // clear cache to see immediately the new labels and