You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@attic.apache.org by fa...@apache.org on 2018/06/04 18:35:57 UTC
svn commit: r1832877 - in /xmlbeans/trunk: ./ external/lib/
samples/AbstractTypes/ samples/Any/ samples/DateTime/ samples/MixedContent/
samples/OrderMatters/ samples/SampleTemplate/ samples/SchemaEnum/
samples/SubstitutionGroup/ samples/Validation/ sam...
Author: fanningpj
Date: Mon Jun 4 18:35:56 2018
New Revision: 1832877
URL: http://svn.apache.org/viewvc?rev=1832877&view=rev
Log:
reverse recent commits
Added:
xmlbeans/trunk/external/lib/piccolo.LICENSE.txt
- copied unchanged from r1832297, xmlbeans/trunk/external/lib/piccolo.LICENSE.txt
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040629.jar
- copied unchanged from r1832297, xmlbeans/trunk/external/lib/piccolo_apache_dist_20040629.jar
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040629_v2.jar
- copied unchanged from r1832297, xmlbeans/trunk/external/lib/piccolo_apache_dist_20040629_v2.jar
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar
- copied unchanged from r1832297, xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar
- copied unchanged from r1832297, xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar
xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ConcurrentReaderHashMap.java
- copied unchanged from r1832650, xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/ConcurrentReaderHashMap.java
xmlbeans/trunk/src/store/org/w3c/
- copied from r1832297, xmlbeans/trunk/src/store/org/w3c/
xmlbeans/trunk/src/xmlpublic/javax/
- copied from r1832297, xmlbeans/trunk/src/xmlpublic/javax/
Removed:
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/NullLogger.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/SAXHelper.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/XBLogFactory.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/XBLogger.java
Modified:
xmlbeans/trunk/CHANGES.txt
xmlbeans/trunk/build.xml
xmlbeans/trunk/samples/AbstractTypes/build.xml
xmlbeans/trunk/samples/Any/build.xml
xmlbeans/trunk/samples/DateTime/build.xml
xmlbeans/trunk/samples/MixedContent/build.xml
xmlbeans/trunk/samples/OrderMatters/build.xml
xmlbeans/trunk/samples/SampleTemplate/build.xml
xmlbeans/trunk/samples/SchemaEnum/build.xml
xmlbeans/trunk/samples/SubstitutionGroup/build.xml
xmlbeans/trunk/samples/Validation/build.xml
xmlbeans/trunk/samples/XQueryXPath/build.xml
xmlbeans/trunk/samples/XmlSort/build.xml
xmlbeans/trunk/samples/XmlTree/build.xml
xmlbeans/trunk/samples/XsdConfig/build.xml
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Cur.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Locale.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/trunk/test/perf/build.xml
xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java
xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java
xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java
xmlbeans/trunk/testbuild.xml
Modified: xmlbeans/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/CHANGES.txt (original)
+++ xmlbeans/trunk/CHANGES.txt Mon Jun 4 18:35:56 2018
@@ -1,21 +1,9 @@
-Changes in V2.7.0 since V2.6.0
-
-* XMLBEANS-516: remove unnecessary javax and org.w3c classes
-* XMLBEANS-515: remove piccolo support
-* XMLBEANS-514: make java 6 the lowest supported runtime
-* Fix for XMLBEANS-499: xmlbeans2.6.0.jar contains duplicate class files (causes issues
-on Android)
-* XMLBEANS-447: Drop the ConcurrentReaderHashMap source code
-* Fix for XMLBEANS-404: entitizeContent CDATA loop iterating too many times (causes
-assertion error or ArrayIndexOutOfBoundsException in replace)
-* Fix for XMLBEANS-332: XMLBeans changes surrogate pair bytes to question marks
-
Changes in V2.6.0 since V2.5.0
* Add new xml option CopyUseNewSynchronizationDomain used for copy.
This fixes the scenario when copy and access (ex. selectPath) are used
in a multithreading environment.
-* Entitize \r when not in pretty print, this helps with maintaining \r
+* Entitize \r when not in pretty print, this helps with maintainig \r
entities.
* Fix validation of integer value containing dot char.
* Fix chars in comments to avoid errors in IntelliJ under linux.
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Mon Jun 4 18:35:56 2018
@@ -15,11 +15,11 @@
-->
<project name="Xbean" default="default" basedir=".">
- <property name="build.compiler" value="javac1.6"/>
- <property name="javac.source" value="1.6"/>
- <property name="javac.target" value="1.6"/>
+ <property name="build.compiler" value="javac1.4"/>
+ <property name="javac.source" value="1.4"/>
+ <property name="javac.target" value="1.4"/>
- <property name="version.base" value="2.7.0"/>
+ <property name="version.base" value="2.6.0"/>
<property name="version.rc" value=""/>
<!-- manifest entries -->
@@ -114,7 +114,7 @@
http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
-->
<get dest="external/lib/saxonb9-0-0-4j.zip"
- src="https://master.dl.sourceforge.net/project/saxon/OldFiles/9.0/9.0.0.4/saxonb9-0-0-4j.zip"
+ src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"
verbose="true" usetimestamp="true" ignoreerrors="true"/>
<unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/">
<patternset>
@@ -128,6 +128,39 @@
<copy file="external/lib/saxon9-dom.jar" tofile="build/lib/saxon9-dom.jar"/>
</target>
+ <target name="jsr173-bundle.downloaded">
+ <condition property="jsr173-bundle.exists">
+ <available file="external/lib/jsr173_1.0_api_bundle.jar"/>
+ </condition>
+ </target>
+
+ <target name="jsr173-bundle.jar"
+ depends="jsr173-bundle.downloaded, dirs"
+ unless="jsr173-bundle.exists">
+ <get dest="external/lib/jsr173_1.0_api_bundle.jar"
+ src="http://www.apache.org/dist/java-repository/xmlbeans/jars/jsr173_1.0_api_bundle.jar"
+ verbose="true" usetimestamp="true" ignoreerrors="true"/>
+ </target>
+
+ <target name="jsr173_1.0.jars.extracted">
+ <condition property="jsr173_1.0.jars.exist">
+ <available file="build/lib/jsr173_1.0_api.jar"/>
+ </condition>
+ </target>
+
+ <target name="jsr173_1.0.jars"
+ depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
+ unless="jsr173_1.0.jars.exist">
+ <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
+ <patternset>
+ <include name="jsr173_1.0_api.jar"/>
+ </patternset>
+ </unjar>
+
+ <!-- copy jsr173 API jar and license files to build/lib -->
+ <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>
+ </target>
+
<!-- get resolver.jar -->
<target name="check.xcresolver.zip">
<condition property="xcresolver.zip.exists">
@@ -320,8 +353,12 @@
<fileset dir="build/lib">
<include name="xbean.jar"/>
<include name="xmlpublic.jar"/>
+ <include name="xmlbeans-qname.jar"/>
<include name="xbean_xpath.jar"/>
<include name="resolver.jar"/>
+ <include name="jsr173_1.0_api.jar"/>
+ <include name="BEA Binary RI License (JSR 173).1(Clean).txt"/>
+ <include name="README(jsr_173 api and ri).txt"/>
</fileset>
</copy>
@@ -451,8 +488,8 @@
store.classes, saaj_api.classes,
marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
- tools.classes, jamsupport.classes">
- <jar jarfile="build/lib/xbean.jar" index="true" duplicate="preserve">
+ piccolo.classes, tools.classes, jamsupport.classes">
+ <jar jarfile="build/lib/xbean.jar" index="true">
<fileset dir="build/classes/xmlpublic"
excludes="javax/**"/>
<fileset dir="build/classes/typeholder"/>
@@ -472,6 +509,7 @@
<fileset dir="build/classes/marshal"/>
<fileset dir="build/classes/repackage"/>
<fileset dir="build/classes/jam"/>
+ <fileset dir="build/classes/piccolo"/>
<fileset dir="build/classes/tools"/>
<fileset file="LICENSE.txt"/>
<fileset file="NOTICE.txt"/>
@@ -485,6 +523,10 @@
</section>
</manifest>
</jar>
+ <jar jarfile="build/lib/xmlbeans-qname.jar">
+ <fileset dir="build/classes/xmlpublic"
+ includes="javax/xml/namespace/QName.class,javax/xml/namespace/NamespaceContext.class"/>
+ </jar>
</target>
<!-- build XMLInputStream interface ============================================= -->
@@ -503,10 +545,12 @@
<!-- xmlpublic target ============================================== -->
- <target name="xmlpublic.classes" depends="dirs">
+ <target name="xmlpublic.classes" depends="dirs, jsr173_1.0.jars">
<mkdir dir="build/classes/xmlpublic"/>
<javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath/>
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ </classpath>
</javac>
<!-- Need properties files for XmlError -->
@@ -542,6 +586,7 @@
<mkdir dir="build/classes/typestore"/>
<javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
@@ -552,10 +597,11 @@
<!-- common target ============================================= -->
- <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
+ <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
<mkdir dir="build/classes/common"/>
<javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
</classpath>
@@ -593,7 +639,7 @@
<target name="typeimpl.classes" depends="dirs, store.classes,
repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
- configschema.classes, toolschema.classes, jam.classes">
+ configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
<mkdir dir="build/classes/typeimpl"/>
<javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
@@ -609,6 +655,7 @@
<pathelement location="build/classes/xmlschema"/>
<pathelement location="build/classes/toolschema"/>
<pathelement location="build/classes/jam"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
</classpath>
<src path="src/typeimpl"/>
@@ -634,6 +681,7 @@
<mkdir dir="build/classes/xmlcomp"/>
<javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
@@ -643,17 +691,17 @@
<pathelement location="build/classes/configschema"/>
<pathelement location="build/classes/toolschema"/>
<pathelement location="build/classes/xsdschema"/>
- <pathelement location="build/classes/typestore"/>
</classpath>
</javac>
</target>
<!-- marshal target =============================================== -->
- <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
+ <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
<mkdir dir="build/classes/marshal"/>
<javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/configschema"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
@@ -690,15 +738,17 @@
<!-- store target ============================================== -->
<target name="store.classes"
- depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes">
+ depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes">
<mkdir dir="build/classes/store"/>
<javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
<classpath id="store.compile.path">
<pathelement location="build/classes/typestore"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
<pathelement location="build/classes/saaj_api"/>
+ <pathelement location="build/classes/piccolo"/>
</classpath>
</javac>
</target>
@@ -706,16 +756,18 @@
<!-- tools target ============================================== -->
<target name="tools.classes"
- depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes,
+ depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes,
typeimpl.classes, xmlcomp.classes">
<mkdir dir="build/classes/tools"/>
<javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
<classpath id="tools.compile.path">
<pathelement location="build/classes/typestore"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
<pathelement location="build/classes/saaj_api"/>
+ <pathelement location="build/classes/piccolo"/>
<pathelement location="build/classes/typeimpl"/>
<pathelement location="build/classes/xmlcomp"/>
</classpath>
@@ -732,11 +784,13 @@
<path id="bootstrap.run.path">
<pathelement location="build/private/lib/oldxbean.jar"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlpublic"/>
</path>
<path id="bootstrap.compile.path">
<pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
</path>
<property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
@@ -780,7 +834,7 @@
</condition>
</target>
- <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
+ <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
<delete dir="build/classes/xmlschema"/>
<delete dir="build/src/xmlschema"/>
<java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
@@ -865,6 +919,7 @@
<property name="repackage_arg" value=""/>
<property name="schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
<property name="bootstrap_schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
+ <property name="piccolo_package_name" value="org.apache.xmlbeans.impl.piccolo"/>
<property name="jam_package_name" value="org.apache.xmlbeans.impl.jam"/>
<!--
@@ -1008,6 +1063,7 @@
<pathelement location="build/classes/common"/>
<pathelement location="external/lib/junit.jar"/>
<pathelement location="build/ar/xbean.jar"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
<pathelement location="build/classes/xmlinputstream"/>
</path>
@@ -1017,7 +1073,7 @@
</path>
- <target name="drt.classes" depends="dirs">
+ <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
<mkdir dir="build/private/classes/drt"/>
<javac
destdir="build/private/classes/drt"
@@ -1037,6 +1093,7 @@
<path id="scomp.run.path">
<pathelement location="build/lib/xbean.jar"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
</path>
<target name="stsschema.check">
@@ -1061,7 +1118,7 @@
</uptodate>
</target>
- <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
+ <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
<delete dir="build/private/jam"/>
<mkdir dir="build/private/jam"/>
<unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
@@ -1080,10 +1137,46 @@
<mkdir dir="build/classes/jam"/>
<javac
destdir="build/classes/jam"
- source="${javac.source}" target="${javac.target}"
+ source="1.4" target="1.4"
debug="on">
<src path="build/private/jam/src_repackage"/>
- <classpath/>
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- Piccolo deployment -->
+ <target name="piccolo.classes.check">
+ <uptodate property="piccolo.classes.notRequired"
+ targetfile="build/ar/xbean.jar">
+ <srcfiles dir="external/lib" includes="**/piccolo_*.jar"/>
+ </uptodate>
+ </target>
+
+ <target name="piccolo.classes" depends="piccolo.classes.check, dirs, repackage.classes" unless="piccolo.classes.notRequired">
+ <delete dir="build/private/piccolo"/>
+ <mkdir dir="build/private/piccolo"/>
+ <unjar src="external/lib/piccolo_apache_dist_20040711_v2.jar" dest="build/private/piccolo"/>
+
+ <echo message="Re-packaging Piccolo"/>
+
+ <java classname="repackage.Repackage" fork="true" failonerror="true">
+ <classpath>
+ <pathelement location="build/classes/repackage"/>
+ </classpath>
+ <arg line="-repackage com.bluecast:${piccolo_package_name} -f build/private/piccolo/src -t build/private/piccolo/src_repackage"/>
+ </java>
+
+ <delete dir="build/classes/piccolo"/>
+ <mkdir dir="build/classes/piccolo"/>
+ <javac
+ destdir="build/classes/piccolo"
+ classpath=""
+ source="1.3" target="1.4"
+ debug="on">
+ <src path="build/private/piccolo/src_repackage"/>
</javac>
</target>
+
</project>
Modified: xmlbeans/trunk/samples/AbstractTypes/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/AbstractTypes/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/trunk/samples/AbstractTypes/build.xml Mon Jun 4 18:35:56 2018
@@ -70,7 +70,7 @@
<path refid="xmlbeans.classpath"/>
</classpath>
</scomp>
- <javac srcdir="src" destdir="build" debug="on" source="1.6">
+ <javac srcdir="src" destdir="build" debug="on" source="1.4">
<classpath>
<path refid="xmlbeans.classpath"/>
<pathelement location="build/${abstract.jar}"/>
Modified: xmlbeans/trunk/samples/Any/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Any/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Any/build.xml (original)
+++ xmlbeans/trunk/samples/Any/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="Any.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/DateTime/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/DateTime/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/DateTime/build.xml (original)
+++ xmlbeans/trunk/samples/DateTime/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="DateTime.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/MixedContent/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/MixedContent/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/MixedContent/build.xml (original)
+++ xmlbeans/trunk/samples/MixedContent/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="MixedContent.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/OrderMatters/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/OrderMatters/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/OrderMatters/build.xml (original)
+++ xmlbeans/trunk/samples/OrderMatters/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="OrderMatters.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/SampleTemplate/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SampleTemplate/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SampleTemplate/build.xml (original)
+++ xmlbeans/trunk/samples/SampleTemplate/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="SampleTemplate.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/SchemaEnum/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SchemaEnum/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SchemaEnum/build.xml (original)
+++ xmlbeans/trunk/samples/SchemaEnum/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="SchemaEnum.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/SubstitutionGroup/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SubstitutionGroup/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SubstitutionGroup/build.xml (original)
+++ xmlbeans/trunk/samples/SubstitutionGroup/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="SubstitutionGroup.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/Validation/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Validation/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Validation/build.xml (original)
+++ xmlbeans/trunk/samples/Validation/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="Validation.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/XQueryXPath/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XQueryXPath/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XQueryXPath/build.xml (original)
+++ xmlbeans/trunk/samples/XQueryXPath/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="XQueryXPath.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/XmlSort/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlSort/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlSort/build.xml (original)
+++ xmlbeans/trunk/samples/XmlSort/build.xml Mon Jun 4 18:35:56 2018
@@ -65,7 +65,7 @@ limitations under the License.
destdir="build/classes"
classpathref="XmlSort.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/XmlTree/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlTree/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlTree/build.xml (original)
+++ xmlbeans/trunk/samples/XmlTree/build.xml Mon Jun 4 18:35:56 2018
@@ -89,7 +89,7 @@ limitations under the License.
destdir="build/classes"
classpathref="XmlTree.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/samples/XsdConfig/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XsdConfig/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XsdConfig/build.xml (original)
+++ xmlbeans/trunk/samples/XsdConfig/build.xml Mon Jun 4 18:35:56 2018
@@ -120,13 +120,13 @@ limitations under the License.
destdir="build/classes"
classpathref="XsdConfig.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
<javac srcdir="src" includes="org/apache/xmlbeans/samples/xsdconfig/CatalogXsd.java org/apache/xmlbeans/samples/xsdconfig/XsdTest.java "
destdir="build/classes"
classpathref="Xsd.path"
debug="on"
- source="1.6"
+ source="1.4"
/>
</target>
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Cur.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Cur.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Cur.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Cur.java Mon Jun 4 18:35:56 2018
@@ -3466,36 +3466,28 @@ final class Cur
String s = CharUtil.getString( src, off, cch );
- for ( int i = 0 ; i < s.length(); )
+ for ( int i = 0 ; i < s.length() ; i++ )
{
- if (i == 36)
+ if (i== 36)
{
o.print( "..." );
break;
}
- int codePoint = s.codePointAt( i );
- char[] chars = Character.toChars(codePoint);
-
- if ( chars.length == 1 ) {
- char ch = chars[0];
- if (ch >= 32 && ch < 127)
- o.print( ch );
- else if (ch == '\n')
- o.print( "\\n" );
- else if (ch == '\r')
- o.print( "\\r" );
- else if (ch == '\t')
- o.print( "\\t" );
- else if (ch == '\"')
- o.print( "\\\"" );
- else
- o.print( "<#" + ((int) ch) + ">" );
- } else {
- o.print( "<#" + codePoint + ">" );
- }
-
- i += Character.charCount(codePoint);
+ char ch = s.charAt( i );
+
+ if (ch >= 32 && ch < 127)
+ o.print( ch );
+ else if (ch == '\n')
+ o.print( "\\n" );
+ else if (ch == '\r')
+ o.print( "\\r" );
+ else if (ch == '\t')
+ o.print( "\\t" );
+ else if (ch == '\"')
+ o.print( "\\\"" );
+ else
+ o.print( "<#" + ((int) ch) + ">" );
}
o.print( "\"" );
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Locale.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Locale.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Locale.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Locale.java Mon Jun 4 18:35:56 2018
@@ -1,4 +1,4 @@
-/* Copyright 2004-2017 The Apache Software Foundation
+/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.SAXParseException;
+import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
import org.xml.sax.DTDHandler;
@@ -37,6 +38,8 @@ import java.lang.ref.Reference;
import java.lang.ref.PhantomReference;
import java.lang.ref.SoftReference;
+import java.lang.reflect.Method;
+
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
@@ -103,6 +106,9 @@ import org.apache.xmlbeans.impl.values.T
import org.apache.xmlbeans.impl.values.TypeStoreUser;
import org.apache.xmlbeans.impl.values.TypeStoreUserFactory;
+import org.apache.xmlbeans.impl.piccolo.xml.Piccolo;
+import org.apache.xmlbeans.impl.piccolo.io.FileFormatException;
+
public final class Locale
implements DOMImplementation, SaajCallback, XmlLocale
{
@@ -3029,7 +3035,18 @@ public final class Locale
}
}
- private static SaxLoader getSaxLoader(XmlOptions options) throws XmlException
+ private static SaxLoader getPiccoloSaxLoader()
+ {
+ SaxLoader piccoloLoader = (SaxLoader) SystemCache.get().getSaxLoader();
+ if (piccoloLoader == null)
+ {
+ piccoloLoader = PiccoloSaxLoader.newInstance();
+ SystemCache.get().setSaxLoader(piccoloLoader);
+ }
+ return piccoloLoader;
+ }
+
+ private static SaxLoader getSaxLoader(XmlOptions options)
{
options = XmlOptions.maskNull(options);
@@ -3046,23 +3063,31 @@ public final class Locale
er = new DefaultEntityResolver();
}
- XMLReader xr = (XMLReader) options.get(
- XmlOptions.LOAD_USE_XMLREADER);
+ SaxLoader sl;
- if (xr == null) {
- try {
- xr = SAXHelper.newXMLReader();
- } catch(Exception e) {
- throw new XmlException("Problem creating XMLReader", e);
- }
- }
+ if (options.hasOption(XmlOptions.LOAD_USE_XMLREADER))
+ {
+ XMLReader xr = (XMLReader) options.get(
+ XmlOptions.LOAD_USE_XMLREADER);
- SaxLoader sl = new XmlReaderSaxLoader(xr);
+ if (xr == null)
+ throw new IllegalArgumentException("XMLReader is null");
- // I've noticed that most XMLReaders don't like a null EntityResolver...
+ sl = new XmlReaderSaxLoader(xr);
- if (er != null)
- xr.setEntityResolver(er);
+ // I've noticed that most XMLReaders don't like a null EntityResolver...
+
+ if (er != null)
+ xr.setEntityResolver(er);
+ }
+ else
+ {
+ sl = getPiccoloSaxLoader();
+
+ // Piccolo doesnot mind a null entity resolver ...
+
+ sl.setEntityResolver(er);
+ }
return sl;
}
@@ -3076,6 +3101,34 @@ public final class Locale
}
}
+ private static class PiccoloSaxLoader
+ extends SaxLoader
+ {
+ private PiccoloSaxLoader(Piccolo p)
+ {
+ super(p, p.getStartLocator());
+
+ _piccolo = p;
+ }
+
+ static PiccoloSaxLoader newInstance()
+ {
+ return new PiccoloSaxLoader(new Piccolo());
+ }
+
+ void postLoad(Cur c)
+ {
+ XmlDocumentProperties props = getDocProps(c, true);
+
+ props.setEncoding(_piccolo.getEncoding());
+ props.setVersion(_piccolo.getVersion());
+
+ super.postLoad(c);
+ }
+
+ private Piccolo _piccolo;
+ }
+
private static abstract class SaxHandler
implements ContentHandler, LexicalHandler , DeclHandler, DTDHandler
{
@@ -3130,7 +3183,7 @@ public final class Locale
if (local.length() == 0)
local = qName;
- // Out current parser does not error when a
+ // Out current parser (Piccolo) does not error when a
// namespace is used and not defined. Check for these here
if (qName.indexOf(':') >= 0 && uri.length() == 0)
@@ -3420,6 +3473,12 @@ public final class Locale
return c;
}
+ catch (FileFormatException e)
+ {
+ _context.abort();
+
+ throw new XmlException(e.getMessage(), e);
+ }
catch (XmlRuntimeException e)
{
_context.abort();
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java Mon Jun 4 18:35:56 2018
@@ -275,23 +275,7 @@ abstract class Saver
end.moveToCur( c );
end.toEnd();
}
-
- /**
- * Test if a character is valid in xml character content. See
- * http://www.w3.org/TR/REC-xml#NT-Char
- */
- static boolean isBadChar ( char ch )
- {
- return ! (
- Character.isHighSurrogate(ch) ||
- Character.isLowSurrogate(ch) ||
- (ch >= 0x20 && ch <= 0xD7FF ) ||
- (ch >= 0xE000 && ch <= 0xFFFD) ||
- (ch >= 0x10000 && ch <= 0x10FFFF) ||
- (ch == 0x9) || (ch == 0xA) || (ch == 0xD)
- );
- }
-
+
protected boolean saveNamespacesFirst ( )
{
return _saveNamespacesFirst;
@@ -1403,7 +1387,7 @@ abstract class Saver
if (++i == _buf.length)
i = 0;
- for ( int cch = _lastEmitCch - 2 ; cch > 0 ; cch-- )
+ for ( int cch = _lastEmitCch ; cch > 0 ; cch-- )
{
char ch = _buf[ i ];
@@ -1568,6 +1552,21 @@ abstract class Saver
}
/**
+ * Test if a character is valid in xml character content. See
+ * http://www.w3.org/TR/REC-xml#NT-Char
+ */
+
+ private boolean isBadChar ( char ch )
+ {
+ return ! (
+ (ch >= 0x20 && ch <= 0xD7FF ) ||
+ (ch >= 0xE000 && ch <= 0xFFFD) ||
+ (ch >= 0x10000 && ch <= 0x10FFFF) ||
+ (ch == 0x9) || (ch == 0xA) || (ch == 0xD)
+ );
+ }
+
+ /**
* Test if a character is to be replaced with an escaped value
*/
private boolean isEscapedChar ( char ch )
@@ -2191,6 +2190,20 @@ abstract class Saver
}
}
+ /**
+ * Test if a character is valid in xml character content. See
+ * http://www.w3.org/TR/REC-xml#NT-Char
+ */
+ private boolean isBadChar ( char ch )
+ {
+ return ! (
+ (ch >= 0x20 && ch <= 0xD7FF ) ||
+ (ch >= 0xE000 && ch <= 0xFFFD) ||
+ (ch >= 0x10000 && ch <= 0x10FFFF) ||
+ (ch == 0x9) || (ch == 0xA) || (ch == 0xD)
+ );
+ }
+
private void emitLiteral ( String literal )
{
// TODO: systemId production http://www.w3.org/TR/REC-xml/#NT-SystemLiteral
Modified: xmlbeans/trunk/test/perf/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/perf/build.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/test/perf/build.xml (original)
+++ xmlbeans/trunk/test/perf/build.xml Mon Jun 4 18:35:56 2018
@@ -348,7 +348,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="tools.classpath"
includes="org/apache/xmlbeans/test/tools/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -363,7 +363,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="svn.classpath"
includes="org/apache/xmlbeans/test/performance/svn/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -378,7 +378,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="v1.classpath"
includes="org/apache/xmlbeans/test/performance/v1/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -393,7 +393,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="v2.classpath"
includes="org/apache/xmlbeans/test/performance/v2/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -408,7 +408,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="castor.classpath"
includes="org/apache/xmlbeans/test/performance/castor/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -424,7 +424,7 @@
classpathref="jibx.classpath"
includes="org/apache/xmlbeans/test/performance/jibx/**,org/apache/xmlbeans/test/performance/utils/**"
excludes="org/apache/xmlbeans/test/performance/jibx/binding/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -439,7 +439,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="jaxb.classpath"
includes="org/apache/xmlbeans/test/performance/jaxb/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -470,7 +470,7 @@
executable="${env.JAVA_HOME}/bin/javac"
classpathref="xerces.classpath"
includes="org/apache/xmlbeans/test/performance/xerces/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
</target>
@@ -667,7 +667,7 @@
memoryMaximumSize="1000M"
compiler="modern"
executable="${env.JAVA_HOME}/bin/javac"
- source="1.6"
+ source="1.4"
classpathref="castor.classpath"/>
<jar destfile="${schema.jar.build.dir}/${jar.name}"
basedir="${castor.temp.dir}"/>
@@ -689,7 +689,7 @@
classpathref="jibx.binding.classpath"
includes="org/apache/xmlbeans/test/performance/jibx/binding/**"
excludes="org/apache/xmlbeans/test/performance/castor/**,org/apache/xmlbeans/test/performance/svn/**,org/apache/xmlbeans/test/performance/utils/**"
- source="1.6">
+ source="1.4">
</javac>
<java classname="org.jibx.binding.Compile"
fork="true"
@@ -750,7 +750,7 @@
compiler="modern"
executable="${env.JAVA_HOME}/bin/javac"
classpathref="jaxb.classpath"
- source="1.6">
+ source="1.4">
</javac>
<jar destfile="${schema.jar.build.dir}/${jar.name}"
basedir="${jaxb.temp.dir}"/>
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java Mon Jun 4 18:35:56 2018
@@ -1112,7 +1112,7 @@ public class StoreTests extends TestCase
throws Exception
{
XmlCursor c = XmlObject.Factory.parse( xml ).newCursor();
- Assert.assertEquals( xml, c.xmlText() );
+ Assert.assertTrue( c.xmlText().equals( xml ) );
}
private void doSaveTest ( String xml )
@@ -1121,16 +1121,6 @@ public class StoreTests extends TestCase
doSaverTest( xml );
}
- public void testCDATA() throws Exception
- {
- // https://issues.apache.org/jira/browse/XMLBEANS-404
- String xml = "<foo>Unable to render embedded object: <![CDATA[>>>>>>>><<<<<<<<<<<]]></foo>";
- String expected = "<foo><![CDATA[Unable to render embedded object: >>>>>>>><<<<<<<<<<<]]></foo>";
- XmlOptions options = new XmlOptions().setSaveCDataLengthThreshold(0);
- XmlCursor c = XmlObject.Factory.parse(xml, options).newCursor();
- Assert.assertEquals( expected, c.xmlText(options) );
- }
-
public void testSaving ( )
throws Exception
{
Modified: xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java Mon Jun 4 18:35:56 2018
@@ -40,6 +40,7 @@ public class AssortedTests extends TestC
// bug 27489
public static void testSaverCharEscaping() throws XmlException
{
+ String newLine = System.getProperty( "line.separator" );
XmlObject xdoc = XmlObject.Factory.parse("<test>something</test>");
XmlCursor cur = xdoc.newCursor();
cur.toFirstChild();
@@ -47,14 +48,9 @@ public class AssortedTests extends TestC
cur.setTextValue("<something or other:\u03C0\uD7FF>");
Assert.assertEquals("<test><something or other:\u03C0\uD7FF></test>", xdoc.toString());
- // invalid chars - control chars, FFFF/FFFE, etc
- cur.setTextValue("<something\0or\1other:\u0045\u001F>");
- Assert.assertEquals("<test><something?or?other:\u0045?></test>", xdoc.toString());
-
- String greekChars = "\uD835\uDF4A\uD835\uDF4B\uD835\uDF4C\uD835\uDF4D\uD835\uDF4E\uD835\uDF4F\uD835\uDF50\uD835"
- + "\uDF51\uD835\uDF52\uD835\uDF53\uD835\uDF54\uD835\uDF55";
- cur.setTextValue(greekChars);
- Assert.assertEquals("<test>" + greekChars + "</test>", xdoc.toString());
+ // invalid chars - control chars, unicode surrogates, FFFF/FFFE, etc
+ cur.setTextValue("<something\0or\1other:\u0045\uFFFE\uD800\uDFFF\uDB80\uDC00\u03C0\uD7FF\u001F>");
+ Assert.assertEquals("<test><something?or?other:\u0045?????\u03C0\uD7FF?></test>", xdoc.toString());
}
// bug 26140/26104
Modified: xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java Mon Jun 4 18:35:56 2018
@@ -53,8 +53,8 @@ public class CDataTest
throws Exception
{
String xmlText = "<a><![CDATA[cdata text]]></a>";
- String resultText = "<a>cdata text</a>";
- checkCData(xmlText, resultText, resultText);
+
+ checkCData(xmlText, xmlText, xmlText);
}
public void testCData2()
@@ -64,10 +64,10 @@ public class CDataTest
"<b><![CDATA[cdata text]]> regular text</b>" + NL +
"</a>";
String expected1 = "<a>\n" +
- "<b>cdata text regular text</b>\n" +
+ "<b><![CDATA[cdata text regular text]]></b>\n" +
"</a>";
String expected2 = "<a>" + NL +
- " <b>cdata text regular text</b>" + NL +
+ " <b><![CDATA[cdata text regular text]]></b>" + NL +
"</a>";
checkCData(xmlText, expected1, expected2);
@@ -88,23 +88,6 @@ public class CDataTest
checkCData(xmlText, expected1, expected2);
}
-
- // https://issues.apache.org/jira/browse/XMLBEANS-404
- public void testXmlBeans404()
- throws Exception
- {
- String xmlText = "<a>\n" +
- "<c>text <![CDATA[cdata text]]]]></c>\n" +
- "</a>";
- String expected1 = "<a>\n" +
- "<c>text cdata text]]</c>\n" +
- "</a>";
- String expected2 = "<a>" + NL +
- " <c>text cdata text]]</c>" + NL +
- "</a>";
-
- checkCData(xmlText, expected1, expected2);
- }
private void checkCData(String xmlText, String expected1, String expected2)
throws XmlException
Modified: xmlbeans/trunk/testbuild.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/testbuild.xml?rev=1832877&r1=1832876&r2=1832877&view=diff
==============================================================================
--- xmlbeans/trunk/testbuild.xml (original)
+++ xmlbeans/trunk/testbuild.xml Mon Jun 4 18:35:56 2018
@@ -580,7 +580,7 @@
destdir="${build.dir.test.src}"
classpathref="test.run.classpath"
debug="on"
- source="1.6"
+ source="1.4"
optimize="on"
verbose="false"
failonerror="true">
@@ -662,7 +662,7 @@
excludes="${excludes}"
classpathref="test.run.classpath"
optimize="on"
- source="1.6"
+ source="1.4"
debug="on"
verbose="false"
failonerror="true"/>
@@ -914,7 +914,7 @@
classpathref="test.run.classpath"
optimize="on"
debug="on"
- source="1.6"
+ source="1.4"
verbose="false"
failonerror="true"/>
<property name="test.area.run" value="${excludes}"/>