Project

General

Profile

« Previous | Next » 

Revision 9391

Added by ben leinfelder about 9 years ago

Use conditional method for retrieving server URL (http vs https). When metacat is configured to force SSL communication we get the https url, otherwise we get http. this allows us to use the DBTransform on localhosts that are not using SSL.

View differences:

src/edu/ucsb/nceas/metacat/DBTransform.java
89 89 
  {
90 90 
    configDir = SystemUtil.getStyleSkinsDir();
91 91 
    defaultStyle = PropertyService.getProperty("application.default-style");
92 
    httpServer = SystemUtil.getSecureServerURL();
93 
    contextURL = SystemUtil.getSecureContextURL();
92 
    httpServer = SystemUtil.getServerURL();
93 
    contextURL = SystemUtil.getContextURL();
94 94 
    servletURL = SystemUtil.getServletURL();
95 95 
    userManagementURL = PropertyService.getProperty("auth.userManagementUrl");
96 96 
  }
src/edu/ucsb/nceas/metacat/util/SystemUtil.java
164 164
165 165 
	    serverURL += PropertyService.getProperty("server.name");
166 166
167 
		if (!httpPort.equals("80")) {
167 
		if (!httpPort.equals("80") && !httpPort.equals("443")) {
168 168 
			serverURL += ":" + httpPort;
169 169 
		}
170 170 

  		












Also available in:  Unified diff