From: Andreas Beeker <kiwiwings@apache.org>
Date: Tue, 23 Jun 2020 22:16:03 +0000 (+0000)
Subject: XmlBeans now generates the beans including the modifications which were applied by... 
X-Git-Tag: before_ooxml_3rd_edition~230
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=345d17c36ee3f5433cd61061728e62ad44812ffe;p=poi.git

XmlBeans now generates the beans including the modifications which were applied by the POI build (r1879130) ... so those modifications are now obsolete

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879131 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index 84a4fd68d9..3bcab115db 100644
--- a/build.xml
+++ b/build.xml
@@ -821,28 +821,6 @@ under the License.
                     <path location="${ooxml.xmlbeans.jar}"/>
                 </classpath>
             </xmlbean>
-            <local name="loaderMethod"/>
-            <!-- the space between "public  static" is on purpose to prevent double execution -->
-            <property name="loaderMethod"><![CDATA[
-        private static synchronized org.apache.poi.schemas.@{typesystemname}.system.@{typesystemname}.TypeSystemHolder getTypeLoader() {
-            return org.apache.poi.schemas.@{typesystemname}.system.@{typesystemname}.TypeSystemHolder.typeSystem;
-        }
-
-        public  static \2 newInstance\(\) \{]]></property>
-            <replaceregexp byline="true" match="(\s*)public static ([^ ]+) newInstance\(\) \{" replace="${loaderMethod}">
-                <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>getTypeLoader</replacevalue>
-            </replace>
-
-            <!-- remove deprecated warnings, as we prefer the array methods - see #56854 -->
-            <replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**">
-                <replacetoken><![CDATA[     * @deprecated
-]]></replacetoken>
-            </replace>
 
             <echo>Forking javac with max heap size ${ooxml.memory}</echo>