Changeset 4671 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java

Timestamp:

03/12/14 15:56:47 (10 years ago)

Author:

olhsha

Message:

debugging and testing

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java (modified) (4 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java

@@ -23 +23 @@
 import java.sql.SQLException;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequestWrapper;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.xml.bind.JAXBElement;
@@ -41 +41 @@
 @Transactional(rollbackFor = {Exception.class, SQLException.class, IOException.class, ParserConfigurationException.class})
 public class AutheticationResource extends ResourceResource {
-
+    
+    
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -62 +63 @@
     @Transactional(readOnly = true)
     public JAXBElement<User> loginAndGet() throws IOException {
+        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
         String remoteUser = httpServletRequest.getRemoteUser();
         verboseOutput = new VerboseOutput(httpServletResponse, loggerServer);
         if (remoteUser != null) {
-            if (!remoteUser.equals("anonymous")) {
-                dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+            if (!remoteUser.equals("anonymous")) {                
                 final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(remoteUser);
                 if (remoteUserID != null) {
@@ -85 +86 @@
     @Transactional(readOnly = true)
     public void logout() throws IOException, ServletException {
-        httpServletResponse.sendRedirect("eu.dasish.annotation.backend.logout");
+        httpServletResponse.sendRedirect(context.getInitParameter("eu.dasish.annotation.backend.logout"));
     }
 }