v1.80

ERDDAP · Aug 7, 2017 · c0a0360 · c0a0360
1 parent e34fa3b
commit c0a0360
Show file tree

Hide file tree

Showing 111 changed files with 6,538 additions and 1,917 deletions.
diff --git a/WEB-INF/ArchiveADataset.bat b/WEB-INF/ArchiveADataset.bat
@@ -1,4 +1,4 @@
 rem This is the Windows batch file to run ArchiveADataset.
 rem See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-java -cp ./classes;../../../lib/servlet-api.jar;lib/activation.jar;lib/axis.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/commons-discovery.jar;lib/itext-1.3.1.jar;lib/jaxrpc.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/wsdl4j.jar;lib/aws-java-sdk.jar;lib/commons-codec.jar;lib/commons-logging.jar;lib/fluent-hc.jar;lib/httpclient.jar;lib/httpclient-cache.jar;lib/httpcore.jar;lib/httpmime.jar;lib/jna.jar;lib/jna-platform.jar;lib/jackson-annotations.jar;lib/jackson-core.jar;lib/jackson-databind.jar  -Xms1500M -Xmx1500M  gov.noaa.pfel.erddap.ArchiveADataset %*
+java -cp ./classes;../../../lib/servlet-api.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/itext-1.3.1.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar -Xms1500M -Xmx1500M  gov.noaa.pfel.erddap.ArchiveADataset %*
diff --git a/WEB-INF/ArchiveADataset.sh b/WEB-INF/ArchiveADataset.sh
@@ -2,16 +2,10 @@
 # This is the Unix/Linux shell script to run ArchiveADataset.
 # See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-cp1="./classes:../../../lib/servlet-api.jar:lib/activation.jar:lib/axis.jar"
-cp2=":lib/cassandra-driver-core.jar:lib/netty-all.jar:lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
-cp3=":lib/commons-compress.jar:lib/commons-discovery.jar:lib/itext-1.3.1.jar"
-cp4=":lib/jaxrpc.jar:lib/lucene-core.jar"
-cp5=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
-cp6=":lib/saaj.jar:lib/wsdl4j.jar"
-cp7=":lib/aws-java-sdk.jar:lib/commons-codec.jar:lib/commons-logging.jar"
-cp8=":lib/fluent-hc.jar:lib/httpclient.jar:lib/httpclient-cache.jar:lib/httpcore.jar"
-cp9=":lib/httpmime.jar:lib/jna.jar:lib/jna-platform.jar:lib/jackson-annotations.jar"
-cp10=":lib/jackson-core.jar:lib/jackson-databind.jar"
-cp0="$cp1$cp2$cp3$cp4$cp5$cp6$cp7$cp8$cp9$cp10"
+cp1="./classes:../../../lib/servlet-api.jar:lib/cassandra-driver-core.jar:lib/netty-all.jar"
+cp2=":lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
+cp3=":lib/commons-compress.jar:lib/itext-1.3.1.jar:lib/lucene-core.jar"
+cp4=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
+cp0="$cp1$cp2$cp3$cp4"
 
 java -cp $cp0 -Xms1500M -Xmx1500M gov.noaa.pfel.erddap.ArchiveADataset "$@"
diff --git a/WEB-INF/DasDds.bat b/WEB-INF/DasDds.bat
@@ -1,4 +1,4 @@
 rem This is the Windows batch file to run DasDds.
 rem See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-java -cp ./classes;../../../lib/servlet-api.jar;lib/activation.jar;lib/axis.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/commons-discovery.jar;lib/itext-1.3.1.jar;lib/jaxrpc.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/wsdl4j.jar;lib/aws-java-sdk.jar;lib/commons-codec.jar;lib/commons-logging.jar;lib/fluent-hc.jar;lib/httpclient.jar;lib/httpclient-cache.jar;lib/httpcore.jar;lib/httpmime.jar;lib/jna.jar;lib/jna-platform.jar;lib/jackson-annotations.jar;lib/jackson-core.jar;lib/jackson-databind.jar  -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.DasDds %*
+java -cp ./classes;../../../lib/servlet-api.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/itext-1.3.1.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar  -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.DasDds %*
diff --git a/WEB-INF/DasDds.sh b/WEB-INF/DasDds.sh
@@ -2,16 +2,10 @@
 # This is the Unix/Linux shell script to run DasDds.
 # See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-cp1="./classes:../../../lib/servlet-api.jar:lib/activation.jar:lib/axis.jar"
