[UWS] Add configuration file to build and configure a UWS service.

src/tap/config/tap_configuration_file.html

@@ -311,7 +311,7 @@ <h1>TAP Configuration File</h1>
 				<td>
 					<p>Type of the file manager.</p>
 					<p>Accepted values are: local (to manage files on the local system).
-					You can also add another way to manage files by providing the name (within brackets: {...}) of a class implementing TAPFileManager and having at least one constructor with only a java.util.Properties parameter.</p>
+					You can also add another way to manage files by providing the name (within brackets: {...}) of a class implementing UWSFileManager and having at least one constructor with only a java.util.Properties parameter.</p>
 				</td>
 				<td><ul><li>local</li><li>{apackage.MyTAPFileManager}</li></ul></td>
 			</tr>
@@ -415,7 +415,7 @@ <h1>TAP Configuration File</h1>
 	 				</em></p>
 	 				<p><em>Default: <code>D 0 0</code> (daily at midnight)</em></p>
 				</td>
-				<td><ul><li>D 6 30</li><li>W 2 6 30</li><li>M 2 6 30</li><li>H 10</li><li>m</li></ul></td>
+				<td><ul><li>D 6 30</li><li>W 2 6 30</li><li>M 2 6 30</li><li>h 10</li><li>m</li></ul></td>
 			</tr>
 
 			<tr><td colspan="5">UWS Backup (only if tap_factory = ø)</td></tr>

src/tap/parameters/TAPParameters.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with TAPLibrary.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Copyright 2012,2014 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
+ * Copyright 2012-2016 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
  *                       Astronomisches Rechen Institut (ARI)
  */
 
@@ -42,7 +42,7 @@
  * submitted by a TAP client to this TAP service.
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 2.0 (12/2014)
+ * @version 2.1 (06/2016)
  */
 public class TAPParameters extends UWSParameters {
 
@@ -87,7 +87,7 @@ public TAPParameters(final ServiceConnection service, final Map<String,Object> p
 			// Deal with the UPLOAD parameter(s):
 			DALIUpload.getDALIUploads(params, true, service.getFileManager());
 
-			// Load all parameters:			
+			// Load all parameters:
 			Iterator<Entry<String,Object>> it = params.entrySet().iterator();
 			Entry<String,Object> entry;
 			try{
@@ -121,7 +121,7 @@ protected static final Map<String,InputParamController> buildDefaultControllers(
 		controllers.put(TAPJob.PARAM_EXECUTION_DURATION, new TAPExecutionDurationController(service));
 		controllers.put(TAPJob.PARAM_DESTRUCTION_TIME, new TAPDestructionTimeController(service));
 		controllers.put(TAPJob.PARAM_REQUEST, new StringParamController(TAPJob.PARAM_REQUEST, null, new String[]{TAPJob.REQUEST_DO_QUERY,TAPJob.REQUEST_GET_CAPABILITIES}, true));
-		controllers.put(TAPJob.PARAM_LANGUAGE, new StringParamController(TAPJob.PARAM_LANGUAGE, TAPJob.LANG_ADQL, null, true));
+		controllers.put(TAPJob.PARAM_LANGUAGE, new StringParamController(TAPJob.PARAM_LANGUAGE, TAPJob.LANG_ADQL, (String[])null, true));
 		controllers.put(TAPJob.PARAM_VERSION, new StringParamController(TAPJob.PARAM_VERSION, TAPJob.VERSION_1_0, new String[]{TAPJob.VERSION_1_0}, true));
 		controllers.put(TAPJob.PARAM_QUERY, new StringParamController(TAPJob.PARAM_QUERY));
 		controllers.put(TAPJob.PARAM_FORMAT, new FormatController(service));
@@ -136,7 +136,7 @@ protected static final Map<String,InputParamController> buildDefaultControllers(
 	 * <ul>
 	 * 	<li><b>NULL</b>: NULL is returned.</li>
 	 * 	<li><b>An array (of whatever is the items' type)</b>: a string in which each Object.toString() are concatenated ; each item is separated by a semicolon</li>
-	 * 	<li><b>Anything else</b>: Object.toString()</li> 
+	 * 	<li><b>Anything else</b>: Object.toString()</li>
 	 * </ul>
 	 * 
 	 * @param paramName	Name of the parameter whose the value must be returned as a String.
@@ -220,7 +220,7 @@ public final String getUpload(){
 	}
 
 	/**
-	 * Get the list of all tables uploaded and defined by the standard TAP parameter "UPLOAD". 
+	 * Get the list of all tables uploaded and defined by the standard TAP parameter "UPLOAD".
 	 * 
 	 * @return	Tables to upload in database at query execution.
 	 */