Skip to content

Commit

Permalink
Merge branch 'release/v4.3.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
CarstenHollmann committed May 4, 2017
2 parents 12e7bd7 + b145756 commit b125bab
Show file tree
Hide file tree
Showing 216 changed files with 724 additions and 76,858 deletions.
19 changes: 19 additions & 0 deletions RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ 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.3.12
=====================================

--- New features ---

* Make timezones configurable to handle time w/o zone information properly (instead of expecting UTC only)
* Add named query for samplingGeometry check in offering cache update
* Get unit from series table

--- Changes ---

* Set overall time extrema flag to false
* Enhancements for not publiched objects (series concept)
* Update REST-API to 1.10.0

--- Fixed issues ---

* some minor fixes

Release 52n-sensorweb-sos-4.3.11
=====================================
Expand Down
2 changes: 1 addition & 1 deletion bindings/exi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>binding-exi</artifactId>
<name>52°North SOS - EXI Efficient XML Interchange Binding</name>
Expand Down
2 changes: 1 addition & 1 deletion bindings/json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>binding-json</artifactId>
<name>52°North SOS - JSON Binding</name>
Expand Down
2 changes: 1 addition & 1 deletion bindings/kvp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-kvp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bindings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>52n-sos</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>bindings</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bindings/pox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-pox</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bindings/rest/code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>rest</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>rest-code</artifactId>
<name>52°North SOS - Extension REST Binding - Core</name>
Expand Down
4 changes: 2 additions & 2 deletions bindings/rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rest</artifactId>
<packaging>pom</packaging>
<version>4.3.11</version>
<version>4.3.12</version>
<name>52°North SOS - Extension REST Binding</name>
<description>RESTful binding for the 52°North SOS</description>
<url>http://52north.org/communities/sensorweb/sosREST/</url>
Expand Down
2 changes: 1 addition & 1 deletion bindings/rest/xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>rest</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>rest-xml</artifactId>
<name>52°North SOS - Extension REST Binding - XML</name>
Expand Down
2 changes: 1 addition & 1 deletion bindings/soap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>bindings</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>binding-soap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/exi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-exi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/json-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-json-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-json</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/ows-v110/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-ows-v110</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>52n-sos</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>coding</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion coding/sensorML-v101/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-sensorML-v101</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ private void addProcessModelValues(final ProcessModelType processModel, final Pr
processModel.setOutputs(createOutputs(sosProcessModel.getOutputs()));
}
// set method
if (processModel.getMethod() != null) {
if (sosProcessModel.isSetMethod() && processModel.getMethod() == null) {
processModel.setMethod(createMethod(sosProcessModel.getMethod()));
}
}
Expand Down
2 changes: 1 addition & 1 deletion coding/sensorML-v20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-sensorML-v20</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/sensorML/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>coding-sensorML</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion coding/sos-v100/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-sos-v100</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/sos-v20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-sos-v20</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion coding/wml-v20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>coding</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coding-wml-v20</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion converter/identifier-modifier/abstract-identifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>identifier-modifier</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>abstract-identifier</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/identifier-modifier/flexible-identifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>identifier-modifier</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>flexible-identifier</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/identifier-modifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>converter</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>identifier-modifier</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/identifier-modifier/prefixed-identifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>identifier-modifier</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>prefixed-identifier</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>52n-sos</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>converter</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/split-and-merge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>converter</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>split-and-merge</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/transformation/coordinate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>transformation</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>request-response-coordinate-transformer</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion converter/transformation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>converter</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>transformation</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>core</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<artifactId>admin</artifactId>
<name>52°North SOS - Administrator Service Operator</name>
Expand Down
2 changes: 1 addition & 1 deletion core/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.n52.sensorweb.sos</groupId>
<artifactId>core</artifactId>
<version>4.3.11</version>
<version>4.3.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public AbstractDescribeSensorDAO(String service) {
@Override
protected void setOperationsMetadata(OwsOperation opsMeta, String service, String version)
throws OwsExceptionReport {
addProcedureParameter(opsMeta);
addPublishedProcedureParameter(opsMeta);
Set<String> pdfs = getCache().getRequstableProcedureDescriptionFormat();
if (version.equals(Sos1Constants.SERVICEVERSION)) {
pdfs.addAll(CodingRepository.getInstance().getSupportedProcedureDescriptionFormats(SosConstants.SOS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected void setOperationsMetadata(final OwsOperation opsMeta, final String se
final Collection<String> featureIDs = SosHelper.getFeatureIDs(getCache().getFeaturesOfInterest(), version);

addPublishedProcedureParameter(opsMeta);
addFeatureOfInterestParameter(opsMeta, version);
addPublishedFeatureOfInterestParameter(opsMeta, version);
addPublishedObservablePropertyParameter(opsMeta);

// TODO constraint srid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public interface HibernateDatasourceConstants {

String HIBERNATE_DEFAULT_OGM_PACKAGE = "org.n52.sos.ds.hibernate.ogm.entities";

String HIBERNATE_DATASOURCE_TIMEZONE = "hibernate.datasource.timezone";

public enum DatabaseConcept {
OLD_CONCEPT("Old concept"),
SERIES_CONCEPT("Series concept"),
Expand Down
Loading

0 comments on commit b125bab

Please sign in to comment.