Changeset 4593

Timestamp:

02/28/14 10:32:45 (10 years ago)

Author:

olhsha

Message:

fixing tickets 500 and 501: bypassing log-in page when a resource is accessed by a non-logged in user). Instead 401 is sent and the info about the database admin, when necessary. Bugs are fixed. Refactoring.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

@@ -23 +23 @@
         <p><a href="api/myresource">Jersey resource</a>
         <p><a href="https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI">https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI</a></p>
-        <!--        <b>Notebooks</b><br>
-              api/notebooks<br>
-                POST api/annotations and PUT /notebooks/_nid_?annotation=_aid_.<br>
-                <br>
-                GET <a href="api/notebooks">api/notebooks</a> Returns notebook-infos for the notebooks accessible to the current user.<br>
-                GET <a href="api/notebooks/owned">api/notebooks/owned</a> Returns the list of all notebooks owned by the current logged user.<br>
-                GET <a href="api/notebooks/_nid_/readers">api/notebooks/_nid_/readers</a> Returns the list of _uid_ who allowed to read the annotations from notebook.<br>
-                GET <a href="api/notebooks/_nid_/writers">api/notebooks/_nid_/writers</a> Returns the list of _uid_ that can add annotations to the notebook.<br>
-                GET <a href="api/notebooks/_nid_/metadata">api/notebooks/_nid_/metadata</a> Get all metadata about a specified notebook _nid_, including the information if it is private or not.<br>
-                GET <a href="api/notebooks/_nid_?maximumAnnotations=100&startAnnotation=5&orderby=1&orderingMode=0">api/notebooks/_nid_?maximumAnnotations=limit&startAnnotation=offset&orderby=orderby&orderingMode=1|0</a> Get the list of all annotations _aid_-s contained within a Notebook with related metadata. Parameters: _nid_, optional maximumAnnotations specifies the maximum number of annotations to retrieve (default -1, all annotations), optional startAnnotation specifies the starting point from which the annotations will be retrieved (default: -1, start from the first annotation), optional orderby, specifies the RDF property used to order the annotations (default: dc:created ), optional orderingMode specifies if the results should be sorted using a descending order desc=1 or an ascending order desc=0 (default: 0 ).<br>
-                PUT <form action="api/notebooks/_nid_" method="put"><input type="submit" /></form>/notebooks/_nid_      Modify metadata of _nid_. The new notebook?s name must be sent in request?s body.<br>
-                PUT /notebooks/_nid_/_aid_      Adds an annotation _aid_ to the list of annotations of _nid_.<br>        
-        --        PUT <form action="api/notebooks/_nid_/setPrivate=true" method="put"><input type="submit" /></form>api/notebooks/_nid_/setPrivate=[true, false]        Sets the specified Notebook as private or not private.<br>--
-                POST api/notebooks/     Creates a new notebook. This API returns the _nid_ of the created Notebook in response?s payload and the full URL of the notebook adding a Location header into the HTTP response. The name of the new notebook can be specified sending a specific payload.<br>
-                POST api/notebooks/_nid_        Creates a new annotation in _nid_. The content of an annotation is given in the request body. In fact this is a short cut of two actions:<br>
-                DELETE <form action="api/notebooks/_nid_" method="DELETE"><input type="submit" /></form>api/notebooks/_nid_     Delete _nid_. Annotations stay, they just lose connection to _nid_.<br> 
-        -->
-        <!--  <br> 
-         <a href="spring_security_login"> Login</a> <br> 
+      
+        <br> 
+         <a href="api/authentication/login"> Login/check</a> <br> 
          <br> 
-         <a href="j_spring_security_logout"> Logout</a> <br> -->
+         <a href="api/authentication/logout"> Logout</a> <br> 
         <br> 
         <b>Test URI-s</b><br>