This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit 469150f89cc2d2d4b224136f27eb9fc638f7ea4a Merge: e01fd7c 5595257 Author: Suresh Marru <[email protected]> AuthorDate: Tue Aug 27 02:15:16 2019 -0400 Merge pull request #4 from aarushiibisht/custos-dev-abisht merging the PR for README and sample testing .../handler/CustosAuthenticationHandler.java | 2 +- ...ava => AuthenticationServiceClientFactory.java} | 2 +- custos-commons/custos-server.properties | 0 .../src/main/resources/custos-server.properties | 10 +- .../manager/KeyCloakSecurityManager.java | 3 +- .../main/resources/keystores/client_truststore.jks | Bin 0 -> 963 bytes .../user/handler/UserProfileServiceHandler.java | 10 +- .../test/java/TestUserProfileServiceHandler.java | 36 +++-- ide-integration/README.md | 64 +++++++++ ide-integration/custos-services/pom.xml | 15 ++ .../server/start}/CustosAPIServerStarted.java | 4 +- .../src/main/resources/custos-server.properties | 10 +- .../database_scripts/init/01-databases.sql | 43 +++--- .../user-profile-catalog-derby.sql | 30 ---- .../user-profile-catalog-mysql.sql | 30 ---- .../src/main/resources/docker-compose.yml | 2 +- .../main/resources/keycloak/Default-export.json | 0 .../main/resources/keycloak/Default-export.json.bk | 0 .../src/main/resources/keycloak/standalone.xml | 2 +- .../src/main/resources/keystores/custos.jks | Bin 0 -> 2252 bytes .../src/main/resources}/log4j.properties | 8 +- ide-integration/pom.xml | 17 +++ ide-integration/samples/commons/pom.xml | 15 ++ .../org/apache/samples/common/SamplesCommon.java | 60 ++++++++ .../custos-authentication-service-samples/pom.xml | 23 +++ .../sample/CustosAuthenticationServiceSample.java | 64 +++++++++ .../src/main/resources/log4j.properties | 10 +- .../samples/custos-profile-service-samples/pom.xml | 22 +++ .../service/samples/TenantProfileSample.java | 80 +++++++++++ .../profile/service/samples/UserProfileSample.java | 160 +++++++++++++++++++++ .../samples/utils/ProfileServiceClientUtil.java | 63 ++++++++ .../src/main/resources/log4j.properties | 10 +- .../resources/profile-client-sample.properties | 29 ++++ ide-integration/samples/pom.xml | 20 +++ .../src/main/resources/keystores/airavata.jks | Bin 2679 -> 0 bytes .../src/main/resources/keystores/airavata_sym.jks | Bin 501 -> 0 bytes .../main/resources/keystores/client_truststore.jks | Bin 1027 -> 0 bytes 37 files changed, 715 insertions(+), 129 deletions(-)
