Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java @ 3548:fed914a42a10
Merged revisions 5373,5377-5378 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-client/trunk
........
r5373 | ingo | 2012-09-07 11:21:25 +0200 (Fr, 07 Sep 2012) | 1 line
Tagged 'flys-client' as 2.9
........
r5377 | bricks | 2012-09-07 13:37:00 +0200 (Fr, 07 Sep 2012) | 2 lines
Move RemoteServiceServlet to server package
........
r5378 | bricks | 2012-09-07 13:58:11 +0200 (Fr, 07 Sep 2012) | 4 lines
Refactor UserServiceImpl getCurrentUser method
Return the logged in user in getCurrentUser method.
........
flys-client/tags/2.9@5381 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 07 Sep 2012 12:03:15 +0000 |
| parents | 98fac4872ae6 |
| children |
comparison
equal
deleted
inserted
replaced
| 3547:8a16ff3b9a7f | 3548:fed914a42a10 |
|---|---|
| 3 import de.intevation.artifacts.common.ArtifactNamespaceContext; | 3 import de.intevation.artifacts.common.ArtifactNamespaceContext; |
| 4 import de.intevation.artifacts.common.utils.XMLUtils; | 4 import de.intevation.artifacts.common.utils.XMLUtils; |
| 5 import de.intevation.artifacts.httpclient.exceptions.ConnectionException; | 5 import de.intevation.artifacts.httpclient.exceptions.ConnectionException; |
| 6 import de.intevation.artifacts.httpclient.http.HttpClient; | 6 import de.intevation.artifacts.httpclient.http.HttpClient; |
| 7 import de.intevation.artifacts.httpclient.http.HttpClientImpl; | 7 import de.intevation.artifacts.httpclient.http.HttpClientImpl; |
| 8 import de.intevation.flys.client.client.services.RemoteServiceServlet; | |
| 9 import de.intevation.flys.client.client.services.RiverService; | 8 import de.intevation.flys.client.client.services.RiverService; |
| 10 import de.intevation.flys.client.server.auth.User; | 9 import de.intevation.flys.client.server.auth.User; |
| 11 import de.intevation.flys.client.shared.exceptions.ServerException; | 10 import de.intevation.flys.client.shared.exceptions.ServerException; |
| 12 import de.intevation.flys.client.shared.model.DefaultRiver; | 11 import de.intevation.flys.client.shared.model.DefaultRiver; |
| 13 import de.intevation.flys.client.shared.model.River; | 12 import de.intevation.flys.client.shared.model.River; |