Re-created the pull request with conflicts with the master resolved.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/36922c9f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/36922c9f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/36922c9f Branch: refs/heads/master Commit: 36922c9fcf4b1af517e18389e1657007d06b7a0e Parents: 4f6e8c5 f080ac2 Author: hasinitg <[email protected]> Authored: Sun Aug 16 23:56:54 2015 -0400 Committer: hasinitg <[email protected]> Committed: Sun Aug 16 23:56:54 2015 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 13 +- .../airavata/api/server/AiravataAPIServer.java | 15 +- .../server/handler/AiravataServerHandler.java | 2 +- .../security/AiravataSecurityManager.java | 17 +- .../DefaultAiravataSecurityManager.java | 149 ++++++++++++++++- .../api/server/security/DefaultOAuthClient.java | 133 --------------- .../api/server/security/IdentityContext.java | 44 +++++ .../api/server/security/SecurityCheck.java | 36 ---- .../server/security/SecurityInterceptor.java | 65 -------- .../server/security/SecurityManagerFactory.java | 7 +- .../api/server/security/SecurityModule.java | 39 ----- .../server/security/authzcache/AuthzCache.java | 63 +++++++ .../security/authzcache/AuthzCacheEntry.java | 63 +++++++ .../security/authzcache/AuthzCacheIndex.java | 78 +++++++++ .../security/authzcache/AuthzCacheManager.java | 80 +++++++++ .../authzcache/AuthzCacheManagerFactory.java | 60 +++++++ .../security/authzcache/AuthzCachedStatus.java | 34 ++++ .../authzcache/DefaultAuthzCacheManager.java | 108 ++++++++++++ .../security/interceptor/SecurityCheck.java | 36 ++++ .../interceptor/SecurityInterceptor.java | 83 ++++++++++ .../security/interceptor/SecurityModule.java | 41 +++++ .../security/oauth/DefaultOAuthClient.java | 94 +++++++++++ .../server/security/xacml/DefaultPAPClient.java | 125 ++++++++++++++ .../server/security/xacml/DefaultXACMLPEP.java | 129 +++++++++++++++ distribution/src/main/assembly/bin-assembly.xml | 1 + .../apache/airavata/common/utils/Constants.java | 21 +++ .../airavata/common/utils/ServerSettings.java | 86 ++++++---- .../resources/airavata-default-xacml-policy.xml | 165 +++++++++++++++++++ .../main/resources/airavata-server.properties | 11 ++ .../airavata/secure/sample/SecureClient.java | 60 ++++++- 30 files changed, 1527 insertions(+), 331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/36922c9f/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --cc airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 73767ab,7531fae..a4735ee --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@@ -22,8 -22,8 +22,8 @@@ package org.apache.airavata.api.server.handler; import org.apache.airavata.api.Airavata; -import org.apache.airavata.api.airavataAPIConstants; +import org.apache.airavata.api.airavata_apiConstants; - import org.apache.airavata.api.server.security.SecurityCheck; + import org.apache.airavata.api.server.security.interceptor.SecurityCheck; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.AiravataUtils;
