From e603c109649f8443a7f1d47451e01030a058f136 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:11:10 -0700 Subject: [PATCH 1/3] Update links to netCDF-java documentation. --- README.md | 2 +- docs/static-pages/software.html | 20 +++++++++++--------- docs/tutorial.dox | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6b54414e3..0e5ac1919 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ software for various languages: * [C library and utilities](http://github.com/Unidata/netcdf-c) * [Fortran](http://github.com/Unidata/netcdf-fortran) -* [Java](http://www.unidata.ucar.edu/downloads/netcdf/netcdf-java-4/) +* [Java](https://www.unidata.ucar.edu/downloads/netcdf-java/ * [Python](http://github.com/Unidata/netcdf4-python) * [C++](http://github.com/Unidata/netcdf-cxx4) diff --git a/docs/static-pages/software.html b/docs/static-pages/software.html index 6b9f2f2e0..625e31895 100644 --- a/docs/static-pages/software.html +++ b/docs/static-pages/software.html @@ -1212,7 +1212,7 @@ or using ECMWF reanalysis on a reduced grid
  • Support for non-gridded data through the Common Data Model (CDM) + href="https://docs.unidata.ucar.edu/netcdf-java/current/userguide/common_data_model_overview.html">Common Data Model (CDM)
  • The IDV uses the Java interface

    The NetCDF-Java 4.2 Library is a Java interface to netCDF files, + >NetCDF-Java Library is a Java interface to netCDF files, as well as to many other types of scientific data formats. It is freely available and the source code is released under the - (MIT-style) netCDF C library license. Previous versions use the GNU - Lesser General Public License (LGPL). + BSD-3 license. Previous versions used the (MIT-style) netCDF C + library license, and prior to that, the GNU Lesser General + Public License (LGPL).

    The library implements a Common Data Model (CDM), a generalization + href="https://docs.unidata.ucar.edu/netcdf-java/current/userguide/common_data_model_overview.html" >CDM), a generalization of the netCDF, OpenDAP and HDF5 data models. The library is a prototype for the netCDF-4 project, which provides a C language API for the "data access layer" of the CDM, on top of the HDF5 file format. The NetCDF-Java library is a 100% Java framework for reading netCDF and other file formats into the CDM, as well as writing to the - netCDF-3 file format. + netCDF-3 file format. Write support for the netCDF-4 is provided by + native calls to the netCDF-C library. The library also implements NcML, + href="https://docs.unidata.ucar.edu/netcdf-java/current/userguide/ncml_overview.html">NcML, which allows you to add metadata to CDM datasets, as well as to create virtual datasets through aggregation.

    @@ -1913,7 +1915,7 @@ or using ECMWF reanalysis on a reduced grid nctoolbox is a MATLAB interface that provides read-only access to Common Data Model + href="https://docs.unidata.ucar.edu/netcdf-java/current/userguide/common_data_model_overview.html" >Common Data Model datasets. Under the hood, nctoolbox uses Unidata's NetCDF-Java as the data access layer. This allows nctoolbox to access to netCDF, OPeNDAP, HDF5, GRIB, GRIB2, HDF4, @@ -2964,7 +2966,7 @@ or using ECMWF reanalysis on a reduced grid

    xray adopts the Common Data Model for self-describing scientific data in widespread use in the Earth sciences (e.g., netCDF and OPeNDAP): xray.Dataset is an in-memory representation of a netCDF file. diff --git a/docs/tutorial.dox b/docs/tutorial.dox index 2d342765b..43d74f811 100644 --- a/docs/tutorial.dox +++ b/docs/tutorial.dox @@ -116,7 +116,7 @@ support-netcdf@unidata.ucar.edu. Unidata supports netCDF APIs in C, C++, Fortran 77, Fortran 90, and Java. -The netCDF +The netCDF Java API is a complete implementation of netCDF in Java. It is distributed independently of the other APIs. If you are writing web server software, you should certainly be doing so in Java. @@ -169,7 +169,7 @@ C, C++, Fortran 77, Fortran 90, and Java APIs: - C++ - The NetCDF C++ Interface Guide. - Fortran 77 - The NetCDF Fortran 77 Interface Guide. - Fortran 90 - The NetCDF Fortran 90 Interface Guide. -- Java The netCDF-Java Users Guide. +- Java - The netCDF-Java User Guide. Man pages for the C, F77, and F90 interfaces, and ncgen and ncdump, are available on the documentation page of the netCDF web site From aefadcc6a58bac2ad6281c5416be5127f788c8c6 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:11:33 -0700 Subject: [PATCH 2/3] Update links Update links to netCDF-java and TDS documentation, as well as various netCDF related issue trackers. --- docs/FAQ.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index 4565de73e..4bdc919ba 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -1655,8 +1655,8 @@ experimental version is available now in the snapshot distributions. Other clients and servers support access through a netCDF interface to netCDF and other kinds of data, including clients written using the -[netCDF-Java library](http://www.unidata.ucar.edu/software/netcdf-java/) and servers that use the -[THREDDS Data Server](/software/thredds/current/tds/TDS.html). +[netCDF-Java library](https://www.unidata.ucar.edu/software/netcdf-java/) and servers that use the +[THREDDS Data Server](https://www.unidata.ucar.edu/software/tds/). The [GrADS Data Server](http://grads.iges.org/grads/gds/) provides subsetting and analysis services across the Internet for any @@ -1677,7 +1677,7 @@ Several programs and packages have been developed that convert between [GDAL](http://www.gdal.org/), [GrADS](software.html#GrADS), and [wgrib2](http://www.cpc.noaa.gov/products/wesley/wgrib2/). -The Unidata [netCDF Java Library](http://www.unidata.ucar.edu/software/netcdf-java/index.html) can +The Unidata [netCDF Java Library](https://www.unidata.ucar.edu/software/netcdf-java/) can read GRIB1 and GRIB2 data (and many other data formats) through a netCDF interface. As a command-line example, you could convert *fileIn.grib* to *fileOut.nc* as follows: @@ -1987,8 +1987,6 @@ What other future work on netCDF is planned? {#What-other-future-work-on-netCDF- Issues, bugs, and plans for netCDF are maintained in the Unidata issue tracker sites for -[netCDF-C](https://www.unidata.ucar.edu/jira/browse/NCF), [Common Data Model / NetCDF-Java](https://www.unidata.ucar.edu/jira/browse/CDM), -[netCDF-Fortran](https://www.unidata.ucar.edu/jira/browse/NCFORTRAN), -and [netCDF-CXX4](https://www.unidata.ucar.edu/jira/browse/NCXXF), and -[old netCDF-C++ -(deprecated)](https://www.unidata.ucar.edu/jira/browse/NCCPP). +[netCDF-C](https://github.com/Unidata/netcdf-c/issues), [Common Data Model / NetCDF-Java](https://github.com/Unidata/netcdf-java/issues), +[netCDF-Fortran](https://github.com/Unidata/netcdf-fortran/issues), +and [netCDF-CXX4](https://github.com/Unidata/netcdf-cxx4/issues), and From cd91418dca3d646e17d81657825ad24fcfd982ba Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:12:08 -0700 Subject: [PATCH 3/3] Update d4ts.war and dts.war build instructions Caught this one by accident as I was looking for links that needed to be updated. Figured I might as well knock it out while I was there. --- docs/testserver.dox | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/testserver.dox b/docs/testserver.dox index 5c1341a1c..071c9868d 100755 --- a/docs/testserver.dox +++ b/docs/testserver.dox @@ -13,7 +13,7 @@ The test suite for the DAP2 and DAP4 (aka DAP) protocols optionally uses a continuously running test server to verify that the DAP protocols can successfully be used against a remote server such -as a Unidata Thredds server or a OPeNDAP Hyrax server. +as a Unidata THREDDS Data Server or a OPeNDAP Hyrax server. The way that this is tests is to establish two servlets running under a Tomcat server on some machine with a known IP address @@ -156,9 +156,9 @@ to verify that the d4ts test server is working. # Building d4ts.war and dts.war {#remotesvc_buildservlets} In order to build the servlet (.war) files, you will need to -clone the Thredds directory on github: https://github.com/Unidata/thredds. +clone the Thredds directory on github: https://github.com/Unidata/tds. -Once you have a clone, you will need to enter the thredds directory +Once you have a clone, you will need to enter the tds directory and build by invoking gradle using this command. ```` ./gradlew --info --no-daemon clean assemble