Project

General

Profile

« Previous | Next » 

Revision 7389

Added by ben leinfelder about 12 years ago

look up CN url for portal servlet instead of hardcoding it.

View differences:

lib/style/skins/dataone/performMapping.jsp
52 52 
}
53 53 
boolean isMetacatSessionValid = SessionService.getInstance().validateSession(sessionId);
54 54 

  		




  55
  
  
    
// TODO: dynamic portal lookup


  		




  56
  
  
    
//String cnURL = D1Client.getCN().getNodeBaseServiceUrl();


  		




  57
  
  
    
//String portalURL = cnURL.substring(0, cnURL.lastIndexOf(new URL(cnURL).getPath())) + "/portal/identity";


  		




  58
  
  
    
String portalURL =  "https://cn-dev.dataone.org/portal/identity";


  		




  
  55
  
    
// get the CN environment, dynamically


  		




  
  56
  
    
String cnURL = D1Client.getCN().getNodeBaseServiceUrl();


  		




  
  57
  
    
String portalURL = cnURL.substring(0, cnURL.lastIndexOf(new URL(cnURL).getPath())) + "/portal/identity";


  		




  
  58
  
    
//String portalURL =  "https://cn-dev.dataone.org/portal/identity";


  		




  59
  59
  
    

  		




  60
  60
  
    
//check the DataONE token


  		




  61
  61
  
    
String tokenURL = portalURL + "?action=isAuthenticated&token=" + token;


  		












Also available in:  Unified diff