Project

General

Profile

« Previous | Next » 

Revision 7286

Added by ben leinfelder over 12 years ago

use secure Metacat context URL for D1 registration
https://redmine.dataone.org/issues/3030

View differences:

src/edu/ucsb/nceas/metacat/util/SystemUtil.java
221 221 
		return getServerURL() + "/"
222 222 
				+ PropertyService.getProperty("application.context");
223 223 
	}
224
225 
	/**
226 
	 * Get the secure server URL with the context. This is made up of the secure server URL +
227 
	 * file separator + the context
228 
	 *
229 
	 * @return string holding the server URL with context
230 
	 */
231 
	public static String getSecureContextURL() throws PropertyNotFoundException {
232 
		return getSecureServerURL() + "/"
233 
				+ PropertyService.getProperty("application.context");
234 
	}
224 235 

  		




  225
  236
  
    
	/**


  		




  226
  237
  
    
	 * Get the servlet URL. This is made up of the server URL with context +


  		












  

    
      src/edu/ucsb/nceas/metacat/dataone/MNodeService.java
    
  





  743
  743
  
    

  		




  744
  744
  
    
            // Set the properties of the node based on configuration information and


  		




  745
  745
  
    
            // calls to current status methods


  		




  746
  
  
    
            String serviceName = SystemUtil.getContextURL() + "/" + PropertyService.getProperty("dataone.serviceName");


  		




  
  746
  
    
            String serviceName = SystemUtil.getSecureContextURL() + "/" + PropertyService.getProperty("dataone.serviceName");


  		




  747
  747
  
    
            Node node = new Node();


  		




  748
  748
  
    
            node.setBaseURL(serviceName + "/" + nodeTypeString);


  		




  749
  749
  
    
            node.setDescription(nodeDesc);


  		












Also available in:  Unified diff