1 files changed, 54 insertions, 39 deletions
diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/testfiles/tdatareg.h5.xml
index e9008bc..c285f85 100644
--- a/tools/testfiles/tdatareg.h5.xml
+++ b/tools/testfiles/tdatareg.h5.xml
@@ -2,41 +2,56 @@
 Expected output for 'h5dump --xml tdatareg.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> 
-         <AtomicType>
-            <ReferenceType>
-               <ObjectReferenceType />
-            </ReferenceType>
-         </AtomicType>
-      </DataType>
-   <Data>
+<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_696-0" H5Path="/">
+   <hdf5:Dataset Name="Dataset1" OBJ-XID="xid_1284-0" H5Path= "/Dataset1" Parents="xid_696-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:AtomicType>
+            <hdf5:ReferenceType>
+               <hdf5:ObjectReferenceType />
+            </hdf5:ReferenceType>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+   <hdf5:Data>
    <!-- Note: Region references not supported -->
-   <NoData />
-   </Data>
-   </Dataset>
-   <Dataset Name="Dataset2" OBJ-XID="/Dataset2" Parents="root">
-      <Dataspace>
-         <SimpleDataspace Ndims="2">
-            <Dimension  DimSize="10" MaxDimSize="10"/>
-            <Dimension  DimSize="10" MaxDimSize="10"/>
-         </SimpleDataspace>
-      </Dataspace>
-      <DataType> 
-         <AtomicType>
-            <IntegerType ByteOrder="BE" Sign="false" Size="1" />
-         </AtomicType>
-      </DataType>
-      <Data>
-         <DataFromFile>
+   <hdf5:NoData />
+   </hdf5:Data>
+   </hdf5:Dataset>
+   <hdf5:Dataset Name="Dataset2" OBJ-XID="xid_744-0" H5Path= "/Dataset2" Parents="xid_696-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="2">
+            <hdf5:Dimension  DimSize="10" MaxDimSize="10"/>
+            <hdf5:Dimension  DimSize="10" MaxDimSize="10"/>
+         </hdf5:SimpleDataspace>
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:IntegerType ByteOrder="BE" Sign="false" Size="1" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
          0 3 6 9 12 15 18 21 24 27 
          30 33 36 39 42 45 48 51 54 57 
          60 63 66 69 72 75 78 81 84 87 
@@ -47,8 +62,8 @@ Expected output for 'h5dump --xml tdatareg.h5'
          210 213 216 219 222 225 228 231 234 237 
          240 243 246 249 252 255 2 5 8 11 
          14 17 20 23 26 29 32 35 38 41
-         </DataFromFile>
-      </Data>
-   </Dataset>
-</RootGroup>
-</HDF5-File>
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>