v1.64

ERDDAP · Aug 21, 2015 · c0c3db0 · c0c3db0
1 parent 7f3d274
commit c0c3db0
Show file tree

Hide file tree

Showing 92 changed files with 7,896 additions and 1,701 deletions.
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/joda-time.jar;lib/joid.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/tsik.jar;lib/wsdl4j.jar  -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.DasDds %1 %2 %3 %4 %5 %6 %7 %8 %9
+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/joda-time.jar;lib/joid.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/tsik.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 %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/WEB-INF/DasDds.sh b/WEB-INF/DasDds.sh
@@ -8,6 +8,10 @@ cp3=":lib/commons-compress.jar:lib/commons-discovery.jar:lib/itext-1.3.1.jar"
 cp4=":lib/jaxrpc.jar:lib/joda-time.jar:lib/joid.jar:lib/lucene-core.jar"
 cp5=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/postgresql.jdbc.jar"
 cp6=":lib/saaj.jar:lib/tsik.jar:lib/wsdl4j.jar"
-cp0="$cp1$cp2$cp3$cp4$cp5$cp6"
+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"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.erddap.DasDds $1 $2 $3 $4 $5 $6 $7 $8 $9
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/joda-time.jar;lib/joid.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/tsik.jar;lib/wsdl4j.jar  -Xms1000M -Xmx1000M  gov.noaa.pfel.erddap.GenerateDatasetsXml %1 %2 %3 %4 %5 %6 %7 %8 %9
+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/joda-time.jar;lib/joid.jar;lib/lucene-core.jar;lib/mail.jar;lib/netcdfAll-latest.jar;lib/postgresql.jdbc.jar;lib/saaj.jar;lib/tsik.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 %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/WEB-INF/GenerateDatasetsXml.sh b/WEB-INF/GenerateDatasetsXml.sh
@@ -8,6 +8,10 @@ cp3=":lib/commons-compress.jar:lib/commons-discovery.jar:lib/itext-1.3.1.jar"
 cp4=":lib/jaxrpc.jar:lib/joda-time.jar:lib/joid.jar:lib/lucene-core.jar"
 cp5=":lib/mail.jar:lib/netcdfAll-latest.jar:lib/postgresql.jdbc.jar"
 cp6=":lib/saaj.jar:lib/tsik.jar:lib/wsdl4j.jar"
-cp0="$cp1$cp2$cp3$cp4$cp5$cp6"
+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"
 
 java -cp $cp0 -Xms1000M -Xmx1000M gov.noaa.pfel.erddap.GenerateDatasetsXml $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/WEB-INF/classes/com/cohort/array/Attributes.java b/WEB-INF/classes/com/cohort/array/Attributes.java
