Changeset 5755 for DASISH


Ignore:
Timestamp:
10/28/14 17:21:39 (10 years ago)
Author:
olhsha@mpi.nl
Message:

fixing typo in schema

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

Legend:

Unmodified
Added
Removed

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

    r5676 r5755  
    5555of a non-shibboleth user (basic authentication).
    5656
     57October 23, 2014. Minor chnages. The package for shibbolized version is prepared to be set up for
     58CallTIME on lux17.
     59
     60October 28, 2014. Spelling mistake in schema, in the naming of the element in Target
     61class is corrected (cachedRepresentatinons --> cachedRepresentations).
     62
     63

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

    r5679 r5755  
    11
    2 1. Placing tarball: take the tar-ball of the new  version 1.5.2, and follow the
    3 standard MPI deployment procedure, for webannotator-basic. 
    4 Consult the instructions from INSTALL.txt  about placing war file if you have forgotten.
    5  override="true
    6 2. The web.xml stays intact  because currently it is set for basic authentication.
     2Placing tarball: take the tar-ball of the new  version 1.5.4-basic, and follow the
     3standard MPI deployment procedure. 
    74
    8 3. context.xml (global one). Pls, add 
    9 <Parameter name="eu.dasish.annotation.backend.schemaLocation"
    10 value="http://lux17.mpi.nl/ds/webannotator-basic/SCHEMA/DASISH-schema.xsd"
    11         override="true"/>
    12 
    13 
     5This is is a simple update due to fixing a spelling error in the DASISHschema.
    146
    157

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

    r5693 r5755  
    55    <groupId>eu.dasish.annotation</groupId>
    66    <artifactId>annotator-backend</artifactId>
    7     <version>1.5.3</version>   
     7    <version>1.5.4-basic</version>   
    88    <packaging>war</packaging>
    99    <name>annotator-backend Jersey Webapp</name>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherImlp.java

    r5686 r5755  
    391391            cachedRepresentationFragmentList.getCached().add(cachedRepresentationFragment);
    392392        }
    393         result.setCachedRepresentatinons(cachedRepresentationFragmentList);
     393        result.setCachedRepresentations(cachedRepresentationFragmentList);
    394394        return result;
    395395    }

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/SCHEMA/DASISH-schema.xsd

    r5693 r5755  
    7575            <xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1"/>
    7676            <xs:element name="siblingTargets" type="dasish:ReferenceList" minOccurs="1"/>
    77             <xs:element name="cachedRepresentatinons" type="dasish:CachedRepresentationFragmentList"
     77            <xs:element name="cachedRepresentations" type="dasish:CachedRepresentationFragmentList"
    7878                minOccurs="1"/>
    7979        </xs:sequence>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

    r5715 r5755  
    108108   
    109109    <!-- Spring security -->
    110     <filter>
     110     <filter>
    111111        <filter-name>springSecurityFilterChain</filter-name>
    112112        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
    … …  
    117117    </filter-mapping>
    118118   
     119     <!--  Shibboleth filter -->
     120   <!--<filter>
     121        <filter-name>AAIFilter</filter-name>
     122        <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
     123    </filter>
     124    <filter-mapping>
     125        <filter-name>AAIFilter</filter-name>
     126        <url-pattern>/*</url-pattern>
     127    </filter-mapping> -->
     128   
    119129  </web-app> 
    120130       
Note: See TracChangeset for help on using the changeset viewer.