31 files changed, 2408 insertions, 103 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd15c16..b73e7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,6 +508,14 @@ else ()
 endif ()
 
 #-----------------------------------------------------------------------------
+# perl is used in some optional src and tests, check availability
+find_package (Perl)
+if (PERL_FOUND)
+  set (H5_PERL_FOUND YES)
+endif ()
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
 # Option to Build Static executables
 #-----------------------------------------------------------------------------
 option (BUILD_STATIC_EXECS "Build Static Executables" OFF)
diff --git a/MANIFEST b/MANIFEST
index 2bba97f..faf703f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1973,6 +1973,9 @@
 ./tools/testfiles/tfill.ddl
 ./tools/testfiles/tfilters.h5
 ./tools/testfiles/tfletcher32.ddl
+./tools/testfiles/tfloatsattrs.ddl
+./tools/testfiles/tfloatsattrs.h5
+./tools/testfiles/tfloatsattrs.wddl
 ./tools/testfiles/tfvalues.h5
 ./tools/testfiles/tgroup-1.ddl
 ./tools/testfiles/tgroup-2.ddl
@@ -2011,10 +2014,8 @@
 ./tools/testfiles/tlarge_objname.ddl
 ./tools/testfiles/tlarge_objname.h5
 ./tools/testfiles/tldouble.ddl
-./tools/testfiles/tldouble.wddl
 ./tools/testfiles/tldouble.h5
 ./tools/testfiles/tldouble_scalar.ddl
-./tools/testfiles/tldouble_scalar.wddl
 ./tools/testfiles/tldouble_scalar.h5
 ./tools/testfiles/tlonglinks.ddl
 ./tools/testfiles/tlonglinks.h5
@@ -3396,9 +3397,11 @@
 ./java/test/junit.sh.in
 ./java/test/testfiles/JUnit-TestH5.txt
 ./java/test/testfiles/JUnit-TestH5A.txt
+./java/test/testfiles/JUnit-TestH5Arw.txt
 ./java/test/testfiles/JUnit-TestH5Dparams.txt
 ./java/test/testfiles/JUnit-TestH5D.txt
 ./java/test/testfiles/JUnit-TestH5Dplist.txt
+./java/test/testfiles/JUnit-TestH5Drw.txt
 ./java/test/testfiles/JUnit-TestH5E.txt
 ./java/test/testfiles/JUnit-TestH5Edefault.txt
 ./java/test/testfiles/JUnit-TestH5Eparams.txt
@@ -3437,9 +3440,11 @@
 ./java/test/h5ex_g_iterate.orig
 ./java/test/TestH5.java
 ./java/test/TestH5A.java
+./java/test/TestH5Arw.java
 ./java/test/TestH5Dparams.java
 ./java/test/TestH5D.java
 ./java/test/TestH5Dplist.java
+./java/test/TestH5Drw.java
 ./java/test/TestH5E.java
 ./java/test/TestH5Edefault.java
 ./java/test/TestH5Eparams.java
diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in
index 24fc4ba..2395d6c 100644
--- a/doxygen/Doxyfile.in
+++ b/doxygen/Doxyfile.in
@@ -263,6 +263,7 @@ TAB_SIZE               = 4
 
 ALIASES                =
 
+@INCLUDE_PATH          = @DOXYGEN_INCLUDE_ALIASES_PATH@
 @INCLUDE               = @DOXYGEN_INCLUDE_ALIASES@
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 4b4d96c..7aed8f1 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -23,6 +23,7 @@ set (HDF5_JAVA_TEST_SOURCES
     TestH5Dparams
     TestH5D
     TestH5Dplist
+    TestH5Drw
     TestH5Lparams
     TestH5Lbasic
     TestH5Lcreate
@@ -34,6 +35,7 @@ set (HDF5_JAVA_TEST_SOURCES
     TestH5Pvirtual
     TestH5Plist
     TestH5A
+    TestH5Arw
     TestH5Oparams
     TestH5Obasic
     TestH5Ocreate
@@ -98,6 +100,8 @@ HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5" "${PROJECT_BINARY_
 HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
 
 add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list})
 
@@ -215,6 +219,8 @@ if (HDF5_TEST_JAVA AND HDF5_TEST_SERIAL)
         HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5" "${PROJECT_BINARY_DIR}/${voltest}/trefer_attr.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tdatareg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
         HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5" "${PROJECT_BINARY_DIR}/${voltest}/tattrreg.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tintsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
+        HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5" "${PROJECT_BINARY_DIR}/${voltest}/tfloatsattrs.h5" "${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files")
 
         add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_${voltest}_files_list})
 
diff --git a/java/test/Makefile.am b/java/test/Makefile.am
index 41cd56e..08e79e3 100644
--- a/java/test/Makefile.am
+++ b/java/test/Makefile.am
@@ -52,6 +52,7 @@ noinst_JAVA = \
     TestH5T.java \
     TestH5Dparams.java \
     TestH5D.java \
