You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/29 21:49:43 UTC
svn commit: r1415370 - in /airavata/trunk/modules:
commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
Author: chathuri
Date: Thu Nov 29 20:49:38 2012
New Revision: 1415370
URL: http://svn.apache.org/viewvc?rev=1415370&view=rev
Log:
fixing issues when starting the server
Modified:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
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=1415370&r1=1415369&r2=1415370&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 Thu Nov 29 20:49:38 2012
@@ -49,7 +49,8 @@ public class ServiceUtils {
localAddress = ServerSettings.getSetting(IP);
port = (String) ServerSettings.getSetting(PORT);
} catch (ServerSettingsException e) {
- e.printStackTrace();
+ //we will ignore this exception since the properties file will not contain the values
+ //when it is ok to retrieve them from the axis2 context
}
if(localAddress == null){
try {
Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1415370&r1=1415369&r2=1415370&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java Thu Nov 29 20:49:38 2012
@@ -51,7 +51,7 @@ public class RegistryService implements
public static final String PERSISTANT_DATA = "Configuration";
public static final String REGISTRY_DEFAULT_GATEWAY_ID = "default.registry.gateway";
public static final String REGISTRY_DEFAULT_USER = "default.registry.user";
- public static final String REGISTRY_DEFAULT_USER_PASSWORD = "default.registry.user.password";
+ public static final String REGISTRY_DEFAULT_USER_PASSWORD = "default.registry.password";
public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
public static final String REGISTRY_JDBC_DRIVER = "registry.jdbc.driver";
public static final String REGISTRY_JDBC_URL = "registry.jdbc.url";