Changeset 26123

Show
Ignore:
Timestamp:
16.08.2012 21:21:02 (7 years ago)
Author:
ak19
Message:

Diego discovered that the QBRSOAPServer no longer got deployed. 1. The resources/java/QBRSOAPServer.java.in class failed to compile on attempting to deploy the web service owing to the GSXML.createBasicRequest() method's signature having been changed to take a UserContext? parameter in place of lang and uid. 2. Updated UserContext? class with an additional constructor that now takes both lang and uid. This gets called by resources/java/QBRSOAPServer.java.in whenever it needs to pass in a UserContext? object to GSXML.createBasicRequest().

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in

    r22295 r26123  
    4545import org.greenstone.gsdl3.util.GSFile; 
    4646import org.greenstone.gsdl3.util.GSXML; 
     47import org.greenstone.gsdl3.util.UserContext; 
    4748import org.greenstone.gsdl3.util.XMLConverter; 
    4849 
     
    265266        // <message><request lang="en" to="" type="describe" uid="" /></message> 
    266267        Element request = GSXML.createBasicRequest( 
    267                 this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, ""); 
     268                this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, new UserContext(lang, "")); 
    268269         
    269270        // Check if only a subset of this Module Interface's data is asked 
     
    329330        Element request = GSXML.createBasicRequest( 
    330331                this.doc, GSXML.REQUEST_TYPE_PROCESS,  
    331                 collection+"/"+service, lang, ""); 
     332                collection+"/"+service, new UserContext(lang, "")); 
    332333         
    333334        request.appendChild(paramList); 
     
    421422        Element request = GSXML.createBasicRequest( 
    422423                doc, GSXML.REQUEST_TYPE_PROCESS,  
    423                 collection+"/DocumentContentRetrieve", lang, ""); 
     424                collection+"/DocumentContentRetrieve", new UserContext(lang, "")); 
    424425         
    425426        // create an empty <paramlist /> element (as example in manual) 
     
    481482        Element request = GSXML.createBasicRequest( 
    482483                doc, GSXML.REQUEST_TYPE_PROCESS,  
    483                 collection+"/DocumentStructureRetrieve", lang, ""); 
     484                collection+"/DocumentStructureRetrieve", new UserContext(lang, "")); 
    484485         
    485486        // Create the <paramlist></paramlist> element of param elements, 
     
    632633        Element message = doc.createElement(GSXML.MESSAGE_ELEM); 
    633634        Element request = GSXML.createBasicRequest(doc,  
    634                 GSXML.REQUEST_TYPE_PROCESS, to, lang, ""); 
     635                GSXML.REQUEST_TYPE_PROCESS, to, new UserContext(lang, "")); 
    635636         
    636637        request.appendChild(metadataParamList); 
     
    692693        // <message><request lang="en" to="" type="process" uid="" /></message> 
    693694        Element request = GSXML.createBasicRequest(this.doc, 
    694             GSXML.REQUEST_TYPE_PROCESS, collection+"/"+browseService, lang, ""); 
     695            GSXML.REQUEST_TYPE_PROCESS, collection+"/"+browseService, new UserContext(lang, "")); 
    695696         
    696697        // <param name="structure" value = "structureParams[i]"> 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/UserContext.java

    r24993 r26123  
    1414        _lang = xmlRequest.getAttribute(GSXML.LANG_ATT); 
    1515        _userID = xmlRequest.getAttribute(GSXML.USER_ID_ATT); 
     16    } 
     17 
     18    public UserContext(String lang, String userID) 
     19    { 
     20        _lang = lang; 
     21        _userID = userID; 
    1622    } 
    1723