You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2013/05/22 18:55:24 UTC
svn commit: r1485282 - in
/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils:
ServerSettings.java ServiceUtils.java
Author: lahiru
Date: Wed May 22 16:55:24 2013
New Revision: 1485282
URL: http://svn.apache.org/r1485282
Log:
renaming wrong method names.
Modified:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java?rev=1485282&r1=1485281&r2=1485282&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java Wed May 22 16:55:24 2013
@@ -55,7 +55,7 @@ public class ServerSettings extends Appl
private static final String REGISTRY_DB_USER ="registry.jdbc.user";
private static final String REGISTRY_DB_PASSWORD ="registry.jdbc.password";
private static final String REGISTRY_DB_DRIVER ="registry.jdbc.driver";
- private static final String ENABLE_HTTP = "enable.https";
+ private static final String ENABLE_HTTPS = "enable.https";
public static String getDefaultGatewayId()throws ApplicationSettingsException{
return getSetting(DEFAULT_GATEWAY_ID);
@@ -110,9 +110,9 @@ public class ServerSettings extends Appl
}
- public static boolean getEnableHttp() {
+ public static boolean isEnableHttps() {
try {
- return Boolean.parseBoolean(getSetting(ENABLE_HTTP));
+ return Boolean.parseBoolean(getSetting(ENABLE_HTTPS));
} catch (ApplicationSettingsException e) {
return false;
}
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java?rev=1485282&r1=1485281&r2=1485282&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java Wed May 22 16:55:24 2013
@@ -66,7 +66,7 @@ public class ServiceUtils {
//when it is ok to retrieve them from the axis2 context
}
String protocol="http";
- if(ServerSettings.getEnableHttp()){
+ if(ServerSettings.isEnableHttps()){
protocol="https";
}
if (port == null) {