Merge develop for release 4.1

.gitignore

@@ -1,4 +1,9 @@
 target
 .classpath
 .project
-.settings
+.settings
+nb*.xml
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.next
+release.properties

.travis.yml

@@ -1,10 +1,15 @@
 language: java
-#notifications:
-# email: false
 jdk:
- - openjdk6
  - openjdk7
  - oraclejdk7
-# - oraclejdk8
+ - oraclejdk8
 install: true
-script: mvn clean install -P develop
+script: mvn clean install
+notifications:
+ irc:
+ channels:
+ - "chat.freenode.net#52north"
+ on_success: always
+ on_failure: always
+ use_notice: true
+ skip_join: false

NOTICE

@@ -4,9 +4,8 @@ Licensed under GNU General Public License, Version 2.0
 
 This project includes: 
 
- "Java Concurrency in Practice" book annotations under Creative Commons Attribution License, http://creativecommons.org/licenses/by/2.5
- 52North SOS Integration and Compliance 2.0 under GPLv2
- 52North SOS Integration and Compliance Common under GPLv2
+ 52North SOS Integration and Compliance 2.0 under Eclipse Public License 1.0
+ 52North SOS Integration and Compliance Common under Eclipse Public License 1.0
  52°North Aggregated Third Party modules under GPLv2
  52°North Sensor Observation Service under GPLv2
  52°North SOS - 2.0 XML Request Coding under GPLv2
@@ -15,7 +14,6 @@ This project includes:
  52°North SOS - Cache under GPLv2
  52°North SOS - Coding Modules under GPLv2
  52°North SOS - Core Modules under GPLv2
- 52°North SOS - Example Data under GPLv2
  52°North SOS - Extension Delete Observation under GPLv2
  52°North SOS - Extension Delete Observation - Hibernate DAO under GPLv2
  52°North SOS - Extension Delete Observation - JSON under GPLv2
@@ -43,6 +41,7 @@ This project includes:
  52°North SOS - Hibernate Oracle Datasource under GPLv2
  52°North SOS - Hibernate Postgres/PostGIS Datasource under GPLv2
  52°North SOS - Hibernate Session Factory under GPLv2
+ 52°North SOS - Hibernate SQL Server Datasource under GPLv2
  52°North SOS - JSON Binding under GPLv2
  52°North SOS - JSON Coding under GPLv2
  52°North SOS - JSON Common under GPLv2
@@ -73,39 +72,43 @@ This project includes:
  52°North SOS - Web Views under GPLv2
  52°North SOS - Webapp under GPLv2
  52°North Third Party - NCName resolver under BSD 2-clause "Simplified" or "FreeBSD"
- License
- A Hibernate Core Module under GNU Lesser General Public License
+ License
  AntLR Parser Generator under BSD License
  AOP alliance under Public Domain
- c3p0:JDBC DataSources/Resource Pools under GNU LESSER GENERAL PUBLIC LICENSE
+ c3p0 under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0
  Commons Codec under The Apache Software License, Version 2.0
  Commons IO under The Apache Software License, Version 2.0
- Commons Logging under The Apache Software License, Version 2.0
+ Core Hibernate O/RM functionality under GNU Lesser General Public License
  CORS Filter under The Apache Software License, Version 2.0
  dom4j under DOM4J license, http://dom4j.sourceforge.net/dom4j-1.6.1/license.html (BSD style)
+ FindBugs-jsr305 under The Apache Software License, Version 2.0
  GeoDB Core under BSD style, https://github.com/jdeolive/geodb/blob/master/LICENSE.txt
  Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
  H2 Database Engine under The H2 License, Version 1.0
  Hamcrest All under New BSD License
  Hamcrest Core under BSD style
  hatbox under GNU Lesser General Public License (LGPL) version 2.1
