Merge branch 'develop'

.gitignore

@@ -13,3 +13,4 @@ extensions/do/core/configuration.db
 **.*~
 *.tern-project
 extensions/inspire/coding/configuration.db
+console.log

.travis.yml

@@ -1,7 +1,6 @@
 language: java
 jdk:
     - openjdk7
-    - oraclejdk7
     - oraclejdk8
 addons:
   hosts:

NOTICE

@@ -234,6 +234,7 @@ This project includes:
   Main module under GNU Lesser General Public License (LGPL) version 2.1
   mchange-commons-java under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0
   Metadata under GNU Lesser General Public License (LGPL) version 2.1
+  Microsoft JDBC Driver for SQL Server under MIT License
   Mockito under The MIT License
   Mozilla Rhino under Mozilla Public License, Version 2.0
   MySQL Connector/J under The GNU General Public License, Version 2
@@ -307,7 +308,6 @@ This project includes:
   spring-security-taglibs under The Apache Software License, Version 2.0
   spring-security-web under The Apache Software License, Version 2.0
   SQLite JDBC under The Apache Software License, Version 2.0
-  sqljdbc4 under MICROSOFT SOFTWARE LICENSE TERMS, http://download.microsoft.com/download/0/2/A/02AAE597-3865-456C-AE7F-613F99F850A8/license.txt
   StAX API under The Apache Software License, Version 2.0
   udunits under (MIT-style) netCDF C library license
   vecmath under GPL 2.0 license w/ CPE

RELEASE-NOTES

@@ -5,6 +5,42 @@ RELEASE NOTES
  in Observation&Measurement), information about the sensor itself (encoded in a 
  SensorML instance document), and information about the sensor mounting platform 
  (SensorML as well).
+
+   Release 52n-sensorweb-sos-4.4.x
+====================================
+
+  --- New features ---
+
+      * 
+
+  --- Changes ---
+
+      * 
+
+  --- Fixed issues ---
+
+      * 
+
+   Release 52n-sensorweb-sos-4.4.1
+====================================
+
+  --- New features ---
+
+      * Support for ReferencedObservation
+      * Support for insertion of profile observations via InsertResult/Template operations
+
+  --- Changes ---
+
+      * Load Microsoft SQL Server JDBC from Maven repository
+      * Improvements on cache serialization
+
+  --- Fixed issues ---
+
+      * Issue #566: Reload Capabilities Cache leads to severe error
+      * Issue #571: Sensors disappear (same as #566)
+      * Fix resetting of HIBERNATE_DIRECTORY config on save
+      * Fix the deletion of child observations
+      * Fix issue with not correct observation type for GWML GeologyLogCoverage
 
    Release 52n-sensorweb-sos-4.4.0
 ====================================
@@ -101,6 +137,36 @@ RELEASE NOTES
       * Avoid query for next value chunk if previous has less than chunk size
 
 
+     Release 52n-sensorweb-sos-4.3.16
+======================================
+
+  --- New features ---
+
+
+  --- Changes ---
+
+
+  --- Fixed issues ---
+
+    * Issue #566: Reload Capabilities Cache leads to severe error
+    * Issue #571: Sensors disappear (same as #566)
+
+
+    Release 52n-sensorweb-sos-4.3.15
+=====================================
+
+  --- New features ---
+
+
+  --- Changes ---
+
+
+  --- Fixed issues ---
+
+    * avoid orphaned session objects after re-configure SOS
+* prevents resetting HIBERNATE_DIRECTORY config (missing extension/readonly folder) 
+
+
    Release 52n-sensorweb-sos-4.3.14
 =====================================
 
@@ -361,12 +427,12 @@ RELEASE NOTES
       * Primary validated assessment data -modelled (E1b)
       * Primary up-to-date assessment data - measurements (E2a) 
       * More information about AQD e-Reporting: http://www.eionet.europa.eu/aqportal
