Author: kiwiwings
Date: Fri Mar 18 21:34:03 2016
New Revision: 1735685
URL: http://svn.apache.org/viewvc?rev=1735685&view=rev
Log:
#59195 - POIXMLTypeLoader depends on XMLBeans 2.6.0 - remove piccolo classes
from xmlbeans jars and disable xmloption in type loader
Modified:
poi/trunk/build.xml
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1735685&r1=1735684&r2=1735685&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Mar 18 21:34:03 2016
@@ -580,8 +580,15 @@ under the License.
<target name="fetch-ooxml-jars" depends="check-ooxml-jars"
unless="ooxml.jars.present">
<mkdir dir="${ooxml.lib}"/>
<downloadfile src="${ooxml.curvesapi.url}"
dest="${ooxml.curvesapi.jar}"/>
- <downloadfile src="${ooxml.xmlbeans23.url}"
dest="${ooxml.xmlbeans23.jar}"/>
- <downloadfile src="${ooxml.xmlbeans26.url}"
dest="${ooxml.xmlbeans26.jar}"/>
+ <downloadfile src="${ooxml.xmlbeans23.url}"
dest="${ooxml.xmlbeans23.jar}.orig"/>
+ <downloadfile src="${ooxml.xmlbeans26.url}"
dest="${ooxml.xmlbeans26.jar}.orig"/>
+ <!-- remove piccolo parser, so we don't use unsafe calls to it instead
of using jaxp -->
+ <zip destfile="${ooxml.xmlbeans23.jar}">
+ <zipfileset src="${ooxml.xmlbeans23.jar}.orig"
excludes="org/apache/xmlbeans/impl/piccolo/**"/>
+ </zip>
+ <zip destfile="${ooxml.xmlbeans26.jar}">
+ <zipfileset src="${ooxml.xmlbeans26.jar}.orig"
excludes="org/apache/xmlbeans/impl/piccolo/**"/>
+ </zip>
</target>
<target name="check-ooxml-xsds">
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java?rev=1735685&r1=1735684&r2=1735685&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java Fri Mar 18
21:34:03 2016
@@ -53,7 +53,10 @@ public class POIXMLTypeLoader {
DEFAULT_XML_OPTIONS.setUseDefaultNamespace();
DEFAULT_XML_OPTIONS.setSaveAggressiveNamespaces();
DEFAULT_XML_OPTIONS.setCharacterEncoding("UTF-8");
- DEFAULT_XML_OPTIONS.setLoadEntityBytesLimit(4096);
+ // Piccolo is disabled for POI builts, i.e. JAXP is used for parsing
+ // so only user code using XmlObject/XmlToken.Factory.parse
+ // directly can bypass the entity check, which is probably unlikely
(... and not within our responsibility :))
+ // DEFAULT_XML_OPTIONS.setLoadEntityBytesLimit(4096);
Map<String, String> map = new HashMap<String, String>();
map.put("http://schemas.openxmlformats.org/drawingml/2006/main";, "a");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
