Changeset 5385 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.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/WelcomeResource.java (modified) (2 diffs)

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

@@ -22 +22 @@
 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 org.springframework.stereotype.Component;
 
@@ -39 +41 @@
         String remotePrincipal= httpServletRequest.getRemoteUser();
         if (remotePrincipal != null) {
-        return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..",remotePrincipal);
+        return Helpers.welcomeString(httpServletRequest.getContextPath(),remotePrincipal);
         }
         else {
-           return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", "null-principal"); 
+           return Helpers.welcomeString(httpServletRequest.getContextPath(), "null-principal"); 
         }
     }