merge from develop before releasing candidate

.gitignore

@@ -4,3 +4,10 @@ target
 .externalToolBuilders
 .settings
 META-INF
+output.txt
+restful-timeseries-webapp/src/main/tmp/
+sensorwebclient-webapp/nb-configuration.xml
+restful-timeseries-webapp/nbactions.xml
+sensorwebclient-webapp/nbactions.xml
+/sensorwebclient-hydro/src/test/resources/files/KiWIS_SOS_Capabilities.xml
+/sensorwebclient-hydro/src/test/java/org/n52/server/sos/connector/hydro/lanuv/LanuvSosMetadataHandlerTest.java

.travis.yml

@@ -0,0 +1,9 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+
+irc:
+  channels:
+    - "irc.freenode.org#52north"
+  use_notice: true

NOTICE

@@ -0,0 +1,164 @@
+Copyright 2013 52°North Initiative for Geospatial Open Source Software GmbH
+
+Licensed under GNU General Public License, v2.0
+
+This project includes:
+  52North OX-Framework SML under GNU General Public License, v2.0
+  52North OxFramework Common under GNU General Public License, v2.0
+  52North OxFramework OWS under GNU General Public License, v2.0
+  52North OxFramework SWES under GNU General Public License, v2.0
+  52North OxFramework Third Party - NanoHTTPD under BSD 3-clause "New" or "Revised" License
+  52North OxFramework Third Party - NCName resolver under BSD 2-clause "Simplified" or "FreeBSD" License
+  52North OxFramework Third Party - Saxon under Apache License 2.0
+  52North OxFramework Xmlbeans Handling under GNU General Public License, v2.0
+  52North Sensor Web Client under GNU General Public License, v2.0
+  52North Sensor Web Client PDF report structure under GNU General Public License, v2.0
+  AntLR under Public Domain
+  AOP alliance under Public Domain
+  Apache FOP under The Apache Software License, Version 2.0
+  Apache Log4j under The Apache Software License, Version 2.0
+  Apache XML Graphics Commons under The Apache Software License, Version 2.0
+  API interfaces under Lesser General Public License (LGPL)
+  Avalon Framework API under The Apache Software License, Version 2.0
+  Avalon Framework Implementation under The Apache Software License, Version 2.0
+  Batik animation engine under The Apache Software License, Version 2.0
+  Batik AWT utilities under The Apache Software License, Version 2.0
+  Batik bridge classes under The Apache Software License, Version 2.0
+  Batik CSS engine under The Apache Software License, Version 2.0
+  Batik DOM implementation under The Apache Software License, Version 2.0
+  Batik extension classes under The Apache Software License, Version 2.0
+  Batik external code under The Apache Software License, Version 2.0
+  Batik GVT (Graphics Vector Tree) under The Apache Software License, Version 2.0
+  Batik Java2D SVG generator under The Apache Software License, Version 2.0
+  Batik scripting language classes under The Apache Software License, Version 2.0
+  Batik SVG DOM implementation under The Apache Software License, Version 2.0
+  Batik SVG microsyntax parser library under The Apache Software License, Version 2.0
+  Batik SVG transcoder classes under The Apache Software License, Version 2.0
+  Batik utility library under The Apache Software License, Version 2.0
+  Batik XML utility library under The Apache Software License, Version 2.0
+  Bean Validation API under Apache License, Version 2.0
+  Commons Codec under The Apache Software License, Version 2.0
+  Commons Lang under The Apache Software License, Version 2.0
+  Commons Logging under The Apache Software License, Version 2.0
+  Commons Pool under The Apache Software License, Version 2.0
+  commons-collections under The Apache Software License, Version 2.0
+  Connector for an ArcGIS SOS extension. under GNU General Public License, v2.0
+  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)
+  Ehcache Core under The Apache Software License, Version 2.0
+  EPSG Authority Service using HSQL database under Lesser General Public License (LGPL) or EPSG database distribution license or BSD License for HSQL
+  FindBugs-jsr305 under The Apache Software License, Version 2.0
+  gimv under The Apache Software License, Version 2.0
+  GRDC schema binding under GNU General Public License, v2.0
+  Guava: Google Core Libraries for Java under The Apache Software License, Version 2.0
+  gwt-openlayers-client under The Apache Software License, Version 2.0
+  gwt-servlet under GWT Terms
+  gwt-user under GWT Terms
+  Hamcrest All under New BSD License
+  Hamcrest Core under New BSD License
+  Hibernate Core under GNU Lesser General Public License
+  Hibernate Validator Engine under Apache License, Version 2.0
+  HSQLDB under HSQLDB License
+  HttpClient under Apache License
+  HttpCore under Apache License
+  IO under The Apache Software License, Version 2.0
+  isorelax under MIT license
+  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
+  jackson-module-jsonSchema under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
+  Java Excel API under GNU Lesser General Public License
+  Java Property Utility under The Apache Software License, Version 2.0
+  Java Transaction API under Common Development and Distribution License (CDDL), version 1.0
+  JavaBeans Activation Framework (JAF) under Common Development and Distribution License (CDDL) v1.0
+  JavaMail API under Common Development and Distribution License (CDDL) v1.0
+  Javassist under MPL 1.1 or LGPL 2.1
+  JBoss Logging 3 under GNU Lesser General Public License, version 2.1
+  JCL 1.1.1 implemented over SLF4J under MIT License
+  jcommon under GNU Lesser General Public Licence
+  jdom under JDOM license, https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt
+  jfreechart under GNU Lesser General Public Licence
+  jgridshift under GNU Lesser General Public License, version 2.0 (LGPLv2)
+  Joda time under Apache 2
+  JSON (JavaScript Object Notation) under provided without support or warranty
+  jsr-275 under BSD License
+  JTS Topology Suite under Lesser General Public License (LGPL)
+  jts4gwt under GNU Lesser General Public License, Version 2.0
+  JUnit under Common Public License Version 1.0
+  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
+  Main module under Lesser General Public License (LGPL)
+  Metadata under Lesser General Public License (LGPL)
+  OASIS WS-N specification schemas - including WS-BrokeredNotification (v1.3) under The Apache Software License, Version 2.0
+  OASIS WS-Resources specification schemas v1.2 under The Apache Software License, Version 2.0
+  OGC Context schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC EML schema 0.0.1 (OGC Discussion Paper 08-132) under The Apache Software License, Version 2.0
+  OGC Filter schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC Filter schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC GML schema (spec. v3.1.1) under The Apache Software License, Version 2.0
+  OGC GML schema (spec. v3.2.1) under The Apache Software License, Version 2.0
+  OGC O&M schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC O&M schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC OWS schema (spec. v1.1.0) under The Apache Software License, Version 2.0
+  OGC Sampling schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC Sampling schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC SensorML schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC SensorML schema (spec. v1.0.1) under The Apache Software License, Version 2.0
+  OGC SES schema 0.3.0 (OGC Discussion Paper 08-133) under The Apache Software License, Version 2.0
+  OGC SLD schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC SOS schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC SOS schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC SWECommon schema (spec. v1.0.0) under The Apache Software License, Version 2.0
+  OGC SWECommon schema (spec. v1.0.1) under The Apache Software License, Version 2.0
+  OGC SWECommon schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC SWES schema (spec. v2.0) under The Apache Software License, Version 2.0
+  OGC WaterML schema (spec. v2.0) under The Apache Software License, Version 2.0
+  Open GIS Interfaces under OGC copyright or Lesser General Public License (LGPL)
+  OxF Features under GNU General Public License, v2.0
+  OxFramework Adapters API under GNU General Public License, v2.0
+  OxFramework SES Adapter under GNU General Public License, v2.0
+  OxFramework SOS Adapter under GNU General Public License, v2.0
+  PostgreSQL JDBC Driver under BSD License
+  Referencing services under Lesser General Public License (LGPL)
+  RESTful Timeseries Web Application under GNU General Public License, v2.0
+  Saxon-HE under Mozilla Public License Version 1.0
+  Sensor Web Client API under GNU General Public License, v2.0
+  Sensor Web Client External Tools under GNU General Public License, v2.0
+  Sensor Web Client Web Application under GNU General Public License, v2.0
+  Sensor Web Timeseries API - IO under GNU General Public License, Version 2.0
+  Sensor Web Timeseries API - REST Binding under GNU General Public License, Version 2.0
+  Sensor Web Timeseries API - SPI under GNU General Public License, Version 2.0
+  servlet-api under CDDL 1.1 or GPL2 w/ CPE
+  SES RPC Bindings under GNU General Public License, v2.0
+  SES Server Components under GNU General Public License, v2.0
+  Shared SES Components under GNU General Public License, v2.0
+  Shared SOS Components under GNU General Public License, v2.0
+  SLF4J API Module under MIT License
+  smartgwt under GNU Lesser General Public License (LGPL)
+  SOS Hydrology Profil Connector under GNU General Public License, v2.0
+  SOS Rest Interface under GNU General Public License, v2.0
+  SOS RPC Bindings under GNU General Public License, v2.0
+  SOS Server Components under GNU General Public License, v2.0
+  Spring AOP under The Apache Software License, Version 2.0
+  Spring Beans under The Apache Software License, Version 2.0
+  Spring Context under The Apache Software License, Version 2.0
+  Spring Core under The Apache Software License, Version 2.0
+  Spring Expression Language (SpEL) under The Apache Software License, Version 2.0
+  Spring Object/XML Marshalling under The Apache Software License, Version 2.0
+  Spring Web under The Apache Software License, Version 2.0
+  Spring Web MVC under The Apache Software License, Version 2.0
+  StAX API under The Apache Software License, Version 2.0
+  swe-common-data-framework under Mozilla Public License version 1.1
+  User Interface under GNU General Public License, v2.0
+  vecmath under GNU General Public License (GPL), version 2, with the CLASSPATH exception
+  W3C SOAP specification recommondation (v1.2 part 1) under The Apache Software License, Version 2.0
+  W3C WS-Addressing specification schemas (v1.0) under The Apache Software License, Version 2.0
+  W3C xlink schema (spec. v1.1.0) under The Apache Software License, Version 2.0
+  xalan under The Apache Software License, Version 2.0
+  Xerces2 Java Parser under The Apache Software License, Version 2.0
+  XML Commons External Components XML APIs under The Apache Software License, Version 2.0
+  XML Commons External Components XML APIs Extensions 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
+

