Changeset 5401 for DASISH


Ignore:
Timestamp:
06/27/14 16:45:04 (10 years ago)
Author:
olhsha@mpi.nl
Message:

minor adjustemnts

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/CHANGES.txt

    r5275 r5401  
    3434principal is fixed (both issues have appeared after eralier refactoring). Jsp pages are updated,
    3535dynamical logout adress is generated.
     36
     37June 27, 2014. The schema has been updated in such way that ref is now called href (similarly,
     38ownerRef-->ownerHref, and principalRef --> principlaHref), is of type anyURI and gets value of the
     39form <api>/<resource>/<id>, for instance
     40
     41/ds/webannotatornonshibb/api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68
     42
     43In the previous version the server has been included as well in the URI.
     44
     45Moreover, an atribute xml:id is added to the schema for main resource instances.
     46

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/UPDATE.txt

    r5275 r5401  
    1 1. Placing tarball: as always, take the tar-ball of the new  version 1.4.1, and follow the
    2 standard MPI deployment procedure.  Consult the instructions from INSTALL.txt
    3 about placing war file if you have forgotten.
     1This time only webannotator-basic must be updated. It will be used for adjusting the
     2frontend while the previous shibbolised backend will be still running with the previous version
     3of the front-end, to be tested by our partners from Tartu.
    44
    5 2. Adjusting shhaa.xml: as always, if it is deloyment on lux17 (or production), set
    6  <sso action="lI">  and <slo action="lO">
     51. Placing tarball: take the tar-ball of the new  version 1.5, and follow the
     6standard MPI deployment procedure, for webannotator-basic. 
     7Consult the instructions from INSTALL.txt  about placing war file if you have forgotten.
    78
    8 3. This time the databse stays intact.
     92. The web.xml stays intact  because currently it is set for basic authentication.
    910
    10 4. web.xml differs for ds/webannotator (shibboleth authentication)
    11 and ds/webannotator-basic (basic spring authentication).
     113. The id of one cached representation (used in the welcome jsp page as an example)
     12must be changed in the database. 
    1213
    13 4.1. Filter. For the ds/webannotator use
     14Since there is no API for changing IDs, dearest latadmin, pls, do it.
    1415
    15  <filter>
    16         <filter-name>AAIFilter</filter-name>
    17         <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
    18     </filter>
    19     <filter-mapping>
    20         <filter-name>AAIFilter</filter-name>
    21         <url-pattern>/*</url-pattern>
    22     </filter-mapping>
     16UPDATE cached_representation SET external_id =
     17'b0d3f18c-eecf-40ea-9979-eecbbdca7d68' WHERE external_id='654809f6-1202-4073-86b8-a1f6fe0f2409';
     18
     19This id is already set up in the jsp page, so no changes should be done there.
     20
     21
     22
     23
    2324   
    24   and for the ds/webannotator-basic use
    25    
    26      <filter>
    27         <filter-name>springSecurityFilterChain</filter-name>
    28         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
    29     </filter>
    30     <filter-mapping>
    31         <filter-name>springSecurityFilterChain</filter-name>
    32         <url-pattern>/*</url-pattern>
    33     </filter-mapping>
    34    
    35    
    36     4.2. Settting  <param-name>eu.dasish.annotation.backend.logout</param-name>.
    37     For the ds/webannotator
    38     (if shibboleth's logout address is of the form http://lux17.mpi.nl/Shibboleth.sso/Logout)
    39    
    40     <param-value>/../../Shibboleth.sso/Logout</param-value>
    41    
    42     The "../../" is necessary to climb from http://lux17.mpi.nl/ds/webannotator to
    43      http://lux17.mpi.nl.
    44    
    45     and for ds/webannotator-basic use
    46    
    47     <param-value>/j_spring_security_logout</param-value>
    48    
     25   

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml

    r5393 r5401  
    363363        <netbeans.hint.license>gpl20</netbeans.hint.license> 
    364364        <plugin.license.copyrightYear>2013</plugin.license.copyrightYear>
    365         <project.version>1.4.1</project.version>
     365        <project.version>1.5</project.version>
    366366        <shibboleth.version>1.0.4</shibboleth.version>
    367367    </properties>

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

    r5393 r5401  
    6161        GET <a href="api/targets/00000000-0000-0000-0000-000000000032">api/targets/00000000-0000-0000-0000-000000000032</a>  <br>
    6262        GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a>   <br>
    63         GET <a href="api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/metadata">api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68//metadata</a><br>
     63        GET <a href="api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/metadata">api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/metadata</a><br>
    6464        GET <a href="api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/stream">api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/stream</a><br>
    6565        GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content</a><br>
Note: See TracChangeset for help on using the changeset viewer.