From 5f2eebe1b64a77fc747126f0509eaff32249ad40 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 10 Aug 2011 15:51:44 -0500 Subject: [svn-r21211] Correct location of xml schema files. JIRA HDFFV-7688 --- tools/h5dump/h5dump.c | 10 +++++----- tools/testfiles/tall-2A.h5.xml | 2 +- tools/testfiles/tall.h5.xml | 2 +- tools/testfiles/tarray1.h5.xml | 2 +- tools/testfiles/tarray2.h5.xml | 2 +- tools/testfiles/tarray3.h5.xml | 2 +- tools/testfiles/tarray6.h5.xml | 2 +- tools/testfiles/tarray7.h5.xml | 2 +- tools/testfiles/tattr.h5.xml | 2 +- tools/testfiles/tbitfields.h5.xml | 2 +- tools/testfiles/tcompound.h5.xml | 2 +- tools/testfiles/tcompound2.h5.xml | 2 +- tools/testfiles/tcompound_complex.h5.xml | 2 +- tools/testfiles/tdatareg.h5.xml | 2 +- tools/testfiles/tdset.h5.xml | 2 +- tools/testfiles/tdset2.h5.xml | 2 +- tools/testfiles/tempty-dtd-2.h5.xml | 2 +- tools/testfiles/tempty-dtd.h5.xml | 2 +- tools/testfiles/tempty-nons-2.h5.xml | 2 +- tools/testfiles/tempty-nons.h5.xml | 2 +- tools/testfiles/tempty-ns-2.h5.xml | 2 +- tools/testfiles/tempty-ns.h5.xml | 2 +- tools/testfiles/tempty.h5.xml | 2 +- tools/testfiles/tenum.h5.xml | 2 +- tools/testfiles/textlink.h5.xml | 2 +- tools/testfiles/tfpformat.h5.xml | 2 +- tools/testfiles/tgroup.h5.xml | 2 +- tools/testfiles/thlink.h5.xml | 2 +- tools/testfiles/tloop.h5.xml | 2 +- tools/testfiles/tloop2.h5.xml | 2 +- tools/testfiles/tmany.h5.xml | 2 +- tools/testfiles/tname-amp.h5.xml | 2 +- tools/testfiles/tname-apos.h5.xml | 2 +- tools/testfiles/tname-gt.h5.xml | 2 +- tools/testfiles/tname-lt.h5.xml | 2 +- tools/testfiles/tname-quot.h5.xml | 2 +- tools/testfiles/tname-sp.h5.xml | 2 +- tools/testfiles/tnamed_dtype_attr.h5.xml | 2 +- tools/testfiles/tnestedcomp.h5.xml | 2 +- tools/testfiles/tnodata.h5.xml | 2 +- tools/testfiles/tobjref.h5.xml | 2 +- tools/testfiles/topaque.h5.xml | 2 +- tools/testfiles/torderattr1.h5.xml | 2 +- tools/testfiles/torderattr2.h5.xml | 2 +- tools/testfiles/torderattr3.h5.xml | 2 +- tools/testfiles/torderattr4.h5.xml | 2 +- tools/testfiles/tref-escapes-at.h5.xml | 2 +- tools/testfiles/tref-escapes.h5.xml | 2 +- tools/testfiles/tref.h5.xml | 2 +- tools/testfiles/tsaf.h5.xml | 2 +- tools/testfiles/tslink.h5.xml | 2 +- tools/testfiles/tstr.h5.xml | 2 +- tools/testfiles/tstr2.h5.xml | 2 +- tools/testfiles/tstring-at.h5.xml | 2 +- tools/testfiles/tstring.h5.xml | 2 +- tools/testfiles/tudlink.h5.xml | 2 +- tools/testfiles/tvldtypes1.h5.xml | 2 +- tools/testfiles/tvldtypes2.h5.xml | 2 +- tools/testfiles/tvldtypes3.h5.xml | 2 +- tools/testfiles/tvldtypes4.h5.xml | 2 +- tools/testfiles/tvldtypes5.h5.xml | 2 +- tools/testfiles/tvlstr.h5.xml | 2 +- 62 files changed, 66 insertions(+), 66 deletions(-) diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 23ab0a5..17dba83 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -113,8 +113,8 @@ static int packed_length[PACKED_BITS_MAX]; **/ /* module-scoped variables for XML option */ -#define DEFAULT_XSD "http://www.hdfgroup.org/DTDs/HDF5-File.xsd" -#define DEFAULT_DTD "http://www.hdfgroup.org/DTDs/HDF5-File.dtd" +#define DEFAULT_XSD "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" +#define DEFAULT_DTD "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.dtd" static int doxml = 0; static int useschema = 1; @@ -4776,10 +4776,10 @@ main(int argc, const char *argv[]) indx = strrchr(ns,(int)':'); if (indx) *indx = '\0'; - HDfprintf(stdout, "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/DTDs/HDF5-File\" " + HDfprintf(stdout, "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File\" " "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " - "xsi:schemaLocation=\"http://hdfgroup.org/DTDs/HDF5-File " - "http://www.hdfgroup.org/DTDs/HDF5-File.xsd\">\n",xmlnsprefix,ns); + "xsi:schemaLocation=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File " + "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\">\n",xmlnsprefix,ns); HDfree(ns); } } diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml index b582e5b..a2da338 100644 --- a/tools/testfiles/tall-2A.h5.xml +++ b/tools/testfiles/tall-2A.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml index f1f2810..0ab7e29 100644 --- a/tools/testfiles/tall.h5.xml +++ b/tools/testfiles/tall.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tarray1.h5.xml b/tools/testfiles/tarray1.h5.xml index 419c8a6..01aeb3c 100644 --- a/tools/testfiles/tarray1.h5.xml +++ b/tools/testfiles/tarray1.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tarray2.h5.xml b/tools/testfiles/tarray2.h5.xml index 3a9d01f..ca253ae 100644 --- a/tools/testfiles/tarray2.h5.xml +++ b/tools/testfiles/tarray2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tarray3.h5.xml b/tools/testfiles/tarray3.h5.xml index 7280b79..fb1ed07 100644 --- a/tools/testfiles/tarray3.h5.xml +++ b/tools/testfiles/tarray3.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tarray6.h5.xml b/tools/testfiles/tarray6.h5.xml index 4151cf7..96fc69e 100644 --- a/tools/testfiles/tarray6.h5.xml +++ b/tools/testfiles/tarray6.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tarray7.h5.xml b/tools/testfiles/tarray7.h5.xml index 67743d1..6a0558c 100644 --- a/tools/testfiles/tarray7.h5.xml +++ b/tools/testfiles/tarray7.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tattr.h5.xml b/tools/testfiles/tattr.h5.xml index cca1d96..2d6a6fd 100644 --- a/tools/testfiles/tattr.h5.xml +++ b/tools/testfiles/tattr.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tbitfields.h5.xml b/tools/testfiles/tbitfields.h5.xml index 94077f1..62efbce 100644 --- a/tools/testfiles/tbitfields.h5.xml +++ b/tools/testfiles/tbitfields.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tcompound.h5.xml b/tools/testfiles/tcompound.h5.xml index d340709..6d7d7c8 100644 --- a/tools/testfiles/tcompound.h5.xml +++ b/tools/testfiles/tcompound.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/testfiles/tcompound2.h5.xml index c631ea9..6db1785 100644 --- a/tools/testfiles/tcompound2.h5.xml +++ b/tools/testfiles/tcompound2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/testfiles/tcompound_complex.h5.xml index 1f0b20a..bda8c94 100644 --- a/tools/testfiles/tcompound_complex.h5.xml +++ b/tools/testfiles/tcompound_complex.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/testfiles/tdatareg.h5.xml index e9661ae..03188b8 100644 --- a/tools/testfiles/tdatareg.h5.xml +++ b/tools/testfiles/tdatareg.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tdset.h5.xml b/tools/testfiles/tdset.h5.xml index 711d9d1..59719d3 100644 --- a/tools/testfiles/tdset.h5.xml +++ b/tools/testfiles/tdset.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tdset2.h5.xml b/tools/testfiles/tdset2.h5.xml index c8c6f64..a407ae8 100644 --- a/tools/testfiles/tdset2.h5.xml +++ b/tools/testfiles/tdset2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/testfiles/tempty-dtd-2.h5.xml index 97e712e..cff16fd 100644 --- a/tools/testfiles/tempty-dtd-2.h5.xml +++ b/tools/testfiles/tempty-dtd-2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/testfiles/tempty-dtd.h5.xml index 97e712e..cff16fd 100644 --- a/tools/testfiles/tempty-dtd.h5.xml +++ b/tools/testfiles/tempty-dtd.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/testfiles/tempty-nons-2.h5.xml index c3d6605..c43c163 100644 --- a/tools/testfiles/tempty-nons-2.h5.xml +++ b/tools/testfiles/tempty-nons-2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/testfiles/tempty-nons.h5.xml index c3d6605..c43c163 100644 --- a/tools/testfiles/tempty-nons.h5.xml +++ b/tools/testfiles/tempty-nons.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/testfiles/tempty-ns-2.h5.xml index 3cb249f..4504115 100644 --- a/tools/testfiles/tempty-ns-2.h5.xml +++ b/tools/testfiles/tempty-ns-2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/testfiles/tempty-ns.h5.xml index 3cb249f..4504115 100644 --- a/tools/testfiles/tempty-ns.h5.xml +++ b/tools/testfiles/tempty-ns.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tempty.h5.xml b/tools/testfiles/tempty.h5.xml index 3970c24..e6981a5 100644 --- a/tools/testfiles/tempty.h5.xml +++ b/tools/testfiles/tempty.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tenum.h5.xml b/tools/testfiles/tenum.h5.xml index 1e3273c..93cbfc8 100644 --- a/tools/testfiles/tenum.h5.xml +++ b/tools/testfiles/tenum.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/textlink.h5.xml b/tools/testfiles/textlink.h5.xml index 4e13be2..f6c7ff6 100644 --- a/tools/testfiles/textlink.h5.xml +++ b/tools/testfiles/textlink.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/testfiles/tfpformat.h5.xml index 31c7df4..34af79a 100644 --- a/tools/testfiles/tfpformat.h5.xml +++ b/tools/testfiles/tfpformat.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tgroup.h5.xml b/tools/testfiles/tgroup.h5.xml index 5a9c9a3..8065165 100644 --- a/tools/testfiles/tgroup.h5.xml +++ b/tools/testfiles/tgroup.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/thlink.h5.xml b/tools/testfiles/thlink.h5.xml index 8191e11..b726087 100644 --- a/tools/testfiles/thlink.h5.xml +++ b/tools/testfiles/thlink.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tloop.h5.xml b/tools/testfiles/tloop.h5.xml index 5afc994..4be3290 100644 --- a/tools/testfiles/tloop.h5.xml +++ b/tools/testfiles/tloop.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tloop2.h5.xml b/tools/testfiles/tloop2.h5.xml index 7185496..ffaf089 100644 --- a/tools/testfiles/tloop2.h5.xml +++ b/tools/testfiles/tloop2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml index da39483..8fc5e59 100644 --- a/tools/testfiles/tmany.h5.xml +++ b/tools/testfiles/tmany.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/testfiles/tname-amp.h5.xml index 5b0ea91..0893511 100644 --- a/tools/testfiles/tname-amp.h5.xml +++ b/tools/testfiles/tname-amp.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/testfiles/tname-apos.h5.xml index e00c16e..47f55a2 100644 --- a/tools/testfiles/tname-apos.h5.xml +++ b/tools/testfiles/tname-apos.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/testfiles/tname-gt.h5.xml index ecf3e10..e21909e 100644 --- a/tools/testfiles/tname-gt.h5.xml +++ b/tools/testfiles/tname-gt.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/testfiles/tname-lt.h5.xml index 2f181ce..3738de9 100644 --- a/tools/testfiles/tname-lt.h5.xml +++ b/tools/testfiles/tname-lt.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/testfiles/tname-quot.h5.xml index c52a4b2..9da93c5 100644 --- a/tools/testfiles/tname-quot.h5.xml +++ b/tools/testfiles/tname-quot.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/testfiles/tname-sp.h5.xml index 4bd8bef..3bdc6a8 100644 --- a/tools/testfiles/tname-sp.h5.xml +++ b/tools/testfiles/tname-sp.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/testfiles/tnamed_dtype_attr.h5.xml index 8445ffd..aee7915 100644 --- a/tools/testfiles/tnamed_dtype_attr.h5.xml +++ b/tools/testfiles/tnamed_dtype_attr.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/testfiles/tnestedcomp.h5.xml index e087805..f5f9fea 100644 --- a/tools/testfiles/tnestedcomp.h5.xml +++ b/tools/testfiles/tnestedcomp.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tnodata.h5.xml b/tools/testfiles/tnodata.h5.xml index 7050f23..dc48c7a 100644 --- a/tools/testfiles/tnodata.h5.xml +++ b/tools/testfiles/tnodata.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tobjref.h5.xml b/tools/testfiles/tobjref.h5.xml index e6fd560..b8c7fc5 100644 --- a/tools/testfiles/tobjref.h5.xml +++ b/tools/testfiles/tobjref.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/topaque.h5.xml b/tools/testfiles/topaque.h5.xml index 08ba280..1e20336 100644 --- a/tools/testfiles/topaque.h5.xml +++ b/tools/testfiles/topaque.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/testfiles/torderattr1.h5.xml index a688ffe..bfba4d0 100644 --- a/tools/testfiles/torderattr1.h5.xml +++ b/tools/testfiles/torderattr1.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/testfiles/torderattr2.h5.xml index e0fcbb5..11f2266 100644 --- a/tools/testfiles/torderattr2.h5.xml +++ b/tools/testfiles/torderattr2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/testfiles/torderattr3.h5.xml index d29bc9a..10ea95e 100644 --- a/tools/testfiles/torderattr3.h5.xml +++ b/tools/testfiles/torderattr3.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/testfiles/torderattr4.h5.xml index 9d4a992..2546b30 100644 --- a/tools/testfiles/torderattr4.h5.xml +++ b/tools/testfiles/torderattr4.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/testfiles/tref-escapes-at.h5.xml index 847ed8c..a136651 100644 --- a/tools/testfiles/tref-escapes-at.h5.xml +++ b/tools/testfiles/tref-escapes-at.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/testfiles/tref-escapes.h5.xml index 6c9f245..c70793f 100644 --- a/tools/testfiles/tref-escapes.h5.xml +++ b/tools/testfiles/tref-escapes.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tref.h5.xml b/tools/testfiles/tref.h5.xml index 32b7c8b..e70e0c2 100644 --- a/tools/testfiles/tref.h5.xml +++ b/tools/testfiles/tref.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tsaf.h5.xml b/tools/testfiles/tsaf.h5.xml index 39c8811..6b7f5c5 100644 --- a/tools/testfiles/tsaf.h5.xml +++ b/tools/testfiles/tsaf.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tslink.h5.xml b/tools/testfiles/tslink.h5.xml index deeb70c..9d8040e 100644 --- a/tools/testfiles/tslink.h5.xml +++ b/tools/testfiles/tslink.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tstr.h5.xml b/tools/testfiles/tstr.h5.xml index 3ef8217..ac9e268 100644 --- a/tools/testfiles/tstr.h5.xml +++ b/tools/testfiles/tstr.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tstr2.h5.xml b/tools/testfiles/tstr2.h5.xml index e7aafc8..3f691aa 100644 --- a/tools/testfiles/tstr2.h5.xml +++ b/tools/testfiles/tstr2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/testfiles/tstring-at.h5.xml index 739ebc4..b2bc39d 100644 --- a/tools/testfiles/tstring-at.h5.xml +++ b/tools/testfiles/tstring-at.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tstring.h5.xml b/tools/testfiles/tstring.h5.xml index 7c86d4c..4f9d7b5 100644 --- a/tools/testfiles/tstring.h5.xml +++ b/tools/testfiles/tstring.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tudlink.h5.xml b/tools/testfiles/tudlink.h5.xml index 56f3488..7e57dd8 100644 --- a/tools/testfiles/tudlink.h5.xml +++ b/tools/testfiles/tudlink.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/testfiles/tvldtypes1.h5.xml index 5d5874e..3ccd3b4 100644 --- a/tools/testfiles/tvldtypes1.h5.xml +++ b/tools/testfiles/tvldtypes1.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/testfiles/tvldtypes2.h5.xml index 3464dbd..e0b44f3 100644 --- a/tools/testfiles/tvldtypes2.h5.xml +++ b/tools/testfiles/tvldtypes2.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/testfiles/tvldtypes3.h5.xml index db230e0..902de03 100644 --- a/tools/testfiles/tvldtypes3.h5.xml +++ b/tools/testfiles/tvldtypes3.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/testfiles/tvldtypes4.h5.xml index 5d4e535..34cd2be 100644 --- a/tools/testfiles/tvldtypes4.h5.xml +++ b/tools/testfiles/tvldtypes4.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/testfiles/tvldtypes5.h5.xml index e6b306a..d2d2bf6 100644 --- a/tools/testfiles/tvldtypes5.h5.xml +++ b/tools/testfiles/tvldtypes5.h5.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml index 31fcb9f..697aad5 100644 --- a/tools/testfiles/tvlstr.h5.xml +++ b/tools/testfiles/tvlstr.h5.xml @@ -1,5 +1,5 @@ - + -- cgit v0.12