+    TestH5Drw.java \
     TestH5Dplist.java \
     TestH5Lparams.java \
     TestH5Lbasic.java \
@@ -66,6 +67,7 @@ noinst_JAVA = \
     TestH5Pvirtual.java \
     TestH5Plist.java \
     TestH5A.java \
+    TestH5Arw.java \
     TestH5Oparams.java \
     TestH5Obasic.java \
     TestH5Ocreate.java \
diff --git a/java/test/TestAll.java b/java/test/TestAll.java
index 3950072..16414e4 100644
--- a/java/test/TestAll.java
+++ b/java/test/TestAll.java
@@ -22,12 +22,12 @@ import org.junit.runners.Suite;
         TestH5Gbasic.class, TestH5G.class, TestH5Giterate.class,
         TestH5Sbasic.class, TestH5S.class,
         TestH5Tparams.class, TestH5Tbasic.class, TestH5T.class,
-        TestH5Dparams.class, TestH5D.class, TestH5Dplist.class,
+        TestH5Dparams.class, TestH5D.class, TestH5Dplist.class, TestH5Drw.class,
         TestH5Lparams.class, TestH5Lbasic.class, TestH5Lcreate.class,
         TestH5R.class, TestH5Rref.class,
         TestH5P.class, TestH5PData.class, TestH5Pfapl.class, TestH5Pvirtual.class, TestH5Plist.class,
         TestH5Pfapls3.class, TestH5Pfaplhdfs.class,
-        TestH5A.class,
+        TestH5A.class, TestH5Arw.class,
         TestH5Oparams.class, TestH5Obasic.class, TestH5Ocopy.class, TestH5Ocreate.class,
         TestH5PL.class, TestH5Z.class
 })