-cp2=":lib/cassandra-driver-core.jar:lib/netty-all.jar:lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
-cp3=":lib/commons-compress.jar:lib/commons-discovery.jar:lib/itext-1.3.1.jar"
-cp4=":lib/jaxrpc.jar:lib/lucene-core.jar"
-cp5=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
-cp6=":lib/saaj.jar:lib/wsdl4j.jar"
-cp7=":lib/aws-java-sdk.jar:lib/commons-codec.jar:lib/commons-logging.jar"
-cp8=":lib/fluent-hc.jar:lib/httpclient.jar:lib/httpclient-cache.jar:lib/httpcore.jar"
-cp9=":lib/httpmime.jar:lib/jna.jar:lib/jna-platform.jar:lib/jackson-annotations.jar"
-cp10=":lib/jackson-core.jar:lib/jackson-databind.jar"
-cp0="$cp1$cp2$cp3$cp4$cp5$cp6$cp7$cp8$cp9$cp10"
+cp1="./classes:../../../lib/servlet-api.jar:lib/cassandra-driver-core.jar:lib/netty-all.jar"
+cp2=":lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
+cp3=":lib/commons-compress.jar:lib/itext-1.3.1.jar:lib/lucene-core.jar"
+cp4=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
+cp0="$cp1$cp2$cp3$cp4"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.erddap.DasDds "$@"
diff --git a/WEB-INF/GenerateDatasetsXml.bat b/WEB-INF/GenerateDatasetsXml.bat
@@ -1,4 +1,4 @@
 rem This is the Windows batch file to run GenerateDatasetsXml.
 rem See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-java -cp ./classes;../../../lib/servlet-api.jar;lib/activation.jar;lib/axis.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/commons-discovery.jar;lib/itext-1.3.1.jar;lib/jaxrpc.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/wsdl4j.jar;lib/aws-java-sdk.jar;lib/commons-codec.jar;lib/commons-logging.jar;lib/fluent-hc.jar;lib/httpclient.jar;lib/httpclient-cache.jar;lib/httpcore.jar;lib/httpmime.jar;lib/jna.jar;lib/jna-platform.jar;lib/jackson-annotations.jar;lib/jackson-core.jar;lib/jackson-databind.jar  -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.GenerateDatasetsXml %*
+java -cp ./classes;../../../lib/servlet-api.jar;lib/cassandra-driver-core.jar;lib/netty-all.jar;lib/guava.jar;lib/metrics-core.jar;lib/lz4.jar;lib/snappy-java.jar;lib/commons-compress.jar;lib/itext-1.3.1.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/postgresql.jdbc.jar -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.GenerateDatasetsXml %*
diff --git a/WEB-INF/GenerateDatasetsXml.sh b/WEB-INF/GenerateDatasetsXml.sh
@@ -2,16 +2,10 @@
 # This is the Unix/Linux shell script to run GenerateDatasetsXml.
 # See http://coastwatch.pfeg.noaa.gov/erddap/download/setupDatasetsXml.html#Tools
 
-cp1="./classes:../../../lib/servlet-api.jar:lib/activation.jar:lib/axis.jar"
-cp2=":lib/cassandra-driver-core.jar:lib/netty-all.jar:lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
-cp3=":lib/commons-compress.jar:lib/commons-discovery.jar:lib/itext-1.3.1.jar"
-cp4=":lib/jaxrpc.jar:lib/lucene-core.jar"
-cp5=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
-cp6=":lib/saaj.jar:lib/wsdl4j.jar"
-cp7=":lib/aws-java-sdk.jar:lib/commons-codec.jar:lib/commons-logging.jar"
-cp8=":lib/fluent-hc.jar:lib/httpclient.jar:lib/httpclient-cache.jar:lib/httpcore.jar"
-cp9=":lib/httpmime.jar:lib/jna.jar:lib/jna-platform.jar:lib/jackson-annotations.jar"
-cp10=":lib/jackson-core.jar:lib/jackson-databind.jar"
-cp0="$cp1$cp2$cp3$cp4$cp5$cp6$cp7$cp8$cp9$cp10"
+cp1="./classes:../../../lib/servlet-api.jar:lib/cassandra-driver-core.jar:lib/netty-all.jar"
+cp2=":lib/guava.jar:lib/metrics-core.jar:lib/lz4.jar:lib/snappy-java.jar"
+cp3=":lib/commons-compress.jar:lib/itext-1.3.1.jar:lib/lucene-core.jar"
+cp4=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/postgresql.jdbc.jar"
+cp0="$cp1$cp2$cp3$cp4"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.erddap.GenerateDatasetsXml "$@"
diff --git a/WEB-INF/GenerateOtterThreddsXml.sh b/WEB-INF/GenerateOtterThreddsXml.sh
@@ -44,7 +44,7 @@ dataSubDir=satellite/
 incomplete=/opt/tomcat1/content/thredds/GeneratedXml/incompleteMainCatalog.xml 
 xmlMainDir=/opt/tomcat1/content/thredds/GeneratedXml
 
-java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/activation.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml $dataMainDir $dataSubDir $incomplete $xmlMainDir
+java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml $dataMainDir $dataSubDir $incomplete $xmlMainDir
 
 
 # finished 
diff --git a/WEB-INF/GenerateThredds1ThreddsXml.sh b/WEB-INF/GenerateThredds1ThreddsXml.sh
@@ -44,7 +44,7 @@ dataSubDir=satellite/
 incomplete=/usr/local/tomcat/content/thredds/GeneratedXml/incompleteMainCatalog.xml 
 xmlMainDir=/usr/local/tomcat/content/thredds/GeneratedXml
 
-java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/activation.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml $dataMainDir $dataSubDir $incomplete $xmlMainDir
+java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml $dataMainDir $dataSubDir $incomplete $xmlMainDir
 
 
 # finished 
