mirror of https://github.com/apache/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
This commit is contained in:
parent
f28dc4d0ad
commit
345d17c36e
22
build.xml
22
build.xml
|
@ -821,28 +821,6 @@ under the License.
|
||||||
<path location="${ooxml.xmlbeans.jar}"/>
|
<path location="${ooxml.xmlbeans.jar}"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</xmlbean>
|
</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>
|
<echo>Forking javac with max heap size ${ooxml.memory}</echo>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue