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

Timestamp:

06/24/14 17:43:30 (10 years ago)

Author:

olhsha@mpi.nl

Message:

ref --> href
+ xml:id for instances
refactoring

File:

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

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

@@ -19 +19 @@
 
 import eu.dasish.annotation.backend.Helpers;
-import eu.dasish.annotation.backend.NotInDataBaseException;
 import eu.dasish.annotation.schema.ObjectFactory;
 import eu.dasish.annotation.schema.Principal;
@@ -27 +26 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBElement;
 import javax.xml.parsers.ParserConfigurationException;
@@ -41 +42 @@
 @Transactional(rollbackFor = {Exception.class, IOException.class, ParserConfigurationException.class})
 public class AutheticationResource extends ResourceResource {
-
+    
+   
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -66 +68 @@
             Number principalID = this.getPrincipalID();
             String remoteID = dbDispatcher.getPrincipalRemoteID(principalID);
-            return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", remoteID);
+            return Helpers.welcomeString(httpServletRequest.getContextPath(), remoteID);
         } catch (IOException e) {
             return e.getMessage();
@@ -80 +82 @@
         boolean isShibboleth = Boolean.parseBoolean(context.getInitParameter("eu.dasish.annotation.backend.isShibbolethSession"));
         String redirect = isShibboleth ? context.getInitParameter("eu.dasish.annotation.backend.logout") : 
-                uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout");        
+                httpServletRequest.getContextPath() + context.getInitParameter("eu.dasish.annotation.backend.logout");        
         httpServletResponse.sendRedirect(redirect);
     }