- Hibernate Commons Annotations under GNU LESSER GENERAL PUBLIC LICENSE
+ Hibernate Commons Annotations under GNU Lesser General Public License
  hibernate-spatial under GNU Lesser General Public License (LGPL) version 2.1
+ Hibernate/c3p0 Integration under GNU Lesser General Public License
  HttpClient under Apache License
  HttpCore under Apache License
- Jackson-annotations under The Apache Software License, Version 2.0
- Jackson-core under The Apache Software License, Version 2.0
- jackson-databind under The Apache Software License, Version 2.0
+ Jackson-annotations under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
+ Jackson-core under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
+ jackson-databind under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
+ Java Annotation Indexer under AL 2.0
+ Java Persistence API, Version 2.1 under Eclipse Public License (EPL), Version 1.0 or Eclipse Distribution License (EDL), Version 1.0
  Java Property Utility under The Apache Software License, Version 2.0
+ Java Transaction API under Common Development and Distribution License or GNU General Public License, Version 2 with the Classpath Exception
+ JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
  JavaMail API jar under CDDL or GPLv2+CE
  Javassist under MPL 1.1 or LGPL 2.1 or Apache License 2.0
- JBoss Logging 3 under GNU Lesser General Public License, version 2.1
+ JBoss Logging 3 under Apache License, version 2.0
+ JBoss Logging I18n Annotations under Public Domain
  JCL 1.1.1 implemented over SLF4J under MIT License
  Jettison under Apache License, Version 2.0
- Joda time under Apache 2
- JPA 2.0 API under Eclipse Distribution License, Version 1.0
- json-schema-core under LGPLv3 or later
- json-schema-validator under LGPLv3 or later
+ Joda-Time under Apache 2
+ JOpt Simple under The MIT License
  jsp-api under CDDL 1.1 or GPL2 w/ CPE
  jstl under CDDL 1.1 or GPL2 w/ CPE
  JTS Topology Suite under Lesser General Public License (LGPL)
@@ -115,9 +118,11 @@ This project includes:
  Log4j Implemented Over SLF4J under Apache Software Licenses
  Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
  Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
+ mchange-commons-java library under GNU Lesser General Public License, Version 2.1 or Eclipse Public License, Version 1.0
  Mockito under The MIT License
  Mozilla Rhino under Mozilla Public License, Version 2.0
  MySQL java connector under The GNU General Public License, Version 2
+ null under Lesser General Public License, version 3 or greater or Apache Software License, version 2.0
  OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
  OASIS WS-Resources specification schemas v1.2 under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
  Objenesis under MIT License
@@ -163,11 +168,12 @@ This project includes:
  spring-security-web under The Apache Software License, Version 2.0
  spring-tx 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
- Transaction 1.1 API under lgpl
  W3C SOAP specification recommondation (v1.2 part 1) under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
  W3C WS-Addressing specification schemas (v1.0) under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
  W3C xlink schema (spec. v1.1.0) under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
+ XML Commons External Components XML APIs under The Apache Software License, Version 2.0
  XmlBeans under The Apache Software License, Version 2.0
  XmlBeansXPath under The Apache Software License, Version 2.0
  XMLUnit for Java under BSD License

README.md

@@ -1,6 +1,6 @@
 # 52°North SOS
 
-README file for the 52°North Sensor Observation Service (SOS) version 4.0.0
+README file for the 52°North Sensor Observation Service (SOS) version 4.1
 
 This is the repository of the [52°North Sensor Observation Service (SOS)][1].
 

RELEASE-NOTES

@@ -6,14 +6,142 @@ RELEASE NOTES
  SensorML instance document), and information about the sensor mounting platform 
  (SensorML as well).
 