@@ -117,7 +117,7 @@ public String[] getNames() {
      * A convenience method which returns the first element of the attribute's 
      * value PrimitiveArray as a String, regardless of the type used to store it.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the String attribute or null if trouble (e.g., not found)
      */
     public String getString(String name) {
@@ -135,7 +135,7 @@ public String getString(String name) {
      * A convenience method which assumes the first element of the attribute's 
      * value PrimitiveArray is a CSV String and which splits the string into parts.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return a String[] or null if trouble (e.g., not found)
      */
     public String[] getStringsFromCSV(String name) {
@@ -154,7 +154,7 @@ public String[] getStringsFromCSV(String name) {
      * A convenience method which returns the first element of the attribute's 
      * value PrimitiveArray as a double, regardless of the type used to store it.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the attribute as a double or Double.NaN if trouble (e.g., not found)
      */
     public double getDouble(String name) {
@@ -173,7 +173,7 @@ public double getDouble(String name) {
      * value PrimitiveArray as a double, regardless of the type used to store it.
      * If the type was float, this returns Math2.floatToDouble(value).
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the attribute as a nice double or Double.NaN if trouble (e.g., not found)
      */
     public double getNiceDouble(String name) {
@@ -191,7 +191,7 @@ public double getNiceDouble(String name) {
      * A convenience method which returns the first element of the attribute's 
      * value PrimitiveArray as a float, regardless of the type used to store it.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the attribute as a float or Float.NaN if trouble (e.g., not found)
      */
     public float getFloat(String name) {
@@ -209,7 +209,7 @@ public float getFloat(String name) {
      * A convenience method which returns the first element of the attribute's 
      * value PrimitiveArray as a long, regardless of the type used to store it.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the attribute as a long or Long.MAX_VALUE if trouble (e.g., not found)
      */
     public long getLong(String name) {
@@ -227,7 +227,7 @@ public long getLong(String name) {
      * A convenience method which returns the first element of the attribute's 
      * value PrimitiveArray as an int, regardless of the type used to store it.
      *
-     * @param name
+     * @param name the name of an attribute
      * @return the attribute as an int or Integer.MAX_VALUE if trouble (e.g., not found)
      */
     public int getInt(String name) {

diff --git a/WEB-INF/classes/com/cohort/array/ByteArray.java b/WEB-INF/classes/com/cohort/array/ByteArray.java
@@ -60,7 +60,6 @@ public ByteArray(PrimitiveArray primitiveArray) {
      * @param capacity creates an ByteArray with the specified initial capacity.
      * @param active if true, size will be set to capacity and all elements 
      *    will equal 0; else size = 0.
-     * @throws Exception if trouble.
      */
     public ByteArray(int capacity, boolean active) {
         Math2.ensureMemoryAvailable(1L * capacity, "ByteArray");
@@ -85,7 +84,6 @@ public ByteArray(byte[] anArray) {
      *
      * @param first the value of the first element.
      * @param last the value of the last element (inclusive!).
-     * @throws Exception if trouble.
      */
     public ByteArray(int first, int last) {
         size = last - first + 1;
@@ -414,7 +412,6 @@ public void setFromPA(int index, PrimitiveArray otherPA, int otherIndex) {
      * This removes the specified element.
      *
      * @param index the element to be removed, 0 ... size-1
-     * @throws Exception if trouble.
      */
     public void remove(int index) {
         if (index >= size)
@@ -431,7 +428,6 @@ public void remove(int index) {
      *
      * @param from the first element to be removed, 0 ... size
      * @param to one after the last element to be removed, from ... size
-     * @throws Exception if trouble.
      */
     public void removeRange(int from, int to) {
         if (to > size)
@@ -456,7 +452,6 @@ public void removeRange(int from, int to) {
      * @param first  the first to be move
      * @param last  (exclusive)
      * @param destination the destination, can't be in the range 'first+1..last-1'.
-     * @throws Exception if trouble
      */
     public void move(int first, int last, int destination) {
         String errorIn = String2.ERROR + " in ByteArray.move:\n";
@@ -602,7 +597,6 @@ public String[] toStringArray() {
      * This gets a specified element.
      *
      * @param index 0 ... size-1
-     * @throws Exception if trouble.
      */
     public byte get(int index) {
         if (index >= size)
@@ -616,7 +610,6 @@ public byte get(int index) {
      *
      * @param index 0 ... size-1
      * @param value the value for that element
-     * @throws Exception if trouble.
      */
     public void set(int index, byte value) {
         if (index >= size)
@@ -632,7 +625,6 @@ public void set(int index, byte value) {
      * @param index the index number 0 ... size-1
      * @return the value as an int. 
      *   Byte.MAX_VALUE is returned as Integer.MAX_VALUE.
-     * @throws Exception if trouble.
      */
     public int getInt(int index) {
         int i = get(index);
@@ -645,7 +637,6 @@ public int getInt(int index) {
      * @param index the index number 0 .. size-1
      * @param i the value. For numeric PrimitiveArray's, it is narrowed 
      *   if needed by methods like Math2.narrowToByte(i).
-     * @throws Exception if trouble.
      */
     public void setInt(int index, int i) {
         set(index, Math2.narrowToByte(i));
@@ -657,7 +648,6 @@ public void setInt(int index, int i) {
      * @param index the index number 0 ... size-1
      * @return the value as a long. 
      *   Byte.MAX_VALUE is returned as Long.MAX_VALUE.
-     * @throws Exception if trouble.
      */
     public long getLong(int index) {
         int i = get(index);
@@ -670,7 +660,6 @@ public long getLong(int index) {
      * @param index the index number 0 .. size-1
      * @param i the value. For numeric PrimitiveArray's, it is narrowed 
      *   if needed by methods like Math2.narrowToByte(long).
-     * @throws Exception if trouble.
      */
     public void setLong(int index, long i) {
         set(index, Math2.narrowToByte(i));
@@ -683,7 +672,6 @@ public void setLong(int index, long i) {
      * @return the value as a float. String values are parsed
      *   with String2.parseFloat and so may return Float.NaN.
      *   Byte.MAX_VALUE is returned as Float.NaN.
-     * @throws Exception if trouble.
      */
     public float getFloat(int index) {
         byte b = get(index);
@@ -696,7 +684,6 @@ public float getFloat(int index) {
      * @param index the index number 0 .. size-1
      * @param d the value. For numeric PrimitiveArray, it is narrowed 
      *   if needed by methods like Math2.roundToByte(d).
-     * @throws Exception if trouble.
      */
     public void setFloat(int index, float d) {
         set(index, Math2.roundToByte(d));
@@ -709,7 +696,6 @@ public void setFloat(int index, float d) {
      * @return the value as a double. String values are parsed
      *   with String2.parseDouble and so may return Double.NaN.
      *   Byte.MAX_VALUE is returned as Double.NaN.
-     * @throws Exception if trouble.
      */
     public double getDouble(int index) {
         byte b = get(index);
@@ -722,7 +708,6 @@ public double getDouble(int index) {
      * @param index the index number 0 .. size-1
      * @param d the value. For numeric PrimitiveArray, it is narrowed 
      *   if needed by methods like Math2.roundToByte(d).
-     * @throws Exception if trouble.
      */
     public void setDouble(int index, double d) {
         set(index, Math2.roundToByte(d));
@@ -733,7 +718,6 @@ public void setDouble(int index, double d) {
      * 
      * @param index the index number 0 .. 
      * @return For numeric types, this returns (String.valueOf(ar[index])), or "" for NaN or infinity.
-     * @throws Exception if trouble.
      */
     public String getString(int index) {
         byte b = get(index);
@@ -746,7 +730,6 @@ public String getString(int index) {
      * @param index the index number 0 .. 
      * @param s the value. For numeric PrimitiveArray's, it is parsed
      *   with String2.parseInt and narrowed by Math2.narrowToByte(i).
-     * @throws Exception if trouble.
      */
     public void setString(int index, String s) {
         set(index, Math2.narrowToByte(String2.parseInt(s)));

diff --git a/WEB-INF/classes/com/cohort/array/CharArray.java b/WEB-INF/classes/com/cohort/array/CharArray.java
@@ -59,7 +59,6 @@ public CharArray(PrimitiveArray primitiveArray) {
      * @param capacity creates an CharArray with the specified initial capacity.
      * @param active if true, size will be set to capacity and all elements 
      *    will equal 0; else size = 0.
-     * @throws Exception if trouble.
      */
     public CharArray(int capacity, boolean active) {
         Math2.ensureMemoryAvailable(2L * capacity, "CharArray");
@@ -353,7 +352,6 @@ public void setFromPA(int index, PrimitiveArray otherPA, int otherIndex) {
      * This removes the specified element.
      *
      * @param index the element to be removed, 0 ... size-1
-     * @throws Exception if trouble.
      */
     public void remove(int index) {
         if (index >= size)
@@ -370,7 +368,6 @@ public void remove(int index) {
      *
      * @param from the first element to be removed, 0 ... size
      * @param to one after the last element to be removed, from ... size
-     * @throws Exception if trouble.
      */
     public void removeRange(int from, int to) {
         if (to > size)
@@ -395,7 +392,6 @@ public void removeRange(int from, int to) {
      * @param first  the first to be move
      * @param last  (exclusive)
      * @param destination the destination, can't be in the range 'first+1..last-1'.
-     * @throws Exception if trouble
      */
     public void move(int first, int last, int destination) {
         String errorIn = String2.ERROR + " in CharArray.move:\n";
@@ -542,7 +538,6 @@ public String[] toStringArray() {
      * This gets a specified element.
      *
      * @param index 0 ... size-1
-     * @throws Exception if trouble.
      */
     public char get(int index) {
         if (index >= size)
@@ -556,7 +551,6 @@ public char get(int index) {
      *
      * @param index 0 ... size-1
      * @param value the value for that element
-     * @throws Exception if trouble.
      */
     public void set(int index, char value) {
         if (index >= size)
@@ -572,7 +566,6 @@ public void set(int index, char value) {
      * @param index the index number 0 ... size-1
      * @return the value as an int. 
      *   Character.MAX_VALUE is returned as Integer.MAX_VALUE.
-     * @throws Exception if trouble.
      */
     public int getInt(int index) {
         int i = get(index);
@@ -585,7 +578,6 @@ public int getInt(int index) {
      * @param index the index number 0 .. size-1
      * @param i the value. For numeric PrimitiveArray's, it is narrowed 
      *   if needed by methods like Math2.narrowToChar(i).
-     * @throws Exception if trouble.
      */
     public void setInt(int index, int i) {
         set(index, Math2.narrowToChar(i));
@@ -597,7 +589,6 @@ public void setInt(int index, int i) {
      * @param index the index number 0 ... size-1
      * @return the value as a long. 
      *   Character.MAX_VALUE is returned as Long.MAX_VALUE.
-     * @throws Exception if trouble.
      */
     public long getLong(int index) {
         int i = get(index);
@@ -610,7 +601,6 @@ public long getLong(int index) {
      * @param index the index number 0 .. size-1
      * @param i the value. For numeric PrimitiveArray's, it is narrowed 
      *   if needed by methods like Math2.narrowToChar(long).
-     * @throws Exception if trouble.
      */
     public void setLong(int index, long i) {
         set(index, Math2.narrowToChar(i));
@@ -623,7 +613,6 @@ public void setLong(int index, long i) {
      * @return the value as a float. String values are parsed
      *   with String2.parseFloat and so may return Float.NaN.
      *   Character.MAX_VALUE is returned as Float.NaN.
-     * @throws Exception if trouble.
      */
     public float getFloat(int index) {
         char c = get(index);
@@ -636,7 +625,6 @@ public float getFloat(int index) {
      * @param index the index number 0 .. size-1
      * @param d the value. For numeric PrimitiveArray, it is narrowed 
      *   if needed by methods like Math2.roundToChar(d).
-     * @throws Exception if trouble.
      */
     public void setFloat(int index, float d) {
         set(index, Math2.roundToChar(d));
@@ -649,7 +637,6 @@ public void setFloat(int index, float d) {
      * @return the value as a double. String values are parsed
      *   with String2.parseDouble and so may return Double.NaN.
      *   Character.MAX_VALUE is returned as Double.NaN.
-     * @throws Exception if trouble.
      */
     public double getDouble(int index) {
         char c = get(index);
@@ -662,7 +649,6 @@ public double getDouble(int index) {
      * @param index the index number 0 .. size-1
      * @param d the value. For numeric PrimitiveArray, it is narrowed 
      *   if needed by methods like Math2.roundToChar(d).
-     * @throws Exception if trouble.
      */
     public void setDouble(int index, double d) {
         set(index, Math2.roundToChar(d));
@@ -673,7 +659,6 @@ public void setDouble(int index, double d) {
      * 
      * @param index the index number 0 .. 
      * @return This returns (int)(ar[index]), or "" for NaN or infinity.
-     * @throws Exception if trouble.
      */
     public String getString(int index) {
         char b = get(index);
@@ -686,7 +671,6 @@ public String getString(int index) {
      * @param index the index number 0 .. 
      * @param s the value. For numeric PrimitiveArray's, it is parsed
      *   with String2.parseInt and narrowed by Math2.narrowToChar(i).
-     * @throws Exception if trouble.
      */
     public void setString(int index, String s) {
         set(index, Math2.narrowToChar(String2.parseInt(s)));