--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java	Fri Sep 05 12:58:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java	Fri Sep 05 13:19:22 2014 +0200
@@ -47,7 +47,7 @@
 extends      RemoteServiceServlet
 implements   RiverInfoService
 {
-    private static final Logger logger =
+    private static final Logger log =
         Logger.getLogger(RiverInfoServiceImpl.class);
 
     public static final String ERROR_NO_RIVER_INFO_FOUND =
@@ -65,7 +65,7 @@
         DateFormat.SHORT, Locale.GERMANY);
 
     public RiverInfo getGauges(String river) throws ServerException {
-        logger.info("RiverInfoServiceImpl.getRiverInfo");
+        log.info("RiverInfoServiceImpl.getRiverInfo");
 
         String url = getServletContext().getInitParameter("server-url");
 
@@ -93,20 +93,20 @@
 
             riverinfo.setGauges(gauges);
 
-            logger.debug("Finished RiverInfoService.getGauges.");
+            log.debug("Finished RiverInfoService.getGauges.");
 
             return riverinfo;
         }
         catch (ConnectionException ce) {
-            logger.error(ce, ce);
+            log.error(ce, ce);
         }
 
-        logger.warn("No gauge found");
+        log.warn("No gauge found");
         throw new ServerException(ERROR_NO_RIVER_INFO_FOUND);
     }
 
     public RiverInfo getMeasurementStations(String river) throws ServerException {
-        logger.info("RiverInfoServiceImpl.getMeasurementStations");
+        log.info("RiverInfoServiceImpl.getMeasurementStations");
 
         String url = getServletContext().getInitParameter("server-url");
 
@@ -133,15 +133,15 @@
 
             riverinfo.setMeasurementStations(mstations);
 
-            logger.debug("Finished MeasurementStationInfoService.");
+            log.debug("Finished MeasurementStationInfoService.");
 
             return riverinfo;
         }
         catch (ConnectionException ce) {
-            logger.error(ce, ce);
+            log.error(ce, ce);
         }
 
-        logger.warn("No measurement station found");
+        log.warn("No measurement station found");
         throw new ServerException(ERROR_NO_RIVER_INFO_FOUND);
     }
 
@@ -156,7 +156,7 @@
             return Double.valueOf(value);
         }
         catch(NumberFormatException e) {
-            logger.error(e, e);
+            log.error(e, e);
             return null;
         }
     }
@@ -169,7 +169,7 @@
             return Long.valueOf(value);
         }
         catch(NumberFormatException e) {
-            logger.error(e, e);
+            log.error(e, e);
             return null;
         }
     }
@@ -182,7 +182,7 @@
             return Integer.valueOf(value);
         }
         catch(NumberFormatException e) {
-            logger.error(e, e);
+            log.error(e, e);
             return null;
         }
     }
@@ -195,7 +195,7 @@
             return DATE_FORMAT.parse(value);
         }
         catch(ParseException e) {
-            logger.error(e, e);
+            log.error(e, e);
             return null;
         }
     }
@@ -214,10 +214,10 @@
         ArrayList<MeasurementStation> mstations = new ArrayList<MeasurementStation>(num);
 
         if (num == 0) {
-            logger.warn("No measurement station found.");
+            log.warn("No measurement station found.");
         }
         else {
-            logger.debug("Found " + num + " measurement stations.");
+            log.debug("Found " + num + " measurement stations.");
 
             for (int i = 0; i < num; i++) {
                 Element stationele = (Element)stationnodes.item(i);
@@ -252,7 +252,7 @@
                 }
 
 
-                logger.debug("Found measurement station with name " + mname);
+                log.debug("Found measurement station with name " + mname);
 
                 MeasurementStation station = new DefaultMeasurementStation(
                         rivername,
@@ -289,10 +289,10 @@
         ArrayList<GaugeInfo> gauges = new ArrayList<GaugeInfo>(num);
 
         if (num == 0) {
-            logger.warn("No gauge info found.");
+            log.warn("No gauge info found.");
         }
         else {
-            logger.debug("Found " + num + " gauges.");
+            log.debug("Found " + num + " gauges.");
 
             for (int i = 0; i < num; i++) {
                 Element gaugeele = (Element)gaugenodes.item(i);
@@ -320,7 +320,7 @@
                 String gofficial = gaugeele.getAttributeNS(
                         ArtifactNamespaceContext.NAMESPACE_URI, "official");
 
-                logger.debug("Found gauge with name " + gname);
+                log.debug("Found gauge with name " + gname);
 
                 GaugeInfo gaugeinfo = new DefaultGaugeInfo(
                         rivername,
@@ -371,7 +371,7 @@
         String rmuuid = riverresp.getAttributeNS(
                 ArtifactNamespaceContext.NAMESPACE_URI, "model-uuid");
 
-        logger.debug("River is " + rname);
+        log.debug("River is " + rname);
 
         boolean kmup = rkmup.equalsIgnoreCase("true");
         DefaultRiverInfo riverinfo = new DefaultRiverInfo(