1 files changed, 36 insertions, 29 deletions
diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/testfiles/tvldtypes2.h5.xml
index a8802ec..0fea1ef 100644
--- a/tools/testfiles/tvldtypes2.h5.xml
+++ b/tools/testfiles/tvldtypes2.h5.xml
@@ -2,35 +2,42 @@
 Expected output for 'h5dump --xml tvldtypes2.h5'
 #############################
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
-<HDF5-File>
-<RootGroup OBJ-XID="root">
-   <Dataset Name="Dataset1" OBJ-XID="/Dataset1" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="1">
-            <Dimension  DimSize="4" MaxDimSize="4"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <VLType>
-            <DataType>
-               <VLType>
-                  <DataType>
-                     <AtomicType>
-                        <IntegerType ByteOrder="LE" Sign="false" Size="4" />
-                     </AtomicType>
-                  </DataType>
-               </VLType>
-            </DataType>
-         </VLType>
-      </DataType>
+<hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_928-0" H5Path="/">
+   <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976-0" H5Path= "/Dataset1" Parents="xid_928-0" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ContiguousLayout/>
+      </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValue>
+               <hdf5:NoFill/>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <hdf5:SimpleDataspace Ndims="1">
+            <hdf5:Dimension  DimSize="4" MaxDimSize="4"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:VLType>
+            <hdf5:DataType>
+               <hdf5:VLType>
+                  <hdf5:DataType>
+                     <hdf5:AtomicType>
+                        <hdf5:IntegerType ByteOrder="LE" Sign="false" Size="4" />
+                     </hdf5:AtomicType>
+                  </hdf5:DataType>
+               </hdf5:VLType>
+            </hdf5:DataType>
+         </hdf5:VLType>
+      </hdf5:DataType>
 <!-- Note: format of VL data not specified -->
-      <Data>
-         <DataFromFile>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
            0     100   110 111     200   210 211   220 221 222   
            300   310 311   320 321 322   330 331 332 333  
-         </DataFromFile>
-      </Data>
-   </Dataset>
-</RootGroup>
-</HDF5-File>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>