-	  * Documentation: https://wiki.52north.org/bin/view/SensorWeb/AqdEReporting
+	  * Documentation: https://wiki.52north.org/SensorWeb/AqdEReporting
 	* Flexible identifier
 	  * The flexible identifier extension offers the possibility to return human readable names 
 	    as identifiers instead of the sometimes cryptic identifiers.
 	  * Affects offering, procedure, observableProperty and featureOfInterest.
-	  * Documentation: https://wiki.52north.org/bin/view/SensorWeb/FlexibleIdentifier
+	  * Documentation: https://wiki.52north.org/SensorWeb/FlexibleIdentifier
     * Add core and custom datasources for Oracle (#228)
     * Support clear datasource for SQL Server (#199)
     * Add webapp-bundle module which builds a 52N SOS war including
@@ -397,15 +463,15 @@ RELEASE NOTES
  --- New features ---
 
     * INSPIRE SOS:
-      * Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#INSPIRE_Download_Service_extensi
+      * Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#INSPIRE_Download_Service_extensi
       * Multilingualism:
         * Name/description of offering, procedure, observableProperty, and featureOfInterest can be defined in different languages
         * Define/Change via the admin interface, insertion via transactional operations is not yet supported.
-        * Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#Multilingualism_support
+        * Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#Multilingualism_support
       * Coordinate transformation:
         * Requested coordinates are transformed to the defined database CRS
         * Coordinates in the responses are transformed to the requested or defined response CRS
-        *Details: https://wiki.52north.org/bin/view/SensorWeb/SensorObservationServiceIVDocumentation#CRS_support
+        *Details: https://wiki.52north.org/SensorWeb/SensorObservationServiceIVDocumentation#CRS_support
       *https://github.com/52North/SOS/pull/131
     * Support for transactional feature relation insertion
       * Insert valid sampledFeature feature and add relation to database

bindings/exi/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <artifactId>binding-exi</artifactId>
     <name>52°North SOS - EXI Efficient XML Interchange Binding</name>

bindings/json/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <artifactId>binding-json</artifactId>
     <name>52°North SOS - JSON Binding</name>

bindings/kvp/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-kvp</artifactId>

bindings/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>52n-sos</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <artifactId>bindings</artifactId>
     <packaging>pom</packaging>

bindings/pox/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-pox</artifactId>

bindings/register/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-register</artifactId>

bindings/rest/code/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>rest</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <artifactId>rest-code</artifactId>
     <name>52°North SOS - Extension REST Binding - Core</name>

bindings/rest/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rest</artifactId>

bindings/rest/xml/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>rest</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <artifactId>rest-xml</artifactId>
     <name>52°North SOS - Extension REST Binding - XML</name>

bindings/soap/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>bindings</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-soap</artifactId>

coding/cv-gml/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>coding</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>coding-cv-gml</artifactId>

coding/cv-gml/src/main/java/org/n52/svalbard/cv/v02/encode/AbstractCVDiscretePointCoverageTypeEncoder.java

@@ -48,6 +48,7 @@
 import org.n52.sos.ogc.om.values.CountValue;
 import org.n52.sos.ogc.om.values.CvDiscretePointCoverage;
 import org.n52.sos.ogc.om.values.ProfileValue;
+import org.n52.sos.ogc.om.values.QuantityRangeValue;
 import org.n52.sos.ogc.om.values.GeometryValue;
 import org.n52.sos.ogc.om.values.HrefAttributeValue;
 import org.n52.sos.ogc.om.values.MultiPointCoverage;
@@ -340,18 +341,23 @@ public XmlObject visit(CvDiscretePointCoverage value) throws OwsExceptionReport
         }
 
         @Override
-        public XmlObject visit(MultiPointCoverage multiPointCoverage) throws OwsExceptionReport {
+        public XmlObject visit(MultiPointCoverage value) throws OwsExceptionReport {
             return null;
         }
 
         @Override
-        public XmlObject visit(RectifiedGridCoverage rectifiedGridCoverage) throws OwsExceptionReport {
+        public XmlObject visit(RectifiedGridCoverage value) throws OwsExceptionReport {
             return null;
         }
 
         @Override
         public XmlObject visit(ProfileValue value) throws OwsExceptionReport {
             return CodingHelper.encodeObjectToXml(value.getDefaultElementEncoding(), value);
         }
+
+        @Override
+        public XmlObject visit(QuantityRangeValue value) throws OwsExceptionReport {
+            return null;
+        }
     }
 }

coding/exi/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>coding</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>coding-exi</artifactId>

coding/gml-cov/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>coding</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>coding-gml-cov</artifactId>

coding/gml/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.sensorweb.sos</groupId>
         <artifactId>coding</artifactId>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>coding-gml</artifactId>

coding/gml/src/main/java/org/n52/svalbard/gml/v321/encode/AbstractCoverageEncoder.java

@@ -37,15 +37,17 @@
 import org.n52.sos.ogc.om.values.CountValue;
 import org.n52.sos.ogc.om.values.DiscreteCoverage;
 import org.n52.sos.ogc.om.values.QuantityValue;
+import org.n52.sos.ogc.om.values.TextValue;
 import org.n52.sos.ogc.om.values.Value;
 import org.n52.sos.ogc.ows.OwsExceptionReport;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 
 import net.opengis.gml.x32.BooleanListDocument;
-import net.opengis.gml.x32.CategoryListDocument;
-import net.opengis.gml.x32.CodeOrNilReasonListType;
+import net.opengis.gml.x32.CoordinatesType;
 import net.opengis.gml.x32.CountListDocument;
+import net.opengis.gml.x32.DataBlockType;
 import net.opengis.gml.x32.DiscreteCoverageType;
 import net.opengis.gml.x32.MeasureOrNilReasonListType;
 import net.opengis.gml.x32.QuantityListDocument;
@@ -94,25 +96,21 @@ protected void encodeValueList(RangeSetType rst, DiscreteCoverage<?> discreteCov
         List<?> list = getList(discreteCoverage);
         Value<?> value = discreteCoverage.getRangeSet().iterator().next();
         if (value instanceof BooleanValue) {
-            BooleanListDocument bld = BooleanListDocument.Factory.newInstance();
+            BooleanListDocument bld = BooleanListDocument.Factory.newInstance(getXmlOptions());
             bld.setBooleanList(list);
             rst.set(bld);
-        } else if (value instanceof CategoryValue) {
-            CategoryListDocument cld = CategoryListDocument.Factory.newInstance();
-            CodeOrNilReasonListType conrlt = cld.addNewCategoryList();
-            if (discreteCoverage.isSetUnit()) {
-                conrlt.setCodeSpace(discreteCoverage.getUnit());
-            } else if (value.isSetUnit()) {
-                conrlt.setCodeSpace(value.getUnit());
-            }
-            conrlt.setListValue(list);
-            rst.set(cld);
+        } else if (value instanceof CategoryValue || value instanceof TextValue) {
+            DataBlockType dbt = rst.addNewDataBlock();
+            dbt.addNewRangeParameters().setHref(discreteCoverage.getRangeParameters());
+            CoordinatesType ct = dbt.addNewTupleList();
+            ct.setCs(",");
+            ct.setStringValue(Joiner.on(",").join(list));
         } else if (value instanceof CountValue) {
-            CountListDocument cld = CountListDocument.Factory.newInstance();
+            CountListDocument cld = CountListDocument.Factory.newInstance(getXmlOptions());
             cld.setCountList(list);
             rst.set(cld);
         } else if (value instanceof QuantityValue) {
-            QuantityListDocument qld = QuantityListDocument.Factory.newInstance();
+            QuantityListDocument qld = QuantityListDocument.Factory.newInstance(getXmlOptions());
             MeasureOrNilReasonListType monrlt = qld.addNewQuantityList();
             if (discreteCoverage.isSetUnit()) {
                 monrlt.setUom(discreteCoverage.getUnit());
@@ -121,8 +119,6 @@ protected void encodeValueList(RangeSetType rst, DiscreteCoverage<?> discreteCov
             }
             monrlt.setListValue(list);
             rst.set(qld);
-        } else {
-            rst.setNil();
         }
     }