RELEASE_NOTES

@@ -3,25 +3,41 @@ For a complete Release Notes overview visit
   https://wiki.52north.org/bin/view/SensorWeb/SensorWebClientReleaseNotes
 
 
-Release Notes for Sensor Web Client 3.2.0
+Release Notes for Sensor Web Client 3.3.0
 =========================================
-This release contains new features and bugfixes from versions 3.1.x. 
+This release contains new features and bugfixes from versions 3.2.x. 
 
-Most work has been done to create a leightweight RESTful interface to access 
-timeseries data and metadata from external clients (not only from shipped UI).
-A modularization of the UI and its server part has been done to run a server 
-only application to just provide a SOS aggregation layer.
+We moved from SVN to GitHub with this release! Please note that issues are  
+going to be tracked on that platform. Refer to
+
+  https://github.com/52North/SensorWebClient
+
+Most work has been done to separate timeseries-api version 1.0.0 along with
+implementing its service provider interface to provide leightweight RESTful 
+access to timeseries resources. That integration makes accessing timeseries 
+data and metadata from external clients (not only from shipped UI) much more 
+consistent and flexible! Configure your servlet container with a CORS filter 
+and provide the data to external clients.
+
+Another part of the work was to modulerazing IO processing functionality to 
+an external timeseries module. In combination with the timeseries web module 
+provides an interface so that both can be re-used in other applications, e.g.
+directly on an SOS with implementing the interface with DB access to speed 
+up things.
+
+Have a look at 
+
+  https://github.com/52North/timeseries-api
+
+if you are interested in the timeseries-api.
 
 Features:
 ---------
