Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/server/UserServiceImpl.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 | 3a8884e06aaa |
| children | 5e4d91304484 |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/server/UserServiceImpl.java Tue Sep 04 14:19:23 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/UserServiceImpl.java Fri Sep 07 12:03:15 2012 +0000 @@ -8,21 +8,17 @@ import org.apache.log4j.Logger; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - import de.intevation.artifacts.common.ArtifactNamespaceContext; import de.intevation.artifacts.common.utils.XMLUtils; 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.UserService; +import de.intevation.flys.client.server.auth.UserClient; import de.intevation.flys.client.shared.exceptions.AuthenticationException; import de.intevation.flys.client.shared.model.DefaultUser; import de.intevation.flys.client.shared.model.User; - /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ @@ -40,22 +36,13 @@ { String url = getServletContext().getInitParameter("server-url"); - HttpClient client = new HttpClientImpl(url); + UserClient client = new UserClient(url); + de.intevation.flys.client.server.auth.User loginuser = getUser(); try { - Document users = (Document) client.listUsers(); - - String XPATH_USERS = "/art:users/art:user"; + Element user = client.findUser(loginuser); - NodeList theUsers = (NodeList) XMLUtils.xpath( - users, - XPATH_USERS, - XPathConstants.NODESET, - ArtifactNamespaceContext.INSTANCE); - - if (theUsers != null && theUsers.getLength() > 0) { - Element user = (Element)theUsers.item(0); - + if (user != null) { String uuid = user.getAttributeNS( ArtifactNamespaceContext.NAMESPACE_URI, "uuid"); String name = user.getAttributeNS(