diff --git a/WEB-INF/GenerateThreddsXml.sh b/WEB-INF/GenerateThreddsXml.sh
@@ -43,6 +43,6 @@
 
 commandLine=$0
 thisDir=`echo $commandLine | dirname $0`
-java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/activation.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml "$@"
+java -cp classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/lucene-core.jar:lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GenerateThreddsXml "$@"
 
 # finished 
diff --git a/WEB-INF/GridSaveAs.bat b/WEB-INF/GridSaveAs.bat
@@ -16,4 +16,4 @@ rem CoastWatch/Bob Simons  [email protected]
 rem
 
 set thisDir=%~dp0
-java -cp %thisDir%/classes;%thisDir%/lib/netcdfAll-latest.jar;lib/slf4j.jar;%thisDir%/lib/activation.jar;%thisDir%/lib/lucene-core.jar;%thisDir%/lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GridSaveAs %*
+java -cp %thisDir%/classes;%thisDir%/lib/netcdfAll-latest.jar;lib/slf4j.jar;%thisDir%/lib/lucene-core.jar;%thisDir%/lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GridSaveAs %*
diff --git a/WEB-INF/GridSaveAs.sh b/WEB-INF/GridSaveAs.sh
@@ -20,7 +20,7 @@
 commandLine=$0
 tDir=`echo $commandLine | dirname $0`
 cp1="classes:lib/netcdfAll-latest.jar:lib/slf4j.jar"
-cp2=":lib/activation.jar:lib/lucene-core.jar:lib/mail.jar"
+cp2=":lib/lucene-core.jar:lib/mail.jar"
 cp0="$cp1$cp2"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.griddata.GridSaveAs "$@"

diff --git a/WEB-INF/MapViewer.bat b/WEB-INF/MapViewer.bat
@@ -16,7 +16,7 @@ rem CoastWatch/Bob Simons  [email protected]
 rem
 
 set thisDir=%~dp0
-java -cp classes;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/itext-1.3.1.jar;lib/activation.jar;lib/activation.jar;lib/lucene-core.jar;lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.sgt.SgtMap %*
+java -cp classes;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/itext-1.3.1.jar;lib/lucene-core.jar;lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.sgt.SgtMap %*
 
 rem finished 
 
diff --git a/WEB-INF/MapViewer.sh b/WEB-INF/MapViewer.sh
@@ -18,7 +18,7 @@
 commandLine=$0
 tDir=`echo $commandLine | dirname $0`
 cp1="classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:"
-cp2="lib/itext-1.3.1.jar:lib/activation.jar:lib/lucene-core.jar:lib/mail.jar"
+cp2="lib/itext-1.3.1.jar:lib/lucene-core.jar:lib/mail.jar"
 cp0="$cp1$cp2"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.sgt.SgtMap "$@"

diff --git a/WEB-INF/NetCheck.bat b/WEB-INF/NetCheck.bat
@@ -4,4 +4,4 @@ rem Then run this from an MS-DOS Prompt (command line) window.
 # Use "NetCheck -testMode" to just send emails to the NetCheck administrator.
 
 set thisDir=%~dp0
-java -cp .;classes;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/activation.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.netcheck.NetCheck NetCheck.xml %*
+java -cp .;classes;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/slf4j.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.netcheck.NetCheck NetCheck.xml %*
diff --git a/WEB-INF/NetCheck.sh b/WEB-INF/NetCheck.sh
@@ -8,7 +8,7 @@
 commandLine=$0
 tDir=`echo $commandLine | dirname $0`
 cp1="classes:lib/lucene-core.jar:lib/mail.jar:"
-cp2="lib/netcdfAll-latest.jar:lib/slf4j.jar:lib/activation.jar"
+cp2="lib/netcdfAll-latest.jar:lib/slf4j.jar"
 cp0="$cp1$cp2"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.netcheck.NetCheck NetCheck.xml "$@"
diff --git a/WEB-INF/ValidateDataSetProperties.bat b/WEB-INF/ValidateDataSetProperties.bat
@@ -12,4 +12,4 @@ rem NOAA/Bob Simons  [email protected]
 rem
 
 set thisDir=%~dp0
-java -cp classes;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/activation.jar;lib/lucene-core.jar;lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.ValidateDataSetProperties
+java -cp classes;lib/netcdfAll-latest.jar;lib/slf4j.jar;lib/lucene-core.jar;lib/mail.jar -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.ValidateDataSetProperties
diff --git a/WEB-INF/ValidateDataSetProperties.sh b/WEB-INF/ValidateDataSetProperties.sh
@@ -16,7 +16,7 @@
 commandLine=$0
 tDir=`echo $commandLine | dirname $0`
 cp1="classes:lib/netcdfAll-latest.jar:lib/slf4j.jar:"
-cp2="lib/activation.jar:lib/lucene-core.jar:lib/mail.jar"
+cp2="lib/lucene-core.jar:lib/mail.jar"
 cp0="$cp1$cp2"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.coastwatch.ValidateDataSetProperties