Skip to content

Commit 3ff80ed

Browse files
adamretteradamretter
committed
[bugfix] Reference nodes in the in-memory DOM (Memtree) should be transparent to the org.w3c.dom API
Closes eXist-db/exist#5682
1 parent fbc3598 commit 3ff80ed

File tree

24 files changed

+1109
-388
lines changed

24 files changed

+1109
-388
lines changed

‎exist-core/pom.xml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,12 +677,18 @@
677677
<header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
678678
<includes>
679679
<include>project-suppression.xml</include>
680+
<include>src/main/java/org/exist/dom/memtree/reference/AbstractReferenceCharacterData.java</include>
681+
<include>src/main/java/org/exist/dom/memtree/reference/AbstractReferenceNodeImpl.java</include>
682+
<include>src/main/java/org/exist/dom/memtree/reference/CommentReferenceImpl.java</include>
683+
<include>src/main/java/org/exist/dom/memtree/reference/ElementReferenceImpl.java</include>
684+
<include>src/main/java/org/exist/dom/memtree/reference/TextReferenceImpl.java</include>
680685
<include>src/main/java/org/exist/util/ByteOrderMark.java</include>
681686
<include>src/test/java/org/exist/xquery/ImportFromPkgTest.java</include>
682687
<include>src/test/java/org/exist/xquery/WatchdogTest.java</include>
683688
<include>src/test/java/org/exist/xquery/value/DateTimeTypesTest.java</include>
684689
<include>src/test/java/org/exist/xquery/functions/fn/FunXmlToJsonTest.java</include>
685690
<include>src/test/java/org/exist/xquery/functions/fn/ParsingFunctionsTest.java</include>
691+
<include>src/test/java/org/exist/xquery/functions/fn/transform/FunTransformITTest.java</include>
686692
<include>src/test/java/org/exist/xquery/functions/xmldb/XMLDBStoreTest.java</include>
687693
<include>src/test/resources-filtered/org/exist/xquery/import-from-pkg-test.conf.xml</include>
688694
</includes>
@@ -728,12 +734,18 @@
728734
<include>src/main/java/org/exist/collections/triggers/DocumentTrigger.java</include>
729735
<include>src/main/java/org/exist/config/Configuration.java</include>
730736
<include>src/main/java/org/exist/config/ConfigurationImpl.java</include>
737+
<include>src/main/java/org/exist/dom/memtree/DocumentImpl.java</include>
731738
<include>src/main/java/org/exist/dom/memtree/ElementImpl.java</include>
739+
<include>src/main/java/org/exist/dom/memtree/MemTreeBuilder.java</include>
740+
<include>src/main/java/org/exist/dom/memtree/NodeImpl.java</include>
741+
<include>src/main/java/org/exist/dom/persistent/AbstractCharacterData.java</include>
742+
<include>src/main/java/org/exist/dom/persistent/CommentImpl.java</include>
732743
<include>src/main/java/org/exist/dom/persistent/DocumentImpl.java</include>
733744
<include>src/main/java/org/exist/dom/persistent/DocumentSet.java</include>
734745
<include>src/main/java/org/exist/dom/persistent/ElementImpl.java</include>
735746
<include>src/test/java/org/exist/dom/persistent/NodeTest.java</include>
736747
<include>src/main/java/org/exist/dom/persistent/SymbolTable.java</include>
748+
<include>src/main/java/org/exist/dom/persistent/TextImpl.java</include>
737749
<include>src/main/java/org/exist/dom/persistent/VirtualNodeSet.java</include>
738750
<include>src/main/java/org/exist/http/Descriptor.java</include>
739751
<include>src/main/java/org/exist/http/RESTServer.java</include>
@@ -770,6 +782,7 @@
770782
<include>src/main/java/org/exist/storage/NativeBroker.java</include>
771783
<include>src/main/java/org/exist/storage/lock/FileLock.java</include>
772784
<include>src/main/java/org/exist/storage/recovery/RecoveryManager.java</include>
785+
<include>src/main/java/org/exist/storage/serializers/Serializer.java</include>
773786
<include>src/main/java/org/exist/storage/sync/SyncTask.java</include>
774787
<include>src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java</include>
775788
<include>src/main/java/org/exist/test/runner/XMLTestRunner.java</include>
@@ -779,17 +792,21 @@
779792
<include>src/main/java/org/exist/util/Configuration.java</include>
780793
<include>src/main/java/org/exist/util/ParametersExtractor.java</include>
781794
<include>src/main/java/org/exist/util/crypto/digest/DigestType.java</include>
795+
<include>src/main/java/org/exist/util/serializer/DOMStreamer.java</include>
796+
<include>src/main/java/org/exist/util/serializer/SerializerObjectFactory.java</include>
782797
<include>src/test/java/org/exist/w3c/tests/TestCase.java</include>
783798
<include>src/main/java/org/exist/webstart/JnlpJarFiles.java</include>
784799
<include>src/main/java/org/exist/xmldb/RemoteRestoreService.java</include>
785800
<include>src/main/java/org/exist/xmlrpc/ExistRpcTypeFactory.java</include>
786801
<include>src/main/java/org/exist/xqj/Marshaller.java</include>
802+
<include>src/main/java/org/exist/xquery/functions/fn/FunDeepEqual.java</include>
787803
<include>src/main/java/org/exist/xquery/functions/fn/FunUriCollection.java</include>
788804
<include>src/main/java/org/exist/xquery/functions/fn/ParsingFunctions.java</include>
789805
<include>src/main/java/org/exist/xquery/functions/system/GetUptime.java</include>
790806
<include>src/main/java/org/exist/xquery/functions/system/Shutdown.java</include>
791807
<include>src/main/java/org/exist/xquery/functions/system/TriggerSystemTask.java</include>
792808
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBStore.java</include>
809+
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</include>
793810
<include>src/main/java/org/exist/xquery/value/AbstractDateTimeValue.java</include>
794811
<include>src/main/java/org/exist/xquery/value/Type.java</include>
795812
<include>src/main/java/org/exist/xslt/EXistURIResolver.java</include>
@@ -871,12 +888,24 @@
871888
<exclude>src/main/java/org/exist/collections/triggers/DocumentTrigger.java</exclude>
872889
<exclude>src/main/java/org/exist/config/Configuration.java</exclude>
873890
<exclude>src/main/java/org/exist/config/ConfigurationImpl.java</exclude>
891+
<exclude>src/main/java/org/exist/dom/memtree/DocumentImpl.java</exclude>
874892
<exclude>src/main/java/org/exist/dom/memtree/ElementImpl.java</exclude>
893+
<exclude>src/main/java/org/exist/dom/memtree/MemTreeBuilder.java</exclude>
894+
<exclude>src/main/java/org/exist/dom/memtree/NodeImpl.java</exclude>
895+
<exclude>src/main/java/org/exist/dom/memtree/reference/AbstractReferenceNodeImpl.java</exclude>
896+
<exclude>src/main/java/org/exist/dom/memtree/reference/AbstractReferenceCharacterData.java</exclude>
897+
<exclude>src/main/java/org/exist/dom/memtree/reference/AbstractReferenceNodeImpl.java</exclude>
898+
<exclude>src/main/java/org/exist/dom/memtree/reference/CommentReferenceImpl.java</exclude>
899+
<exclude>src/main/java/org/exist/dom/memtree/reference/ElementReferenceImpl.java</exclude>
900+
<exclude>src/main/java/org/exist/dom/memtree/reference/TextReferenceImpl.java</exclude>
901+
<exclude>src/main/java/org/exist/dom/persistent/AbstractCharacterData.java</exclude>
902+
<exclude>src/main/java/org/exist/dom/persistent/CommentImpl.java</exclude>
875903
<exclude>src/main/java/org/exist/dom/persistent/DocumentImpl.java</exclude>
876904
<exclude>src/main/java/org/exist/dom/persistent/DocumentSet.java</exclude>
877905
<exclude>src/main/java/org/exist/dom/persistent/ElementImpl.java</exclude>
878-
<include>src/test/java/org/exist/dom/persistent/NodeTest.java</include>
906+
<exclude>src/test/java/org/exist/dom/persistent/NodeTest.java</exclude>
879907
<exclude>src/main/java/org/exist/dom/persistent/SymbolTable.java</exclude>
908+
<exclude>src/main/java/org/exist/dom/persistent/TextImpl.java</exclude>
880909
<exclude>src/main/java/org/exist/dom/persistent/VirtualNodeSet.java</exclude>
881910
<exclude>src/main/java/org/exist/http/Descriptor.java</exclude>
882911
<exclude>src/main/java/org/exist/http/RESTServer.java</exclude>
@@ -914,6 +943,7 @@
914943
<exclude>src/main/java/org/exist/storage/NativeBroker.java</exclude>
915944
<exclude>src/main/java/org/exist/storage/lock/FileLock.java</exclude>
916945
<exclude>src/main/java/org/exist/storage/recovery/RecoveryManager.java</exclude>
946+
<exclude>src/main/java/org/exist/storage/serializers/Serializer.java</exclude>
917947
<exclude>src/main/java/org/exist/storage/sync/SyncTask.java</exclude>
918948
<exclude>src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java</exclude>
919949
<exclude>src/main/java/org/exist/test/runner/XMLTestRunner.java</exclude>
@@ -924,23 +954,28 @@
924954
<exclude>src/main/java/org/exist/util/Configuration.java</exclude>
925955
<exclude>src/main/java/org/exist/util/ParametersExtractor.java</exclude>
926956
<exclude>src/main/java/org/exist/util/crypto/digest/DigestType.java</exclude>
957+
<exclude>src/main/java/org/exist/util/serializer/DOMStreamer.java</exclude>
958+
<exclude>src/main/java/org/exist/util/serializer/SerializerObjectFactory.java</exclude>
927959
<exclude>src/main/java/org/exist/webstart/JnlpJarFiles.java</exclude>
928960
<exclude>src/main/java/org/exist/xmldb/RemoteRestoreService.java</exclude>
929961
<exclude>src/main/java/org/exist/xmlrpc/ExistRpcTypeFactory.java</exclude>
930962
<exclude>src/main/java/org/exist/xqj/Marshaller.java</exclude>
931963
<exclude>src/test/java/org/exist/xquery/ImportFromPkgTest.java</exclude>
964+
<exclude>src/main/java/org/exist/xquery/NameTest.java</exclude>
932965
<exclude>src/test/java/org/exist/xquery/WatchdogTest.java</exclude>
933966
<exclude>src/main/java/org/exist/xquery/functions/fn/FunUriCollection.java</exclude>
934967
<exclude>src/main/java/org/exist/xquery/functions/fn/FunXmlToJson.java</exclude>
935968
<exclude>src/test/java/org/exist/xquery/functions/fn/FunXmlToJsonTest.java</exclude>
936969
<exclude>src/main/java/org/exist/xquery/functions/fn/LoadXQueryModule.java</exclude>
937970
<exclude>src/main/java/org/exist/xquery/functions/fn/ParsingFunctions.java</exclude>
938971
<exclude>src/test/java/org/exist/xquery/functions/fn/ParsingFunctionsTest.java</exclude>
972+
<exclude>src/test/java/org/exist/xquery/functions/fn/transform/FunTransformITTest.java</exclude>
939973
<exclude>src/main/java/org/exist/xquery/functions/system/GetUptime.java</exclude>
940974
<exclude>src/main/java/org/exist/xquery/functions/system/Shutdown.java</exclude>
941975
<exclude>src/main/java/org/exist/xquery/functions/system/TriggerSystemTask.java</exclude>
942976
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBStore.java</exclude>
943977
<exclude>src/test/java/org/exist/xquery/functions/xmldb/XMLDBStoreTest.java</exclude>
978+
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</exclude>
944979
<exclude>src/main/java/org/exist/xquery/value/AbstractDateTimeValue.java</exclude>
945980
<exclude>src/test/java/org/exist/xquery/value/DateTimeTypesTest.java</exclude>
946981
<exclude>src/main/java/org/exist/xquery/value/Type.java</exclude>
@@ -1028,6 +1063,7 @@
10281063
<exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
10291064
<exclude>src/main/java/org/exist/xquery/Materializable.java</exclude>
10301065
<exclude>src/test/java/org/exist/xquery/XQueryContextAttributesTest.java</exclude>
1066+
<exclude>src/main/java/org/exist/xquery/functions/fn/FunDeepEqual.java</exclude>
10311067
<exclude>src/main/java/org/exist/xquery/functions/map/MapType.java</exclude>
10321068
<exclude>src/test/java/org/exist/xquery/functions/session/AbstractSessionTest.java</exclude>
10331069
<exclude>src/test/java/org/exist/xquery/functions/xmldb/AbstractXMLDBTest.java</exclude>

0 commit comments

Comments
 (0)