Changeset 4997

Timestamp:

04/16/14 19:08:59 (10 years ago)

Author:

olhsha@mpi.nl

Message:

login-via-form

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main

Files:

• java/eu/dasish/annotation/backend/Helpers.java (modified) (1 diff)
• resources/spring-config/springSecurity.xml (modified) (1 diff)
• webapp/createprincipal.jsp (added)
• webapp/error.jsp (added)
• webapp/index.jsp (modified) (2 diffs)
• webapp/loginform.jsp (added)
• webapp/logout.jsp (added)

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

@@ -70 +70 @@
                 + "You are logged in.<br>"
                 + "<h3>Welcome to DASISH Webannotator (DWAN)</h3><br>"
-                + "<a href=\"" + baseUri + "\"> to DWAN's test jsp page</a>"
+                + "<a href=\"" + baseUri + "\"> To DWAN's test jsp page</a>"
                 + "</body>";
         return welcome;

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/resources/spring-config/springSecurity.xml

@@ -34 +34 @@
     <security:http>
         <security:intercept-url pattern="/api/authentication/login" access="ROLE_USER" />
-        <security:http-basic />
-        <security:logout delete-cookies="JSESSIONID"/>
+        <security:form-login 
+            login-page="/loginform.jsp" 
+            default-target-url="/api" 
+            authentication-failure-url="/error.jsp" 
+            username-parameter="username"
+            password-parameter="password" />
+        <security:logout delete-cookies="JSESSIONID"  logout-success-url="/logout.jsp"/>
     </security:http>
     

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

@@ -24 +24 @@
         <p><a href="https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI">https://trac.clarin.eu/wiki/DASISH/SpecificationDocument#RESTAPI</a></p>
       
-        <br> 
+<!--        <br> 
+        <a href="createprincipal.jsp"> create principal record</a> <br> 
+        <br> -->
         <a href="api/authentication/login"> login  </a> <br> 
          <br> 
         <a href="api/authentication/logout"> logout</a> <br> 
-
+        <br> 
+        
         <b>Test URI-s</b><br>
         <b>All output xml-s are valid w.r.t. the schema</b><br>
@@ -40 +43 @@
         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> 
         !Comment: What is "namespace" query parameter? Must be implemented and tested <br>
-        GET <a href="api/annotations/00000000-0000-0000-0000-000000000021">api/annotations/00000000-0000-0000-0000-000000000021</a>  </br>
-        GET <a href="api/annotations/00000000-0000-0000-0000-000000000021/targets">api/annotations/00000000-0000-0000-0000-000000000021/targets</a>  </br>
-        GET <a href="api/annotations/00000000-0000-0000-0000-000000000021/permissions">api/annotations/00000000-0000-0000-0000-000000000021/permissions</a><br>
+        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022">api/annotations/00000000-0000-0000-0000-000000000022</a>  </br>
+        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022/targets">api/annotations/00000000-0000-0000-0000-000000000022/targets</a>  </br>
+        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022/permissions">api/annotations/00000000-0000-0000-0000-000000000022/permissions</a><br>
         GET <a href="api/targets/00000000-0000-0000-0000-000000000032">api/targets/00000000-0000-0000-0000-000000000032</a>  <br>
         GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a>   <br>