airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: AIRAVATA-2371 Updating Keycloak package; adding profile service to distribution
Date Tue, 02 May 2017 20:34:26 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 93e181157 -> b5984b096


AIRAVATA-2371 Updating Keycloak package; adding profile service to distribution


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b5984b09
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b5984b09
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b5984b09

Branch: refs/heads/develop
Commit: b5984b0962b3248f028dd7a72821f3ce60d576c2
Parents: 93e1811
Author: Marcus Christie <machristie@apache.org>
Authored: Tue May 2 16:31:56 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue May 2 16:33:01 2017 -0400

----------------------------------------------------------------------
 .../roles/api-orch/templates/airavata-server.properties.j2  | 2 +-
 modules/distribution/pom.xml                                | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/b5984b09/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index ffdb1a0..4254962 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -286,7 +286,7 @@ zookeeper.timeout=30000
 ## API Security Configuration
 ########################################################################
 api.secured={{ api_secured }}
-security.manager.class=org.apache.airavata.api.server.security.KeyCloakSecurityManager
+security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
 ### TLS related configuration ####
 TLS.enabled={{ tls_enable }}
 TLS.api.server.port={{ api_server_tls_port }}

http://git-wip-us.apache.org/repos/asf/airavata/blob/b5984b09/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 24d8e88..16e4cfb 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -503,15 +503,10 @@
             <artifactId>groovy-templates</artifactId>
             <version>${groovy.version}</version>
         </dependency>
-        <!-- ======================== User Profile Service module ===================
-->
+        <!-- ======================== Profile Service module =================== -->
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>user-profile-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>user-profile-stubs</artifactId>
+            <artifactId>profile-service-server</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- ======================== Sample =================== -->


Mime
View raw message