# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1450457234 -3600
# Node ID 5bdd1631a451e3e2a9ad1ec4a48cdd71ad7ec040
# Parent  90343e38225fa011b8cbfaa4208e227f28d4befc
!!!CAUTION!!! changed services path!

REST servies now listening on /rest/*
Importer/Exporter now listening on /data/$FORMAT/*

diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/KommentarMService.java
--- a/src/main/java/de/intevation/lada/rest/KommentarMService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/KommentarMService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -66,7 +66,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("mkommentar")
+@Path("rest/mkommentar")
 @RequestScoped
 public class KommentarMService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/KommentarPService.java
--- a/src/main/java/de/intevation/lada/rest/KommentarPService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/KommentarPService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -67,7 +67,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("pkommentar")
+@Path("rest/pkommentar")
 @RequestScoped
 public class KommentarPService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/MessprogrammMmtService.java
--- a/src/main/java/de/intevation/lada/rest/MessprogrammMmtService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/MessprogrammMmtService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -66,7 +66,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messprogrammmmt")
+@Path("rest/messprogrammmmt")
 @RequestScoped
 public class MessprogrammMmtService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/MessprogrammService.java
--- a/src/main/java/de/intevation/lada/rest/MessprogrammService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/MessprogrammService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -92,7 +92,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messprogramm")
+@Path("rest/messprogramm")
 @RequestScoped
 public class MessprogrammService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/MessungService.java
--- a/src/main/java/de/intevation/lada/rest/MessungService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/MessungService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -84,7 +84,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messung")
+@Path("rest/messung")
 @RequestScoped
 public class MessungService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/MesswertService.java
--- a/src/main/java/de/intevation/lada/rest/MesswertService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/MesswertService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -84,7 +84,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messwert")
+@Path("rest/messwert")
 @RequestScoped
 public class MesswertService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/OrtService.java
--- a/src/main/java/de/intevation/lada/rest/OrtService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/OrtService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -79,7 +79,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("ort")
+@Path("rest/ortszuordnung")
 @RequestScoped
 public class OrtService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/ProbeService.java
--- a/src/main/java/de/intevation/lada/rest/ProbeService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/ProbeService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -111,7 +111,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("probe")
+@Path("rest/probe")
 @RequestScoped
 public class ProbeService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/QueryService.java
--- a/src/main/java/de/intevation/lada/rest/QueryService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/QueryService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -46,7 +46,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("/query")
+@Path("rest/query")
 @RequestScoped
 public class QueryService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/StatusService.java
--- a/src/main/java/de/intevation/lada/rest/StatusService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/StatusService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -80,7 +80,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("status")
+@Path("rest/status")
 @RequestScoped
 public class StatusService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/UserService.java
--- a/src/main/java/de/intevation/lada/rest/UserService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/UserService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -52,7 +52,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("user")
+@Path("rest/user")
 @RequestScoped
 public class UserService{
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/VersionService.java
--- a/src/main/java/de/intevation/lada/rest/VersionService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/VersionService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -42,7 +42,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("version")
+@Path("rest/version")
 @RequestScoped
 public class VersionService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/ZusatzwertService.java
--- a/src/main/java/de/intevation/lada/rest/ZusatzwertService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/ZusatzwertService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -75,7 +75,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("zusatzwert")
+@Path("rest/zusatzwert")
 @RequestScoped
 public class ZusatzwertService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/exporter/LafExportService.java
--- a/src/main/java/de/intevation/lada/rest/exporter/LafExportService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/exporter/LafExportService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -47,7 +47,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("export")
+@Path("data/laf/export")
 @RequestScoped
 public class LafExportService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/importer/LafImportService.java
--- a/src/main/java/de/intevation/lada/rest/importer/LafImportService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/importer/LafImportService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -34,7 +34,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("import")
+@Path("data/laf/import")
 @RequestScoped
 public class LafImportService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/DatenbasisService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/DatenbasisService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/DatenbasisService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -49,7 +49,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("datenbasis")
+@Path("rest/datenbasis")
 @RequestScoped
 public class DatenbasisService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/DeskriptorService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/DeskriptorService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/DeskriptorService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -62,7 +62,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("deskriptor")
+@Path("rest/deskriptor")
 @RequestScoped
 public class DeskriptorService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/KoordinatenartService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/KoordinatenartService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/KoordinatenartService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -49,7 +49,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("koordinatenart")
+@Path("rest/koordinatenart")
 @RequestScoped
 public class KoordinatenartService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/LocationService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/LocationService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/LocationService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -67,7 +67,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("location")
+@Path("rest/ort")
 @RequestScoped
 public class LocationService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/MesseinheitService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/MesseinheitService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/MesseinheitService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -51,7 +51,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messeinheit")
+@Path("rest/messeinheit")
 @RequestScoped
 public class MesseinheitService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/MessgroesseService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/MessgroesseService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/MessgroesseService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -63,7 +63,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messgroesse")
+@Path("rest/messgroesse")
 @RequestScoped
 public class MessgroesseService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/MessmethodeService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/MessmethodeService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/MessmethodeService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -49,7 +49,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messmethode")
+@Path("rest/messmethode")
 @RequestScoped
 public class MessmethodeService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/MessstelleService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/MessstelleService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/MessstelleService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -56,7 +56,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("messstelle")
+@Path("rest/messstelle")
 @RequestScoped
 public class MessstelleService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/NetzbetreiberService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/NetzbetreiberService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/NetzbetreiberService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -61,7 +61,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("netzbetreiber")
+@Path("rest/netzbetreiber")
 @RequestScoped
 public class NetzbetreiberService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/PflichtmessgroesseService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/PflichtmessgroesseService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/PflichtmessgroesseService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -51,7 +51,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("pflichtmessgroesse")
+@Path("rest/pflichtmessgroesse")
 @RequestScoped
 public class PflichtmessgroesseService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/ProbenartService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/ProbenartService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/ProbenartService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -50,7 +50,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("probenart")
+@Path("rest/probenart")
 @RequestScoped
 public class ProbenartService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/ProbenzusatzService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/ProbenzusatzService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/ProbenzusatzService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -51,7 +51,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("probenzusatz")
+@Path("rest/probenzusatz")
 @RequestScoped
 public class ProbenzusatzService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/StaatService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/StaatService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/StaatService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -55,7 +55,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("staat")
+@Path("rest/staat")
 @RequestScoped
 public class StaatService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/StatusStufeService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/StatusStufeService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/StatusStufeService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -48,7 +48,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("statusstufe")
+@Path("rest/statusstufe")
 @RequestScoped
 public class StatusStufeService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/StatusWertService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/StatusWertService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/StatusWertService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -65,7 +65,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("statuswert")
+@Path("rest/statuswert")
 @RequestScoped
 public class StatusWertService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/UmweltService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/UmweltService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/UmweltService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -50,7 +50,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("umwelt")
+@Path("rest/umwelt")
 @RequestScoped
 public class UmweltService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/rest/stamm/VerwaltungseinheitService.java
--- a/src/main/java/de/intevation/lada/rest/stamm/VerwaltungseinheitService.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/rest/stamm/VerwaltungseinheitService.java	Fri Dec 18 17:47:14 2015 +0100
@@ -64,7 +64,7 @@
  *
  * @author <a href="mailto:rrenkert@intevation.de">Raimund Renkert</a>
  */
-@Path("verwaltungseinheit")
+@Path("rest/verwaltungseinheit")
 @RequestScoped
 public class VerwaltungseinheitService {
 
diff -r 90343e38225f -r 5bdd1631a451 src/main/java/de/intevation/lada/util/auth/ShibbolethFilter.java
--- a/src/main/java/de/intevation/lada/util/auth/ShibbolethFilter.java	Fri Dec 18 17:42:24 2015 +0100
+++ b/src/main/java/de/intevation/lada/util/auth/ShibbolethFilter.java	Fri Dec 18 17:47:14 2015 +0100
@@ -32,7 +32,7 @@
 import org.apache.log4j.Logger;
 
 /** ServletFilter used for Shibboleth authentification. */
-@WebFilter("/*")
+@WebFilter({"/rest/*", "/data/*"})
 public class ShibbolethFilter implements Filter {
 
     private static final String CONFIG_FILE = "/shibboleth.properties";