Changeset 4254


Ignore:
Timestamp:
01/10/14 18:42:45 (10 years ago)
Author:
olhsha
Message:

fixed @-problem in the path parameter (use just string, no reg-exp control)

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/UserResource.java

    r4253 r4254  
    7373    @GET
    7474    @Produces(MediaType.TEXT_XML)
    75     @Path("{userid: " + BackendConstants.regExpRemoteId + "}")
     75    @Path("{userid}")
    7676    @Transactional(readOnly = true)
    7777    public JAXBElement<User> getUser(@PathParam("userid") String ExternalIdentifier) throws SQLException, IOException {
    … …  
    116116    @GET
    117117    @Produces(MediaType.TEXT_XML)
    118     @Path("{userid: " + BackendConstants.regExpIdentifier + "}/current")
     118    @Path("{userid}/current")
    119119    @Transactional(readOnly = true)
    120120    public JAXBElement<CurrentUserInfo> getCurrentUserInfo(@PathParam("userid") String ExternalIdentifier) throws IOException {
    … …  
    141141    @Consumes(MediaType.APPLICATION_XML)
    142142    @Produces(MediaType.APPLICATION_XML)
    143     @Path("{remoteId: " + BackendConstants.regExpRemoteId + "}")
     143    @Path("{remoteId}")
    144144    public JAXBElement<User> addUser(@PathParam("remoteId") String remoteId, User user) throws SQLException, IOException {
    145145        final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
    … …  
    193193
    194194    @DELETE
    195     @Path("{userId: " + BackendConstants.regExpRemoteId + "}")
     195    @Path("{userId}")
    196196    public String deleteUser(@PathParam("userId") String externalIdentifier) throws IOException {
    197197        final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());

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

    r4252 r4254  
    6666   
    6767    <!-- lux16, 17, corpus 1 (shibbolized) -->
    68     <!-- <filter>
     68   <!-- <filter>
    6969        <filter-name>AAIFilter</filter-name>
    7070        <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
    … …  
    7676   
    7777   
    78     <!-- localhost auth experiments -->
    79    
     78    <!-- localhost auth  -->
    8079   
    8180    <security-constraint>
    … …  
    101100        </description>
    102101        <role-name>tomcat</role-name>
    103     </security-role>
     102    </security-role> 
    104103   
    105104</web-app>
Note: See TracChangeset for help on using the changeset viewer.