diff --git a/java/test/TestH5Arw.java b/java/test/TestH5Arw.java
new file mode 100644
index 0000000..282b736
--- /dev/null
+++ b/java/test/TestH5Arw.java
@@ -0,0 +1,449 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+package test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+
+import hdf.hdf5lib.H5;
+import hdf.hdf5lib.HDF5Constants;
+import hdf.hdf5lib.HDFNativeData;
+import hdf.hdf5lib.callbacks.H5A_iterate_cb;
+import hdf.hdf5lib.callbacks.H5A_iterate_t;
+import hdf.hdf5lib.exceptions.HDF5Exception;
+import hdf.hdf5lib.exceptions.HDF5LibraryException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+public class TestH5Arw {
+    @Rule public TestName testname = new TestName();
+    private static final String H5_INTS_FILE = "tintsattrs.h5";
+    private static final String H5_FLTS_FILE = "tfloatsattrs.h5";
+    private static final int DIM_X = 8;
+    private static final int DIM8_Y = 8;
+    private static final int DIM16_Y = 16;
+    private static final int DIM32_Y = 32;
+    private static final int DIM64_Y = 64;
+    private static final int DIM128_Y = 128;
+    private static final String DATASETU08 = "DU08BITS";
+    private static final String DATASETS08 = "DS08BITS";
+    private static final String DATASETU16 = "DU16BITS";
+    private static final String DATASETS16 = "DS16BITS";
+    private static final String DATASETU32 = "DU32BITS";
+    private static final String DATASETS32 = "DS32BITS";
+    private static final String DATASETU64 = "DU64BITS";
+    private static final String DATASETS64 = "DS64BITS";
+    private static final String DATASETF32 = "DS32BITS";
+    private static final String DATASETF64 = "DS64BITS";
+    private static final String DATASETF128 = "DS128BITS";
+    private static final int RANK = 2;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
+    long H5aid = HDF5Constants.H5I_INVALID_HID;
+    long H5did = HDF5Constants.H5I_INVALID_HID;
+
+    private final void _closeH5file() throws HDF5LibraryException {
+        if (H5aid >= 0)
+            try {H5.H5Aclose(H5aid);} catch (Exception ex) {}
+        if (H5did >= 0)
+            try {H5.H5Dclose(H5did);} catch (Exception ex) {}
+        if (H5fid > 0)
+            try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+    }
+
+    public void openH5file(String filename, String dsetname) {
+       try {
+           H5fid = H5.H5Fopen(filename,
+                   HDF5Constants.H5F_ACC_RDONLY, HDF5Constants.H5P_DEFAULT);
+       }
+       catch (Throwable err) {
+           err.printStackTrace();
+           fail("TestH5Arw._openH5file: " + err);
+       }
+       assertTrue("TestH5Arw._openH5file: H5.H5Fopen: ", H5fid >= 0);
+       try {
+           H5did = H5.H5Dopen(H5fid, dsetname, HDF5Constants.H5P_DEFAULT);
+       }
+       catch (Throwable err) {
+           err.printStackTrace();
+           fail("TestH5Arw._openH5file: " + err);
+       }
+       assertTrue("TestH5Arw._openH5file: H5.H5Dopen: ", H5did >= 0);
+       try {
+           H5aid = H5.H5Aopen(H5did, dsetname, HDF5Constants.H5P_DEFAULT);
+       }
+       catch (Throwable err) {
+           err.printStackTrace();
+           fail("TestH5Arw._openH5file: " + err);
+       }
+       assertTrue("TestH5Arw._openH5file: H5.H5Aopen: ", H5aid >= 0);
+    }
+
+    @After
+    public void closeH5file() throws HDF5LibraryException {
+        if (H5aid >= 0)
+            try {H5.H5Aclose(H5aid);} catch (Exception ex) {}
+        if (H5did >= 0)
+            try {H5.H5Aclose(H5did);} catch (Exception ex) {}
+        if (H5fid > 0)
+            try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+        H5fid = HDF5Constants.H5I_INVALID_HID;
+        H5did = HDF5Constants.H5I_INVALID_HID;
+        H5aid = HDF5Constants.H5I_INVALID_HID;
+        System.out.println();
+    }
+
+    @Before
+    public void verifyCount()
+            throws NullPointerException, HDF5Exception {
+        assertTrue("H5 open ids is 0", H5.getOpenIDCount()==0);
+        System.out.print(testname.getMethodName());
+    }
+
+    @Test
+    public void testH5Aread_8bit_ints() {
+        byte[][] attr_data = new byte[DIM_X][DIM8_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU08);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_8bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_UINT8, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_8bit_ints: H5Aread: " + err);
+        }
+
+        // End access to the attribute and release resources used by it.
+        try {
+            H5.H5Aclose(H5aid);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS08, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_8bit_ints: H5Dopen: " + err);
+        }
+
+        // Open an existing attribute.
+        try {
+            H5aid = H5.H5Aopen(H5did, DATASETS08, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_8bit_ints: H5Aopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_INT8, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_8bit_ints: H5Aread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Aread_16bit_ints() {
+        short[][] attr_data = new short[DIM_X][DIM16_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU16);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_16bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_UINT16, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_16bit_ints: H5Aread: " + err);
+        }
+
+        // End access to the attribute and release resources used by it.
+        try {
+            H5.H5Aclose(H5aid);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS16, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_16bit_ints: H5Dopen: " + err);
+        }
+
+        // Open an existing attribute.
+        try {
+            H5aid = H5.H5Aopen(H5did, DATASETS16, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_16bit_ints: H5Aopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_INT16, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_16bit_ints: H5Aread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Aread_32bit_ints() {
+        int[][] attr_data = new int[DIM_X][DIM16_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU32);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_UINT32, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_ints: H5Aread: " + err);
+        }
+
+        // End access to the attribute and release resources used by it.
+        try {
+            H5.H5Aclose(H5aid);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS32, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_ints: H5Dopen: " + err);
+        }
+
+        // Open an existing attribute.
+        try {
+            H5aid = H5.H5Aopen(H5did, DATASETS32, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_ints: H5Aopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_INT32, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_ints: H5Aread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Aread_64bit_ints() {
+        long[][] attr_data = new long[DIM_X][DIM64_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU64);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_UINT64, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_ints: H5Aread: " + err);
+        }
+
+        // End access to the attribute and release resources used by it.
+        try {
+            H5.H5Aclose(H5aid);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS64, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_ints: H5Dopen: " + err);
+        }
+
+        // Open an existing attribute.
+        try {
+            H5aid = H5.H5Aopen(H5did, DATASETS64, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_ints: H5Aopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_INT64, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_ints: H5Aread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Aread_32bit_floats() {
+        float[][] attr_data = new float[DIM_X][DIM32_Y];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF32);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_FLOAT, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_32bit_floats: H5Aread: " + err);
+        }
+        for (int i = 0; i < DIM_X; i++)
+            assertTrue("testH5Aread_32bit_floats - H5.H5Aread: ", attr_data[i][0] == (32 - i));
+    }
+
+    @Test
+    public void testH5Aread_64bit_floats() {
+        double[][] attr_data = new double[DIM_X][DIM64_Y];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF64);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_DOUBLE, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_64bit_floats: H5Aread: " + err);
+        }
+        for (int i = 0; i < DIM_X; i++)
+            assertTrue("testH5Aread_64bit_floats - H5.H5Aread: ", attr_data[i][0] == (64 - i));
+    }
+
+    @Test
+    public void testH5Aread_128bit_floats() {
+        byte[][][] attr_data = new byte[DIM_X][DIM128_Y][8];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF128);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Aread_128bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Aread(H5aid, HDF5Constants.H5T_NATIVE_LDOUBLE, attr_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Aread_128bit_floats: H5Aread: " + err);
+        }
+    }
+
+}
diff --git a/java/test/TestH5Drw.java b/java/test/TestH5Drw.java
new file mode 100644
index 0000000..69fb9d7
--- /dev/null
+++ b/java/test/TestH5Drw.java
@@ -0,0 +1,378 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+package test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+
+import hdf.hdf5lib.H5;
+import hdf.hdf5lib.HDF5Constants;
+import hdf.hdf5lib.HDFNativeData;
+import hdf.hdf5lib.callbacks.H5D_iterate_cb;
+import hdf.hdf5lib.callbacks.H5D_iterate_t;
+import hdf.hdf5lib.exceptions.HDF5Exception;
+import hdf.hdf5lib.exceptions.HDF5LibraryException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+public class TestH5Drw {
+    @Rule public TestName testname = new TestName();
+    private static final String H5_INTS_FILE = "tintsattrs.h5";
+    private static final String H5_FLTS_FILE = "tfloatsattrs.h5";
+    private static final int DIM_X = 8;
+    private static final int DIM8_Y = 8;
+    private static final int DIM16_Y = 16;
+    private static final int DIM32_Y = 32;
+    private static final int DIM64_Y = 64;
+    private static final int DIM128_Y = 128;
+    private static final String DATASETU08 = "DU08BITS";
+    private static final String DATASETS08 = "DS08BITS";
+    private static final String DATASETU16 = "DU16BITS";
+    private static final String DATASETS16 = "DS16BITS";
+    private static final String DATASETU32 = "DU32BITS";
+    private static final String DATASETS32 = "DS32BITS";
+    private static final String DATASETU64 = "DU64BITS";
+    private static final String DATASETS64 = "DS64BITS";
+    private static final String DATASETF32 = "DS32BITS";
+    private static final String DATASETF64 = "DS64BITS";
+    private static final String DATASETF128 = "DS128BITS";
+    private static final int RANK = 2;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
+    long H5did = HDF5Constants.H5I_INVALID_HID;
+
+    private final void _closeH5file() throws HDF5LibraryException {
+        if (H5did >= 0)
+            try {H5.H5Dclose(H5did);} catch (Exception ex) {}
+        if (H5fid > 0)
+            try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+    }
+
+    public void openH5file(String filename, String dsetname) {
+       try {
+           H5fid = H5.H5Fopen(filename,
+                   HDF5Constants.H5F_ACC_RDONLY, HDF5Constants.H5P_DEFAULT);
+       }
+       catch (Throwable err) {
+           err.printStackTrace();
+           fail("TestH5Drw._openH5file: " + err);
+       }
+       assertTrue("TestH5Drw._openH5file: H5.H5Fopen: ", H5fid >= 0);
+       try {
+           H5did = H5.H5Dopen(H5fid, dsetname, HDF5Constants.H5P_DEFAULT);
+       }
+       catch (Throwable err) {
+           err.printStackTrace();
+           fail("TestH5Drw._openH5file: " + err);
+       }
+       assertTrue("TestH5Drw._openH5file: H5.H5Dopen: ", H5did >= 0);
+    }
+
+    @After
+    public void closeH5file() throws HDF5LibraryException {
+        if (H5did >= 0)
+            try {H5.H5Dclose(H5did);} catch (Exception ex) {}
+        if (H5fid > 0)
+            try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+        H5fid = HDF5Constants.H5I_INVALID_HID;
+        H5did = HDF5Constants.H5I_INVALID_HID;
+        System.out.println();
+    }
+
+    @Before
+    public void verifyCount()
+            throws NullPointerException, HDF5Exception {
+        assertTrue("H5 open ids is 0", H5.getOpenIDCount()==0);
+        System.out.print(testname.getMethodName());
+    }
+
+    @Test
+    public void testH5Dread_8bit_ints() {
+        byte[][] dset_data = new byte[DIM_X][DIM8_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU08);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_8bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_UINT8, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_8bit_ints: H5Dread: " + err);
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS08, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_8bit_ints: H5Dopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_INT8, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_8bit_ints: H5Dread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Dread_16bit_ints() {
+        short[][] dset_data = new short[DIM_X][DIM16_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU16);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_16bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_UINT16, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_16bit_ints: H5Dread: " + err);
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS16, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_16bit_ints: H5Dopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_INT16, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_16bit_ints: H5Dread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Dread_32bit_ints() {
+        int[][] dset_data = new int[DIM_X][DIM16_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU32);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_UINT32, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_ints: H5Dread: " + err);
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS32, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_ints: H5Dopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_INT32, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_ints: H5Dread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Dread_64bit_ints() {
+        long[][] dset_data = new long[DIM_X][DIM64_Y];
+
+        try {
+            openH5file(H5_INTS_FILE, DATASETU64);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_ints: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_UINT64, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_ints: H5Dread: " + err);
+        }
+
+        // End access to the dataset and release resources used by it.
+        try {
+            H5.H5Dclose(H5did);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+        }
+
+        // Open an existing dataset.
+        try {
+            H5did = H5.H5Dopen(H5fid, DATASETS64, HDF5Constants.H5P_DEFAULT);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_ints: H5Dopen: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_INT64, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_ints: H5Dread: " + err);
+        }
+    }
+
+    @Test
+    public void testH5Dread_32bit_floats() {
+        float[][] dset_data = new float[DIM_X][DIM32_Y];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF32);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_FLOAT, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_32bit_floats: H5Dread: " + err);
+        }
+        for (int i = 0; i < DIM_X; i++)
+            assertTrue("testH5Dread_32bit_floats - H5.H5Dread: ", dset_data[i][0] == (32 - i));
+    }
+
+    @Test
+    public void testH5Dread_64bit_floats() {
+        double[][] dset_data = new double[DIM_X][DIM64_Y];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF64);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_DOUBLE, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_64bit_floats: H5Dread: " + err);
+        }
+        for (int i = 0; i < DIM_X; i++)
+            assertTrue("testH5Dread_64bit_floats - H5.H5Dread: ", dset_data[i][0] == (64 - i));
+    }
+
+    @Test
+    public void testH5Dread_128bit_floats() {
+        byte[][][] dset_data = new byte[DIM_X][DIM128_Y][8];
+
+        try {
+            openH5file(H5_FLTS_FILE, DATASETF128);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Dread_128bit_floats: openH5file: " + err);
+        }
+
+        // Read data.
+        try {
+            H5.H5Dread(H5did, HDF5Constants.H5T_NATIVE_LDOUBLE, HDF5Constants.H5S_ALL, HDF5Constants.H5S_ALL,
+                        HDF5Constants.H5P_DEFAULT, dset_data);
+        }
+        catch (Exception err) {
+            err.printStackTrace();
+            fail("testH5Dread_128bit_floats: H5Dread: " + err);
+        }
+    }
+
+}
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index 3774cbd..39db296 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -90,6 +90,7 @@ $HDFTEST_HOME/testfiles/JUnit-TestH5T.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Dparams.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5D.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Dplist.txt
+$HDFTEST_HOME/testfiles/JUnit-TestH5Drw.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Lparams.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Lbasic.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Lcreate.txt
@@ -103,6 +104,7 @@ $HDFTEST_HOME/testfiles/JUnit-TestH5Pfaplhdfs.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Pvirtual.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Plist.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5A.txt
+$HDFTEST_HOME/testfiles/JUnit-TestH5Arw.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Oparams.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Obasic.txt
 $HDFTEST_HOME/testfiles/JUnit-TestH5Ocreate.txt
@@ -254,6 +256,8 @@ COPY_DATAFILES_TO_BLDDIR()
     $CP -f $TOOLS_TESTFILES/trefer_attr.h5 $BLDDIR/trefer_attr.h5
     $CP -f $TOOLS_TESTFILES/tdatareg.h5 $BLDDIR/tdatareg.h5
     $CP -f $TOOLS_TESTFILES/tattrreg.h5 $BLDDIR/tattrreg.h5
+    $CP -f $TOOLS_TESTFILES/tintsattrs.h5 $BLDDIR/tintsattrs.h5
+    $CP -f $TOOLS_TESTFILES/tfloatsattrs.h5 $BLDDIR/tfloatsattrs.h5
 }
 
 CLEAN_DATAFILES_AND_BLDDIR()
@@ -669,6 +673,27 @@ else
     test yes = "$verbose" && $DIFF JUnit-TestH5D.txt JUnit-TestH5D.out |sed 's/^/    /'
 fi
 
+echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Drw"
+TESTING JUnit-TestH5Drw
+($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Drw > JUnit-TestH5Drw.ext)
+
+# Extract file name, line number, version and thread IDs because they may be different
+sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+    -e 's/line [0-9]*/line (number)/' \
+    -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
+    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
+    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
+    JUnit-TestH5Drw.ext > JUnit-TestH5Drw.out
+
+if diff JUnit-TestH5Drw.out JUnit-TestH5Drw.txt > /dev/null; then
+    echo "  PASSED      JUnit-TestH5Drw"
+else
+    echo "**FAILED**    JUnit-TestH5Drw"
+    echo "    Expected result differs from actual result"
+    nerrors="`expr $nerrors + 1`"
+    test yes = "$verbose" && $DIFF JUnit-TestH5Drw.txt JUnit-TestH5Drw.out |sed 's/^/    /'
+fi
+
 echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Dplist"
 TESTING JUnit-TestH5Dplist
 ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Dplist > JUnit-TestH5Dplist.ext)