-Changes since last release
+Release 52n-sos-4.1
+==================================
+
+ --- New features ---
+
+ * Binding selection by ContentType at /sos and /service
+ * Add columns to mapping files for an easier integration of the Timeseries API (only for Series concept)
+ * Added first/latest time (all) and value (only OM_Measurement) columns to series table and update 
+ these columns during insertion process
+ * Add Microsoft SQL Server support
+ * https://github.com/52North/SOS/commit/e288e502fbc1f0b833bad1e90d60b36c491d0792
+ * Create JSON cache dump in admin interface
+ * https://github.com/52North/SOS/commit/9cef2ba00c862058e7ada1f7a2862ef98a3e3096
+ * GetObservation with multiple temporal filter and different valueReferences
+ * same valueReference: filter OR filter
+ * different valueReferences: (filterA1 OR filterA2) AND filterB
+ * Streaming response:
+ * can be activated via settings
+ * StreamWriter for SOAP envelope, O&M 2.0, and WaterML 2.0
+ * Allows bigger responses because the no XML DOM-Tree is created
+ * Streaming datasource (Hibernate) for GetObservation:
+ * can be activate via settings
+ * Query observation metadata and create template observations
+ * In the encoder the observation values are queried
+ * Two possibilities, configurable via settings:
+ * scroll: send query and get scrollable values
+ * chunk: 
+ * send paging requests and process each chunk
+ * chunk size is configurable via settings
+ * reduced latency for GetObservation response
+ * Add datasource dependent DAO and ConnectionProvider loading
+ * This allows to include DAOs and ConnectionProvider for different datasources in the same SOS which 
+ can be selected during the installation.
+ * Corresponding to the selected datasource, the required DAOs and ConnectionProvider are loaded during 
+ the initialization.
+ * https://github.com/52North/SOS/commit/d906f74267e8efcc51e53703a391aafb29119178
+ * If featureOfInterest geometry is missing, create the geometry from existing samplingGeometries
+ * https://github.com/52North/SOS/commit/dc8ce1eb00de99b09e4a60574be96c34bf441eb2
+
+ --- Changes ---
+
+ * Show the observation identifiers only in capabilities if size is less than 100, TODO: make this configurable
+ * Adapt the GetDataAvailability request/response to the OGC Discussion Paper:
+ * OGC Sensor Observation Service 2.0 Hydrology Profile (https://portal.opengeospatial.org/files/?artifact_id=57327)
+ * XML schema: http://waterml2.org/schemas/gda/1.0/gda.xsd
+ * Remove support for raw SQL execution in the admin interface because of security constraints 
+ * https://github.com/52North/SOS/commit/ff5f8dd86f97024337f51492009559f11492bd7d
+ * Update dependency versions:
+ * joda-time (2.3)
+ * json-schema-validator (2.2.3)
+ * json-schema-core (1.2.1)
+ * springframework (3.2.6)
+ * PostgreSQL JDBC (9.3-1101-jdbc4)
+ * PostGIS JDBC (2.1.3)
+ * Hibernate (4.3.5.Final)
+ * Reduced Maven build profiles 
+ * https://github.com/52North/SOS/commit/279f815fd7372ab5cb3ac06add2995486f0c2402
+ * Switch to Java 7 as compiler/source/target version
+ * https://github.com/52North/SOS/commit/b1c172cd2b087b4a76eed8648e32952dee55c098
+ * Asynchronous cache serialization (see issue Cache serialization performance issue)
+ * https://github.com/52North/SOS/commit/09dcbdf8180bc0b7f260d435385254f58e50a78c
+ * Better SQL Exceptions: Create a composite exception and add all Throwable as a single exception.
+ * https://github.com/52North/SOS/commit/5b1ebe002aabc2d9108eaf196f8927605b77fc9b
+ * Name unique constraints in mapping files
+ * constraints are updated if you check 'Force updating existing tables' at the 'Datasource configuration' 
+ installation page.
+ * https://github.com/52North/SOS/commit/8e005c7b21f4c51bd238a8eeafdd592d8953c750
+ * Move samplingGeometry from separate table (spatialfilteringprofile) to observation table
+ * Improved performance if samplingGeometries are set.
+ * Old concept with spatialfilteringprofile table is still supported. To use the old concept check 
+ '!!! DEPRECATED !!! Old Spatial Filtering Profile' at the 'Datasource configuration' installation page.
+ * For each supported DBMS an update script is available (/misc/db/..) to add the new column, copy the 
+ samplingGeometries and remove the spatialfilteringprofile table.
+ * https://github.com/52North/SOS/commit/65e8a4d7867f3e19c3c444438f79df5a3616fb8d
+ * Change offering fetch mode to lazy to reduce the number of subqueries when querying the observations.
+ * https://github.com/52North/SOS/commit/67475c6d3741641d02a4be4fb6c466526152c09f
+
+
+ --- Fixed bugs ---
+
+ * Check if JSON binding is supported before testing
+ * Show Spatial Filtering Profile key in the Profile section of the Capabilities.ServiceIdentification if 
+ strict Spatial Filtering Profile is selected
+ * https://github.com/52North/SOS/commit/437fd75
+ * Fix TimeRange decoding
+ * https://github.com/52North/SOS/commit/4151647
+ * Fix TimeInstant constructor with parameter java.util.Date 
+ * https://github.com/52North/SOS/commit/3dc6205
+ * Fix SOS 1.0 schemaLocation randomly missing after restarts (https://github.com/52North/SOS/issues/45)
+ * https://github.com/52North/SOS/commit/f849cc9
+ * Fix for Cache serialization performance issue
+ * After each InsertObservation the cache was directly serialized to the file. Thus, the insert requests were 
+ getting slower the more data were available.
+ * https://github.com/52North/SOS/commit/b1c172cd2b087b4a76eed8648e32952dee55c098
+ * Fix problem with duplicated entries in generated SQL scripts.
+ * https://github.com/52North/SOS/commit/6e70d910e6f8f7140d79f65c83250cf5370b73fc
+ * Fix #74: Exception when executing SOS 1.0.0 DescribeSensor requests
+ * https://github.com/52North/SOS/commit/7e0e6a2ca8670e8f7ec632d899d9781391a04bbd
+ * Throw exception if the inserted sensor description has swe:DataArray sml:output element without a swe:DataRecord elementType element.
+ * https://github.com/52North/SOS/commit/5c55aeeb92a8ed60a12449c1171b757a38fc57bc
+ * Fix GetObservation invalid srs exception code.
+ * https://github.com/52North/SOS/commit/0b20dd424be7556a767170ba8392897b36cdd8c8
+ * Fix #79: File-based H2/GeoDB fails on sampling geometry index
+ * https://github.com/52North/SOS/commit/a5814ee539f25ada7eeedd75e63a37e68c6682cf
+ * Fix #81: GetDataAvailability returns invalid times and value counts
+ * https://github.com/52North/SOS/commit/49c004ff8a7255aed677bef05c913254070387e1
+ * Fix #83: Update GetInvolved link on client landing page
+ * https://github.com/52North/SOS/commit/c710a08dcdc05545d5515a24e643bc191bf71a94
+ * Fix #84: AbstractSettingsDefinition equals() returns true if all variables are the same except key, title and description
+ * https://github.com/52North/SOS/commit/c710a08dcdc05545d5515a24e643bc191bf71a94
+ * Fix used Hibernate mapping path constants
+ * https://github.com/52North/SOS/commit/8be9ad0d4bb6e388e9b8a5f9ed05ed6423b994d4
+ * Fix #87: Inform user about javascript requirement for the webapp
+ * https://github.com/52North/SOS/commit/5014f1fa00199e573b80ca931928fa53542602f7
+ * Fix #80: Resetting the SOS does not delete the cache file
+ * https://github.com/52North/SOS/commit/a43b945940963ec4152da7769de242213e219a70
+ * Fix #101: SOS 1.0.0 GetObservation SOAP request fails
+ * https://github.com/52North/SOS/commit/4972a4e0a13bc0e3e5cb951f4d322c064a22e8de
+ * Fix #106: Possible thread safety issue in HTTPUtils' GenericWritable
+ * https://github.com/52North/SOS/commit/835ce396cc9dda645a15bb2c538580943af7cfd5
+ * Fix #109: First position is missing in the featuerOfInterest geometry if generated from samplingGeometries
+ * https://github.com/52North/SOS/commit/6ccf283def95198c3ba8dd452ee10232a7a6251f
+
+
+Release 52n-sos-4.0.1
 ==================================
 
  --- New features ---
 
  --- Changes ---
 
  --- Fixed bugs ---
+
+ * Fix NcNameResolver.fixNcName and Show nested SQLExceptions in OwsExceptionReport
+ * Add missing setting of namedQuery parameter
+
 
 Release 52n-sos-4.0.0
 ==================================
@@ -53,7 +181,8 @@ Release 52n-sos-4.0.0
  * [Bug 993] Cache Update blocks all operations
  * [Bug 996] Installer finishes smoothly when "PostgreSQL/PostGIS Core" datasource is selected but not tables exists
  * [Bug 997] FeatureOfInterest JSON Encoding with wrong "name"
- * [Bug 1001] Could not finish set-up using installer: Could not connect to the database: ERROR: relation "codespaceid_seq" already exists. Command: create sequence public.codespaceId_seq
+ * [Bug 1001] Could not finish set-up using installer: Could not connect to the database: ERROR: relation "codespaceid_seq" already exists. 
+ Command: create sequence public.codespaceId_seq
  * [Bug 1005] Spatial Filtering Profile filtering does not work after refactoring the Hibernate GetObservation request processing (r22393)
 
 Release 52n-sos-4.0.0-RC6
@@ -168,7 +297,8 @@ Release 52n-sos-4.0.0-RC1
 
  * [Bug 860] - Dynamic generation of sensor description if descriptionURL and descriptionXml are not set
  * [Bug 919] - InvalidRequest exception when send SOAP-InsertObservation request with OM_SWEArrayObservation type
- * [Bug 920] - org.hibernate.LazyInitializationException: illegal access to loading collection in OfferingCacheUpdateTask's getRelatedFeatureIdentifiersFrom(TOffering offering)
+ * [Bug 920] - org.hibernate.LazyInitializationException: illegal access to loading collection in OfferingCacheUpdateTask's 
+ getRelatedFeatureIdentifiersFrom(TOffering offering)
  * [Bug 922] - Implement Related Feature Handling
  * [Bug 929] - Reload Capabilities Cache fails if there is a deleted procedure in the database 
  * [Bug 930] - Extension "SplitDataArrayIntoObservations"
@@ -272,5 +402,5 @@ Release 52n-sos-webapp-4.0.0-Beta1
 
 
 
-For more detailed information about the bugs look at https://52north.org/bugzilla/
+For more detailed information about the bugs look at https://github.com/52North/SOS/issues
 

bindings/json/pom.xml

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

bindings/kvp/pom.xml

@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.n52.sensorweb.sos</groupId>
  <artifactId>bindings</artifactId>
- <version>4.0.1</version>
+ <version>4.1.0</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.0.1</version>
+ <version>4.1.0</version>
  </parent>
  <artifactId>bindings</artifactId>
  <packaging>pom</packaging>
@@ -14,26 +14,7 @@
  <module>kvp</module>
  <module>pox</module>
  <module>soap</module>
+ <module>rest</module>
+ <module>json</module>
  </modules>
- <profiles>
- <profile>
- <id>restful</id>
- <modules>
- <module>rest</module>
- </modules>
- </profile>
- <profile>
- <id>json</id>
- <modules>
- <module>json</module>
- </modules>
- </profile>
- <profile>
- <id>develop</id>
- <modules>
- <module>rest</module>
- <module>json</module>
- </modules>
- </profile>
- </profiles>
 </project>