Changeset 5266
- Timestamp:
- 05/22/14 14:22:49 (10 years ago)
- Location:
- DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml
r5203 r5266 363 363 <netbeans.hint.license>gpl20</netbeans.hint.license> 364 364 <plugin.license.copyrightYear>2013</plugin.license.copyrightYear> 365 <project.version>1.4 </project.version>365 <project.version>1.4.1</project.version> 366 366 <shibboleth.version>1.0.4</shibboleth.version> 367 367 </properties> -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java
r5174 r5266 98 98 } 99 99 100 public static String welcomeString(String baseUri ) {100 public static String welcomeString(String baseUri, String remoteID) { 101 101 String welcome = "<!DOCTYPE html><body>" 102 + "You are logged in.<br>" 102 + "You are logged in as " 103 + remoteID + ".<br>" 103 104 + "<h3>Welcome to DASISH Webannotator (DWAN)</h3><br>" 104 105 + "<a href=\"" + baseUri + "\"> To DWAN's test jsp page</a>" -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AutheticationResource.java
r5088 r5266 19 19 20 20 import eu.dasish.annotation.backend.Helpers; 21 import eu.dasish.annotation.backend.NotInDataBaseException; 21 22 import eu.dasish.annotation.schema.ObjectFactory; 22 23 import eu.dasish.annotation.schema.Principal; … … 41 42 public class AutheticationResource extends ResourceResource { 42 43 43 44 45 44 @GET 46 45 @Produces(MediaType.TEXT_XML) … … 64 63 @Transactional(readOnly = true) 65 64 public String login() { 66 return Helpers.welcomeString(uriInfo.getBaseUri().toString() + ".."); 65 try { 66 Number principalID = this.getPrincipalID(); 67 String remoteID = dbDispatcher.getPrincipalRemoteID(principalID); 68 return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", remoteID); 69 } catch (IOException e) { 70 return e.getMessage(); 71 } 67 72 } 68 73 … … 73 78 public void logout() throws IOException, ServletException { 74 79 httpServletRequest.getSession().invalidate(); 75 httpServletResponse.sendRedirect( context.getInitParameter("eu.dasish.annotation.backend.logout"));80 httpServletResponse.sendRedirect(uriInfo.getBaseUri().toString() + ".."+context.getInitParameter("eu.dasish.annotation.backend.logout")); 76 81 } 77 78 79 82 } -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/PrincipalResource.java
r5186 r5266 311 311 public JAXBElement<Principal> updatePrincipalFromForm(@FormParam("name") String name, @FormParam("email") String email) 312 312 throws IOException { 313 313 314 314 Principal newPrincipal = new Principal(); 315 315 newPrincipal.setDisplayName(name); … … 326 326 public Principal apply(Map params) throws NotInDataBaseException { 327 327 Principal principal = (Principal) params.get("newPrincipal"); 328 Number principalID = (Number) params.get("principalID"); 329 String principalURI = dbDispatcher.getResourceURI(principalID, Resource.PRINCIPAL); 330 principal.setURI(principalURI); 328 331 Number principalIDupd = dbDispatcher.updatePrincipal(principal); 329 332 return dbDispatcher.getPrincipal(principalIDupd); -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/ResourceResource.java
r5088 r5266 62 62 String remotePrincipal = httpServletRequest.getRemoteUser(); 63 63 if (remotePrincipal != null) { 64 if (!remotePrincipal.equals( "anonymous")) {64 if (!remotePrincipal.equals(anonym)) { 65 65 try { 66 66 return dbDispatcher.getPrincipalInternalIDFromRemoteID(remotePrincipal); 67 67 } catch (NotInDataBaseException e) { 68 68 loggerServer.info(e.toString()); 69 loggerServer.info("The record for the user with the Shibbolethid " + remotePrincipal + " will be generated now automatically.");69 loggerServer.info("The record for the user with the id " + remotePrincipal + " will be generated now automatically."); 70 70 try { 71 71 try { -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/WelcomeResource.java
r4969 r5266 36 36 @Produces(MediaType.TEXT_HTML) 37 37 @Path("") 38 public String login() { 39 return Helpers.welcomeString(uriInfo.getBaseUri().toString() + ".."); 38 public String status() { 39 String remotePrincipal= httpServletRequest.getRemoteUser(); 40 if (remotePrincipal != null) { 41 return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..",remotePrincipal); 42 } 43 else { 44 return Helpers.welcomeString(uriInfo.getBaseUri().toString() + "..", "null-principal"); 45 } 40 46 } 41 47 } -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml
r5203 r5266 47 47 <param-name>eu.dasish.annotation.backend.logout</param-name> 48 48 <!-- <param-value>/ds/webannotator?shhaaDo=lO</param-value>--> 49 <param-value>/ds/webannotator/j_spring_security_logout</param-value> 50 <!-- <param-value>/annotator-backend/j_spring_security_logout</param-value> --> 49 <!-- <param-value>/ds/webannotatornonshibb/j_spring_security_logout</param-value>--> 50 <!-- <param-value>/ds/webannotator-basic/j_spring_security_logout</param-value>--> 51 <param-value>/j_spring_security_logout</param-value> 51 52 </context-param> 52 53 -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp
r5139 r5266 24 24 <p><a href="https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI">https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI</a></p> 25 25 <br> 26 <h3> You are not necessarily logged in.</h3>26 <h3>Services for which you do not need to be logged-in</h3> 27 27 <br> 28 28 <a href="registerNonShibbolethPrincipal.html"> Register a non-shibboleth user</a> <br> 29 29 <br> 30 30 <a href="registerShibbolethPrincipal.html"> Register a shibboleth user</a> <br> 31 <br>31 <!-- <br> 32 32 <a href="registerShibbolethAlsoAsNonShibboleth.html"> Register an existing shibboleth user as a non-shibboleth as well.</a> <br> 33 <br> 33 <br>--> 34 34 <br> 35 35 <a href="api/authentication/login"> login </a> <br> … … 37 37 38 38 <br> 39 <h3> You are logged in.</h3>39 <h3>Services for which you need to be logged in</h3> 40 40 <br> 41 41 <a href="api/authentication/logout"> logout</a> <br> … … 49 49 GET <a href="api/principals/admin">api/principals/admin</a><br> 50 50 GET <a href="api/principals/00000000-0000-0000-0000-0000000000112">api/principals/00000000-0000-0000-0000-0000000000112</a> <br> 51 GET <a href="api/principals/00000000-0000-0000-0000-0000000000112/current">api/principals/00000000-0000-0000-0000-0000000000112/current</a> !Problem: how to ask the servlet if the given user is logged in, may be by some other running somewhere client<br> 51 GET <a href="api/principals/00000000-0000-0000-0000-0000000000112/current">api/principals/00000000-0000-0000-0000-0000000000112/current</a><br> 52 <!-- !Problem: how to ask the servlet if the given user is logged in, may be by some other running somewhere client<br> --> 52 53 GET <a href="api/principals/info?email=Twan.Goosen@mpi.nl">api/principals/info?email=Twan.Goosen@mpi.nl</a> <br> 53 54 GET <a href="api/annotations?link=Sagrada_Fam%C3%ADlia">api/annotations?link=Sagrada_Fam%C3%ADlia</a> <br> 54 55 GET <a href="api/annotations?link=Antoni_Gaud%C3%AD">api/annotations?link=Antoni_Gaud%C3%AD</a> <br> 55 GET <a href="api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a> 56 !Comment: What is "namespace" query parameter? Must be implemented and tested <br>56 GET <a href="api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a><br> 57 <!-- !Comment: What is "namespace" query parameter? Must be implemented and tested <br>--> 57 58 GET <a href="api/annotations/00000000-0000-0000-0000-000000000022">api/annotations/00000000-0000-0000-0000-000000000022</a> </br> 58 59 GET <a href="api/annotations/00000000-0000-0000-0000-000000000022/targets">api/annotations/00000000-0000-0000-0000-000000000022/targets</a> </br> … … 60 61 GET <a href="api/targets/00000000-0000-0000-0000-000000000032">api/targets/00000000-0000-0000-0000-000000000032</a> <br> 61 62 GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a> <br> 62 GET <a href="api/cached/00000000-0000-0000-0000-000000000051/metadata">api/cached/00000000-0000-0000-0000-000000000051/metadata</a><br> 63 GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata</a><br> 64 GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream</a><br> 63 65 GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content</a><br> 64 GET <a href="api/cached/00000000-0000-0000-0000-000000000511/stream">api/cached/00000000-0000-0000-0000-000000000511/stream</a>66 65 67 66 68 <br> -
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/logout.jsp
r5014 r5266 25 25 <body> 26 26 You are logged out.<br> 27 <a href="api/.."> To DWAN's maintest page.</a>27 <a href="api/.."> To DWAN's jsp test page.</a> 28 28 </body> 29 29 </html>
Note: See TracChangeset
for help on using the changeset viewer.