removing mongodb user profile configuration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e6eb0c97 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e6eb0c97 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e6eb0c97 Branch: refs/heads/master Commit: e6eb0c973bdfdb86762382130941ead5407ff60e Parents: 93e1811 Author: scnakandala <[email protected]> Authored: Tue May 2 16:43:40 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue May 2 16:43:40 2017 -0400 ---------------------------------------------------------------------- .../airavata/common/utils/ServerSettings.java | 9 ---- .../main/resources/airavata-server.properties | 9 +--- .../main/resources/airavata-server.properties | 43 ++++++++------------ 3 files changed, 17 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e6eb0c97/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 e232e7b..a251baf 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 @@ -76,7 +76,6 @@ public class ServerSettings extends ApplicationSettings { private static final java.lang.String SHARING_REGISTRY_PORT = "sharing.registry.server.port"; private static final java.lang.String SHARING_REGISTRY_HOST = "sharing.registry.server.host"; - private static String USER_PROFILE_MONGODB_HOST = "userprofile.mongodb.host"; private static String USER_PROFILE_MONGODB_PORT = "userprofile.mongodb.port"; private static final String REGISTRY_DB_URL = "registry.jdbc.url"; @@ -428,14 +427,6 @@ public class ServerSettings extends ApplicationSettings { return Integer.valueOf(getSetting(Constants.IN_MEMORY_CACHE_SIZE)); } - public static String getUserProfileMongodbHost() throws ApplicationSettingsException{ - return getSetting(USER_PROFILE_MONGODB_HOST); - } - - public static int getUserProfileMongodbPort() throws ApplicationSettingsException{ - return Integer.parseInt(getSetting(USER_PROFILE_MONGODB_PORT)); - } - public static String getLocalDataLocation() { return System.getProperty("java.io.tmpdir"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/e6eb0c97/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 9d0a9f3..719eab5 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -115,14 +115,7 @@ sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer sharing.registry.server.host=localhost sharing.registry.server.port=7878 - -########################################################################### -# User Profile MongoDB Configuration -########################################################################### -userprofile.mongodb.host=localhost -userprofile.mongodb.port=27017 - - + ########################################################################### # Server module Configuration ########################################################################### http://git-wip-us.apache.org/repos/asf/airavata/blob/e6eb0c97/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties index 77bbd46..95c04af 100644 --- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties +++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties @@ -117,13 +117,6 @@ sharing.registry.server.host=localhost sharing.registry.server.port=7878 ########################################################################### -# User Profile MongoDB Configuration -########################################################################### -userprofile.mongodb.host=localhost -userprofile.mongodb.port=27017 - - -########################################################################### # Server module Configuration ########################################################################### #credential store server should be started before API server @@ -331,27 +324,23 @@ kafka.topic.prefix=local enable.kafka.logging=false ########################################################################### -# User Profile module Configuration +# Profile Service Configuration ########################################################################### -user.profile.server.host=localhost -user.profile.server.port=8961 -user_profile=org.apache.airavata.user.profile.server.UserProfileServer +profile.service.server.host=localhost +profile.service.server.port=8962 +profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer +# derby properties +profile.service.jdbc.url=jdbc:derby:profile_service;create=true;user=airavata;password=airavata +profile.service.jdbc.driver=org.apache.derby.jdbc.ClientDriver +# mysql properties +#profile.service.jdbc.url=jdbc:mysql://localhost:3306/profile_service +#profile.service.jdbc.driver=com.mysql.jdbc.Driver +profile.service.jdbc.user=airavata +profile.service.jdbc.password=airavata +profile.service.validationQuery=SELECT 1 ########################################################################### -# New User Profile catalog +# Iam Admin services Configuration ########################################################################### -#for derby [AiravataJPARegistry] -#Workspace.catalog.registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -#Workspace.catalog.registry.jdbc.url=jdbc:derby://localhost:1527/workspace_catalog;create=true;user=airavata;password=airavata -# MySql database configuration -user.profile.catalog.registry.jdbc.driver=com.mysql.jdbc.Driver -user.profile.catalog.registry.jdbc.url=jdbc:mysql://localhost:3306/user_profile_catalog -user.profile.catalog.registry.jdbc.user=airavata -user.profile.catalog.registry.jdbc.password=airavata -user.profile.catalog.validationQuery=SELECT 1 from CONFIGURATION - -user.profile.catalog.start.derby.server.mode=true -user.profile.catalog.cache.enable=true -user.profile.catalog.jpa.cache.size=5000 -#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true -user.profile.catalog.enable.sharing=true \ No newline at end of file +iam.server.url=https://iam.scigap.org/auth +new.gateway.admin.temp.password=Password@123 \ No newline at end of file
