You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/03/05 23:55:01 UTC
[5/9] airavata git commit: Add profile service constants to
airavata-server.properties
Add profile service constants to airavata-server.properties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ef9f8505
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ef9f8505
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ef9f8505
Branch: refs/heads/user-profile
Commit: ef9f85051b10930e055afa2db082059d404128e3
Parents: 594e851
Author: Gourav Shenoy <sh...@gmail.com>
Authored: Sun Mar 5 17:20:30 2017 -0500
Committer: Gourav Shenoy <sh...@gmail.com>
Committed: Sun Mar 5 17:20:30 2017 -0500
----------------------------------------------------------------------
airavata-services/pom.xml | 10 ++++++++++
.../apache/airavata/common/utils/ApplicationSettings.java | 8 ++++++++
.../org/apache/airavata/common/utils/ServerSettings.java | 4 ++++
.../server/src/main/resources/airavata-server.properties | 7 +++++++
4 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ef9f8505/airavata-services/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml
index eee25fb..5d82eab 100644
--- a/airavata-services/pom.xml
+++ b/airavata-services/pom.xml
@@ -26,6 +26,16 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<modules>
http://git-wip-us.apache.org/repos/asf/airavata/blob/ef9f8505/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index e44c4ab..085bcfb 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -421,6 +421,14 @@ public class ApplicationSettings {
return getSetting(ServerSettings.USER_PROFILE_SERVER_PORT);
}
+ public static String getProfileServiceServerHost() throws ApplicationSettingsException {
+ return getSetting(ServerSettings.PROFILE_SERVICE_SERVER_HOST);
+ }
+
+ public static String getProfileServiceServerPort() throws ApplicationSettingsException {
+ return getSetting(ServerSettings.PROFILE_SERVICE_SERVER_PORT);
+ }
+
/**
* @deprecated use {{@link #getSetting(String)}}
* @return
http://git-wip-us.apache.org/repos/asf/airavata/blob/ef9f8505/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 49fdc54..d9aeb33 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -129,6 +129,10 @@ public class ServerSettings extends ApplicationSettings {
public static final String USER_PROFILE_SERVER_HOST = "user.profile.server.host";
public static final String USER_PROFILE_SERVER_PORT = "user.profile.server.port";
+ // Profile Service Constants
+ public static final String PROFILE_SERVICE_SERVER_HOST = "profile.service.server.host";
+ public static final String PROFILE_SERVICE_SERVER_PORT = "profile.service.server.port";
+
/* Caching */
private static final String SESSION_CACHE_ACCESS_TIME_OUT = "ssh.session.cache.access.timeout";
http://git-wip-us.apache.org/repos/asf/airavata/blob/ef9f8505/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 6295355..55f6086 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -344,3 +344,10 @@ user.profile.catalog.registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
user.profile.catalog.registry.jdbc.user=airavata
user.profile.catalog.registry.jdbc.password=airavata
user.profile.catalog.validationQuery=SELECT 1
+
+###########################################################################
+# Profile Service Configuration
+###########################################################################
+profile.service.server.host=localhost
+profile.service.server.port=8961
+profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
\ No newline at end of file