@@ -921,6 +946,27 @@ else
     test yes = "$verbose" && $DIFF JUnit-TestH5A.txt JUnit-TestH5A.out |sed 's/^/    /'
 fi
 
+echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Arw"
+TESTING JUnit-TestH5Arw
+($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Arw > JUnit-TestH5Arw.ext)
+
+# Extract file name, line number, version and thread IDs because they may be different
+sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+    -e 's/line [0-9]*/line (number)/' \
+    -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
+    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
+    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
+    JUnit-TestH5Arw.ext > JUnit-TestH5Arw.out
+
+if diff JUnit-TestH5Arw.out JUnit-TestH5Arw.txt > /dev/null; then
+    echo "  PASSED      JUnit-TestH5Arw"
+else
+    echo "**FAILED**    JUnit-TestH5Arw"
+    echo "    Expected result differs from actual result"
+    nerrors="`expr $nerrors + 1`"
+    test yes = "$verbose" && $DIFF JUnit-TestH5Arw.txt JUnit-TestH5Arw.out |sed 's/^/    /'
+fi
+
 echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Oparams"
 TESTING JUnit-TestH5Oparams
 ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Oparams > JUnit-TestH5Oparams.ext)
diff --git a/java/test/testfiles/JUnit-TestH5Arw.txt b/java/test/testfiles/JUnit-TestH5Arw.txt
new file mode 100644
index 0000000..49d3b1c
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5Arw.txt
@@ -0,0 +1,13 @@
+JUnit version 4.11
+.testH5Aread_128bit_floats
+.testH5Aread_64bit_floats
+.testH5Aread_8bit_ints
+.testH5Aread_32bit_ints
+.testH5Aread_64bit_ints
+.testH5Aread_32bit_floats
+.testH5Aread_16bit_ints
+
+Time:  XXXX
+
+OK (7 tests)
+
diff --git a/java/test/testfiles/JUnit-TestH5Drw.txt b/java/test/testfiles/JUnit-TestH5Drw.txt
new file mode 100644
index 0000000..6b854cf
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5Drw.txt
@@ -0,0 +1,13 @@
+JUnit version 4.11
+.testH5Dread_32bit_floats
+.testH5Dread_32bit_ints
+.testH5Dread_64bit_ints
+.testH5Dread_64bit_floats
+.testH5Dread_8bit_ints
+.testH5Dread_128bit_floats
+.testH5Dread_16bit_ints
+
+Time:  XXXX
+
+OK (7 tests)
+
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 660a198..914e9da 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,15 +47,6 @@ New Features
 
     Configuration:
     -------------
