diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2018-06-23 22:56:34 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2018-06-23 22:56:34 +0000 |
| commit | 2de46d192147386b943387b2e54571211b4ee31c (patch) | |
| tree | e156bf20aa0d9b21ed6addbd82e0b7ffbfc7d3a7 /build.xml | |
| parent | 04d989a85d5c48a759c44ce92dc7d1fef4c5f57a (diff) | |
| download | poi-2de46d192147386b943387b2e54571211b4ee31c.tar.gz poi-2de46d192147386b943387b2e54571211b4ee31c.zip | |
#59268 - remove duplicated typeloader in POI and use fixed XmlBeans implementation instead
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1834229 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 27 |
1 files changed, 9 insertions, 18 deletions
@@ -871,9 +871,16 @@ under the License. </classpath> </xmlbean> + <replaceregexp byline="true" + match="(\s*)public static ([^ ]+) newInstance\(\) \{" + replace="\1private static org.apache.xmlbeans.SchemaTypeLoader getTypeLoader() { return org.apache.xmlbeans.XmlBeans.typeLoaderForClassLoader(\2.class.getClassLoader()); }${line.separator}${line.separator}\1public static \2 newInstance\(\) \{" + > + <fileset dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**"/> + </replaceregexp> + <replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**"> - <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader()</replacetoken> - <replacevalue>org.apache.poi.ooxml.POIXMLTypeLoader</replacevalue> + <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader</replacetoken> + <replacevalue>getTypeLoader</replacevalue> </replace> <!-- remove deprecated warnings, as we prefer the array methods - see #56854 --> @@ -882,22 +889,6 @@ under the License. ]]></replacetoken> </replace> - <copy todir="${xmlbean.sources.dir}"> - <fileset dir="${ooxml.src}"> - <include name="org/apache/poi/ooxml/POIXMLTypeLoader.java"/> - <include name="org/apache/poi/ooxml/util/DocumentHelper.java"/> - <include name="org/apache/poi/ooxml/util/SAXHelper.java"/> - <include name="org/apache/poi/openxml4j/opc/PackageNamespaces.java"/> - </fileset> - <fileset dir="${main.src}"> - <include name="org/apache/poi/util/POILogFactory.java"/> - <include name="org/apache/poi/util/POILogger.java"/> - <include name="org/apache/poi/util/NullLogger.java"/> - <include name="org/apache/poi/util/Internal.java"/> - <include name="org/apache/poi/util/Removal.java"/> - </fileset> - </copy> - <echo>Forking javac with max heap size ${ooxml.memory}</echo> <javac target="${jdk.version.class}" |