# HG changeset patch
# User Bjoern Ricks <bjoern.ricks@intevation.de>
# Date 1347017820 0
# Node ID b0c1d9e06a694e97165e6f086d9eaa78a15e34d2
# Parent  558c5463ceca9f75cd92d2bf439d5d942a3af7c9
Move RemoteServiceServlet to server package


flys-client/trunk@5377 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 558c5463ceca -r b0c1d9e06a69 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Fri Sep 07 09:21:25 2012 +0000
+++ b/flys-client/ChangeLog	Fri Sep 07 11:37:00 2012 +0000
@@ -1,3 +1,11 @@
+2012-09-04	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/server/RemoteServiceServlet.java,
+	  src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java,
+	  src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java,
+	  src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java:
+	  Move RemoteServiceServlet to server package.
+
 2012-09-07  Ingo Weinzierl <ingo@intevation.de>
 
 	Tagged module as '2.9'.
diff -r 558c5463ceca -r b0c1d9e06a69 flys-client/src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/RemoteServiceServlet.java	Fri Sep 07 09:21:25 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-package de.intevation.flys.client.client.services;
-
-import de.intevation.flys.client.server.auth.User;
-
-import javax.servlet.http.HttpSession;
-
-public class RemoteServiceServlet
-extends      com.google.gwt.user.server.rpc.RemoteServiceServlet
-{
-    /**
-     * Return the current logged in user from the HTTP Session
-    */
-    public User getUser() {
-        HttpSession session = this.getThreadLocalRequest().getSession();
-        return (User)session.getAttribute("user");
-    }
-}
diff -r 558c5463ceca -r b0c1d9e06a69 flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java	Fri Sep 07 09:21:25 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/ModuleServiceImpl.java	Fri Sep 07 11:37:00 2012 +0000
@@ -6,7 +6,6 @@
 import de.intevation.artifacts.httpclient.http.HttpClient;
 import de.intevation.artifacts.httpclient.http.HttpClientImpl;
 import de.intevation.flys.client.client.services.ModuleService;
-import de.intevation.flys.client.client.services.RemoteServiceServlet;
 import de.intevation.flys.client.server.auth.User;
 import de.intevation.flys.client.shared.exceptions.ServerException;
 import de.intevation.flys.client.shared.model.DefaultModule;
diff -r 558c5463ceca -r b0c1d9e06a69 flys-client/src/main/java/de/intevation/flys/client/server/RemoteServiceServlet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/RemoteServiceServlet.java	Fri Sep 07 11:37:00 2012 +0000
@@ -0,0 +1,17 @@
+package de.intevation.flys.client.server;
+
+import de.intevation.flys.client.server.auth.User;
+
+import javax.servlet.http.HttpSession;
+
+public class RemoteServiceServlet
+extends      com.google.gwt.user.server.rpc.RemoteServiceServlet
+{
+    /**
+     * Return the current logged in user from the HTTP Session
+    */
+    public User getUser() {
+        HttpSession session = this.getThreadLocalRequest().getSession();
+        return (User)session.getAttribute("user");
+    }
+}
diff -r 558c5463ceca -r b0c1d9e06a69 flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java	Fri Sep 07 09:21:25 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java	Fri Sep 07 11:37:00 2012 +0000
@@ -5,7 +5,6 @@
 import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
 import de.intevation.artifacts.httpclient.http.HttpClient;
 import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.flys.client.client.services.RemoteServiceServlet;
 import de.intevation.flys.client.client.services.RiverService;
 import de.intevation.flys.client.server.auth.User;
 import de.intevation.flys.client.shared.exceptions.ServerException;