- * Simple REST Client to explore cached metadata
- * Add REST API to parameters, stations, timeseries raw data and metadata
- * Add style options to permalink so that graphs of one permalink renders in same color and line width
- * Removed local repository from root pom.xml as all old dependencies are available from 52n repo now
- * Change Metadata structure, now stations in the metadata have a collection of parameter collections
- * RESTful interface expanded and option added to request metadata specific to an SOS (see https://wiki.52north.org/bin/view/SensorWeb/RESTfulTimeseriesWebApp)
-
-3.1.x Bugfixes:
+ * Create ArcGIS SOS SOE module supporting SOS e-reporting profile
+ * Implement SPI of timeseries-api version 1.0.0-rc.x
+ * Be more graceful when caching a service fails. Won't break cache update for the other configured services.
+
+3.2.x Bugfixes:
 ---------------
  * #923: Stations from the first data provider are missing when starting client via Permalink
  * #924: Timeseries values are not sorted when request timeseries data via GET

contribute.md

@@ -0,0 +1,65 @@
+This is the contribute.md of 52°North project [SensorWebClient](https://github.com/52North/SensorWebClient). Great to have you here! Here are a few ways you can help!
+
+# Contribute.md
+
+## Learn & listen
+Best way to get started is to start with these:
+
+* Mailing list: <http://52north.org/resources/mailing-list-and-forums/>
+* IRC channel:  #52north on irc.freenode.net
+* Website:  <http://52north.org/>
+* Get involved in 52°North: <http://52north.org/about/get-involved/>
+
+## Team Members
+* Henning Bredel [@ridoo](https://github.com/ridoo)
+* Jan Schulte, [@janschulte](http://github.com/janschulte)
+* You?
+
+## Contributor License Agreement
+
+52°North requires all contributors to sign a contributors license agreement (CLA). This is not scary but essential for open source projects to live beyond projects and individual contributions.
+
+Find all information on our licensing page at <http://52north.org/about/licensing/> and our CLA FAQ at <http://52north.org/about/licensing/cla-guidelines>.
+
+## Adding new features
+
+This section includes advice on how to build new features for the project & what kind of process it includes. 
+
+* Create an issue if you want to discuss a certain issue (bug, missing feature, questions, etc.)
+* Fork the repository and do pull requests if you added a feature or fixed a bug (once you have signed a CLA we are allowed to merge your code and add you as contributor)
+* If you send in pull requests, please describe in detail what you are providing with the code
+* Do unit testing of your code, do not hesitate to add unit tests to existing code (breaking dependencies would have to be discussed further)
+* Find some code style settings exported from ecplipse in the `misc` folder
+
+Don’t get discouraged! We estimate that the response time from the
+maintainers is around: 2-4 working days
+
+# Issue Tracker
+
+https://github.com/52North/SensorWebClient/issues
+
+
+
+# Translations
+
+The SensorWebClient is able to switch languages. The [translations available](https://github.com/52North/SensorWebClient/tree/master/sensorwebclient-ui/src/main/resources/org/n52/client) can be found as resources within the user interface module. Add your translations as `messages_<your-language-code>.properties` and [tell the GWT module](https://github.com/52North/SensorWebClient/blob/3666ee1aa9fbd0ebc1801f58afb3848b3740d27a/sensorwebclient-ui/src/main/resources/org/n52/SensorWebClient.gwt.xml#L12-L13) that a further language is available.
+
+
+# Documentation
+
+https://wiki.52north.org/bin/view/SensorWeb/SensorWebClient
+
+
+# Community 
+This section includes ideas on how non-developers can help with the project. Here's a few examples:
+
+* You can help us answer questions our users have [on the Sensor Web mailinglist](http://list.52north.org/mailman/listinfo/swe) or [Sensor Web forum](http://52north.org/resources/mailing-list-and-forums/)
+* You can help write blog posts about the project
+* Create an example of the project in real world by building something or
+showing what others have built. 
+* Write about other people’s projects based on this project. Show how
+it’s used in daily life. Take screenshots and make videos! Share what you have done; we are interested!
+
+# Still Puzzled?
+
+* If you have further questions, contact: [Henning Bredel](mailto:h.bredel@52north.org) | [@ridoo](https://github.com/ridoo)