You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/06/02 14:01:26 UTC
[7/8] airavata git commit: Merge branch 'sprint1_updated' into
sprint1_update2
Merge branch 'sprint1_updated' into sprint1_update2
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e11e95c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e11e95c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e11e95c
Branch: refs/heads/master
Commit: 7e11e95c5b0105878df600907f66c8fb5d4ba59f
Parents: c8a70e9 85f613f
Author: Hasini Gunasinghe <ha...@gmail.com>
Authored: Tue Jun 2 17:03:48 2015 +0530
Committer: Hasini Gunasinghe <ha...@gmail.com>
Committed: Tue Jun 2 17:03:48 2015 +0530
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 20 +
.../server/handler/AiravataServerHandler.java | 29 +-
.../security/AiravataSecurityManager.java | 27 +
.../DefaultAiravataSecurityManager.java | 55 ++
.../api/server/security/DefaultOAuthClient.java | 124 +++++
.../api/server/security/Properties.java | 27 +
.../api/server/security/SecurityException.java | 11 +
.../server/security/SecurityManagerFactory.java | 32 ++
.../java/org/apache/airavata/api/Airavata.java | 258 ++++++++-
.../client/samples/CreateLaunchBES.java | 2 +-
.../client/samples/CreateLaunchExperiment.java | 2 +-
.../samples/CreateLaunchExperimentUS3.java | 2 +-
.../samples/TestCreateLaunchExperiment.java | 3 +-
.../tools/RegisterOGCEUS3Application.java | 2 +-
.../tools/RegisterSampleApplications.java | 2 +-
.../client/tools/RegisterUS3Application.java | 2 +-
.../airavata/model/security/AuthzToken.java | 553 +++++++++++++++++++
.../airavataAPI.thrift | 6 +-
.../airavataDataModel.thrift | 1 +
.../securityModel.thrift | 35 ++
.../apache/airavata/common/utils/Constants.java | 5 +
.../airavata/common/utils/ServerSettings.java | 15 +
.../main/resources/airavata-server.properties | 8 +
.../apache/airavata/integration/BaseCaseIT.java | 2 +-
.../WorkflowIntegrationTestBase.java | 2 +
pom.xml | 1 +
samples/java-client/experiment/pom.xml | 2 +-
samples/java-client/pom.xml | 7 +-
samples/java-client/secure-client/pom.xml | 110 ++++
.../sample/AiravataSecurityException.java | 31 ++
.../sample/OAuthAppRegisteringClient.java | 109 ++++
.../sample/OAuthTokenRetrievalClient.java | 87 +++
.../airavata/secure/sample/Properties.java | 42 ++
.../airavata/secure/sample/SecureClient.java | 152 +++++
34 files changed, 1732 insertions(+), 34 deletions(-)
----------------------------------------------------------------------