-    - Add CMake variable HDF5_LIB_INFIX
-
-      This infix is added to all library names after 'hdf5'.
-      e.g. the infix '_openmpi' results in the library name 'libhdf5_openmpi.so'
-      This name is used in packages on debian based systems.
-      (see https://packages.debian.org/jessie/amd64/libhdf5-openmpi-8/filelist)
-
-      (barcode - 2021/03/22)
-
     - Removal of pre-VS2015 work-arounds
 
       HDF5 now requires Visual Studio 2015 or greater, so old work-around
@@ -70,6 +61,15 @@ New Features
 
       (DER - 2021/03/22)
 
+    - Add CMake variable HDF5_LIB_INFIX
+
+      This infix is added to all library names after 'hdf5'.
+      e.g. the infix '_openmpi' results in the library name 'libhdf5_openmpi.so'
+      This name is used in packages on debian based systems.
+      (see https://packages.debian.org/jessie/amd64/libhdf5-openmpi-8/filelist)
+
+      (barcode - 2021/03/22)
+
     - On macOS, Universal Binaries can now be built, allowing native execution on
       both Intel and Apple Silicon (ARM) based Macs.
 
@@ -585,6 +585,17 @@ Bug Fixes since HDF5-1.12.0 release
 
     Tools
     -----
+    - Changed how h5dump and h5ls identify long double.
+
+        Long double support is not consistent across platforms. Tools will always
+        identify long double as 128-bit [little/big]-endian float nn-bit precision.
+        New test file created for datasets with attributes for float, double and
+        long double. In addition any unknown integer or float datatype will now
+        also show the number of bits for precision.
+        These files are also used in the java tests.
+
+        (ADB - 2021/03/24, HDFFV-11229)
+
     - Fixed tools argument parsing.
 
         Tools parsing used the length of the option from the long array to match
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7a62ec..c7c9aef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -989,8 +989,7 @@ set (H5_PUBLIC_GENERATED_HEADERS
 option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" ON)
 if (HDF5_GENERATE_HEADERS)
   set_source_files_properties(${H5_GENERATED_HEADERS} PROPERTIES GENERATED TRUE)
-  find_package (Perl)
-  if (PERL_FOUND)
+  if (H5_PERL_FOUND)
     execute_process (
         COMMAND ${PERL_EXECUTABLE} ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SRC_DIR}/H5err.txt OUTPUT_VARIABLE SCRIPT_OUTPUT
     )
@@ -1367,34 +1366,43 @@ endif ()
 if (DOXYGEN_FOUND)
   set (DOXYGEN_PACKAGE ${HDF5_PACKAGE})
   set (DOXYGEN_VERSION_STRING ${HDF5_VERSION_STRING})
-  set (DOXYGEN_INCLUDE_ALIASES ${HDF5_DOXYGEN_DIR}/aliases)
+  set (DOXYGEN_INCLUDE_ALIASES_PATH ${HDF5_DOXYGEN_DIR})
+  set (DOXYGEN_INCLUDE_ALIASES aliases)
+  set (DOXYGEN_VERBATIM_VARS DOXYGEN_INCLUDE_ALIASES)
   set (DOXYGEN_PROJECT_LOGO ${HDF5_DOXYGEN_DIR}/img/HDFG-logo.png)
   set (DOXYGEN_PROJECT_BRIEF "C-API Reference")
-  set (DOXYGEN_INPUT_DIRECTORY ${HDF5_SRC_DIR} ${HDF5_DOXYGEN_DIR}/dox ${HDF5_GENERATED_SOURCE_DIR}/shared)
+  set (DOXYGEN_INPUT_DIRECTORY "${HDF5_SRC_DIR} ${HDF5_DOXYGEN_DIR}/dox ${HDF5_GENERATED_SOURCE_DIR}/shared")
   set (DOXYGEN_OPTIMIZE_OUTPUT_FOR_C YES)
   set (DOXYGEN_MACRO_EXPANSION YES)
   set (DOXYGEN_OUTPUT_DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs)
 
+# This configure and custom target work together
   # Replace variables inside @@ with the current values
-  configure_file(${HDF5_DOXYGEN_DIR}/Doxyfile.in Doxyfile @ONLY)
-
-  doxygen_add_docs(hdf5lib_doc
-#      ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS} ${HDF5_DOXYGEN_DIR}/dox
-      ${DOXYGEN_INPUT_DIRECTORY}
-      ALL
-      WORKING_DIRECTORY ${HDF5_SRC_DIR}
-      COMMENT "Generating HDF5 library Source Documentation"
-  )
-  install(
+  configure_file (${HDF5_DOXYGEN_DIR}/Doxyfile.in ${HDF5_BINARY_DIR}/Doxyfile @ONLY)
+  add_custom_target (hdf5lib_doc ALL
+        COMMAND ${DOXYGEN_EXECUTABLE} ${HDF5_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${HDF5_SRC_DIR}
+        COMMENT "Generating HDF5 library Source API documentation with Doxygen"
+        VERBATIM )
+# This cmake function requires that the non-default doxyfile settings are provided with set (DOXYGEN_xxx) commands
+# In addition the doxyfile aliases @INCLUDE option is not supported and would need to be provided in a set (DOXYGEN_ALIASES) command.
+#  doxygen_add_docs (hdf5lib_doc
+##      ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS} ${HDF5_DOXYGEN_DIR}/dox
+#      ${DOXYGEN_INPUT_DIRECTORY}
+#      ALL
+#      WORKING_DIRECTORY ${HDF5_SRC_DIR}
+#      COMMENT "Generating HDF5 library Source Documentation"
+#  )
+  install (
       DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
       DESTINATION ${HDF5_INSTALL_DATA_DIR}
       COMPONENT Documents
   )
 
-  if(NOT TARGET doxygen)
-    add_custom_target(doxygen)
-  endif()
+  if (NOT TARGET doxygen)
+    add_custom_target (doxygen)
+  endif ()
 
-  add_dependencies(doxygen hdf5lib_doc)
+  add_dependencies (doxygen hdf5lib_doc)
 
 endif ()
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index dfab713..e5ad962 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -888,8 +888,7 @@ if (ENABLE_EXTENDED_TESTS)
 
 #-- Adding test for flushrefresh
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/flushrefresh_test")
-  find_package (Perl)
-  if (PERL_FOUND)
+  if (H5_PERL_FOUND)
     add_test (
         NAME H5TEST-testflushrefresh-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove flushrefresh.h5
diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake
index 4676184..4d23de3 100644
--- a/test/ShellTests.cmake
+++ b/test/ShellTests.cmake
@@ -23,8 +23,7 @@ if (UNIX)
     ##############################################################################
     #  configure scripts to test dir
     ##############################################################################
-    find_package (Perl)
-    if (PERL_FOUND)
+    if (H5_PERL_FOUND)
       configure_file(${HDF5_TEST_SOURCE_DIR}/testflushrefresh.sh.in ${HDF5_TEST_BINARY_DIR}/H5TEST/testflushrefresh.sh @ONLY)
     endif ()
     configure_file(${HDF5_TEST_SOURCE_DIR}/test_usecases.sh.in ${HDF5_TEST_BINARY_DIR}/H5TEST/test_usecases.sh @ONLY)
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 77b6a5e..56ed155 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -3391,7 +3391,6 @@ print_pos(diff_opt_t *opts, hsize_t idx, size_t u)
                     H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - c:%ld b:%ld s:%ld", j,
                                   curr_pos, curr_idx, cnt_idx, blk_idx, str_idx);
                     dim_size = opts->dims[j]; /* Current dimension size */
-                    /* elmnt_cnt *= dim_size;    /* Total number of elements in dimension */
                     H5TOOLS_DEBUG("... sset loop:%d with elmnt_cnt:%ld - (prev_dim_size:%ld - dim_size:%ld) "
                                   "- str_cnt:%ld",
                                   j, elmnt_cnt, prev_dim_size, dim_size, str_cnt);
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index b195f92..42ad462 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2197,9 +2197,10 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
                 else
                     sign_s = " unknown-sign";
 
-                /* print size, order, and sign  */
-                h5tools_str_append(buffer, "%lu-bit%s%s integer", (unsigned long)(8 * H5Tget_size(type)),
-                                   order_s, sign_s);
+                /* print size, order, sign, and precision */
+                h5tools_str_append(buffer, "%lu-bit%s%s integer %lu-bit precision",
+                                   (unsigned long)(8 * H5Tget_size(type)), order_s, sign_s,
+                                   H5Tget_precision(type));
             }
             break;
 
@@ -2220,12 +2221,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
                 h5tools_str_append(buffer, "H5T_NATIVE_FLOAT");
             else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE)
                 h5tools_str_append(buffer, "H5T_NATIVE_DOUBLE");
-#if H5_SIZEOF_LONG_DOUBLE != 0
-            else if (H5Tequal(type, H5T_NATIVE_LDOUBLE) == TRUE)
-                h5tools_str_append(buffer, "H5T_NATIVE_LDOUBLE");
-#endif
             else {
-
+                /* print what the library knows */
                 /* byte order */
                 if (H5Tget_size(type) > 1) {
                     order = H5Tget_order(type);
@@ -2241,9 +2238,9 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
                 else
                     order_s = "";
 
-                /* print size and byte order */
-                h5tools_str_append(buffer, "%lu-bit%s floating-point", (unsigned long)(8 * H5Tget_size(type)),
-                                   order_s);
+                /* print size. byte order, and precision */
+                h5tools_str_append(buffer, "%lu-bit%s floating-point %lu-bit precision",
+                                   (unsigned long)(8 * H5Tget_size(type)), order_s, H5Tget_precision(type));
             }
             break;
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 4311e0b..e4c0bdc 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -714,6 +714,15 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     h5tools_str_append(str, "%Lg", templdouble);
 #endif
                 }
+                else {
+                    size_t i;
+
+                    for (i = 0; i < nsize; i++) {
+                        if (i)
+                            h5tools_str_append(str, ":");
+                        h5tools_str_append(str, OPT(info->fmt_raw, "%02x"), ucp_vp[i]);
+                    }
+                }
                 break;
 
             case H5T_STRING: {
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 456be8a..97fb870 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -428,11 +428,6 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
         else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) {
             h5tools_str_append(buffer, "native double");
         }
-#if H5_SIZEOF_LONG_DOUBLE != 0
-        else if (H5Tequal(type, H5T_NATIVE_LDOUBLE) == TRUE) {
-            h5tools_str_append(buffer, "native long double");
-        }
-#endif
         else if (H5Tequal(type, H5T_NATIVE_INT8) == TRUE) {
             h5tools_str_append(buffer, "native int8_t");
         }
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 1e6ccb2..a8984de 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake

path: root/doc/src/diagrams/modelview-begin-append-rows.sk

##Sketch 1 2
document()
layout('A4',0)
layer('Layer 1',1,1,0,0,(0,0,0))
fp((1,1,1))
lw(1)
r(30,0,0,-30,335,605)
fp((1,1,1))
lw(1)
r(30,0,0,-30,335,635)
fp((1,1,1))
lw(1)
r(30,0,0,-30,220,665)
fp((1,1,1))
lw(1)
r(30,0,0,-30,335,665)
fp((1,1,1))
lw(1)
r(30,0,0,-30,220,605)
fp((1,1,1))
lw(1)
r(30,0,0,-30,220,635)
fp((1,1,1))
lw(1)
r(30,0,0,-30,220,695)
fp((1,1,1))
lw(1)
r(30,0,0,-30,335,695)
le()
lw(1)
r(165,0,0,-200,210,705)
fp((0.753,0.753,1))
lw(1)
r(30,0,0,-30,277.5,575)
fp((0.753,0.753,1))
lw(1)
r(30,0,0,-30,335,575)
fp((0.753,0.753,1))
lw(1)
r(30,0,0,-30,277.5,545)
fp((0.753,0.753,1))
lw(1)
r(30,0,0,-30,335,545)
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('0',(229.44,673.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('0',(344.44,673.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('1',(229.44,643.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('1',(344.44,643.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('2',(229.44,613.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('2',(344.44,613.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('3',(229.44,583.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('3',(344.44,583.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('4',(286.94,553.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('4',(344.44,553.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('5',(286.94,523.14))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(20)
txt('5',(344.44,523.14))
lw(1.5)
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(275,575,0)
bs(255,575,0)
guidelayer('Guide Lines',1,0,0,1,(0,0,1))
grid((0,0,2.5,2.5),1,(0,0,1),'Grid')