diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-08-16 11:50:15 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2013-08-20 14:23:12 -0400 |
commit | 4a2880f466451d8089409d83474a7339bffffe25 (patch) | |
tree | 0e2523ab44a17a2c0ebe928e3b7395691dd7fd27 | |
parent | 443bffbe31971a66ce7b83c3f447057957b121cb (diff) | |
download | pki-4a2880f466451d8089409d83474a7339bffffe25.tar.gz pki-4a2880f466451d8089409d83474a7339bffffe25.tar.xz pki-4a2880f466451d8089409d83474a7339bffffe25.zip |
Reorganized interceptors.
The ACLInterceptor and AuthMethodInterceptor interceptors only run
on the server, so they have been moved from the base package into
the server package.
-rw-r--r-- | base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java | 4 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/authorization/ACLInterceptor.java (renamed from base/common/src/com/netscape/certsrv/acls/ACLInterceptor.java) | 3 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java (renamed from base/common/src/com/netscape/certsrv/authentication/AuthMethodInterceptor.java) | 5 | ||||
-rw-r--r-- | base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java | 4 | ||||
-rw-r--r-- | base/ocsp/src/com/netscape/ocsp/OCSPApplication.java | 4 | ||||
-rw-r--r-- | base/tks/src/com/netscape/tks/TKSApplication.java | 4 | ||||
-rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java | 4 |
7 files changed, 16 insertions, 12 deletions
diff --git a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java index 7b45222d6..1b96f3121 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthorityApplication.java @@ -5,12 +5,12 @@ import java.util.Set; import javax.ws.rs.core.Application; -import com.netscape.certsrv.acls.ACLInterceptor; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.AuthMethodInterceptor; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.PKIException; +import com.netscape.cms.authorization.ACLInterceptor; +import com.netscape.cms.authorization.AuthMethodInterceptor; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; import com.netscape.cms.servlet.admin.GroupService; diff --git a/base/common/src/com/netscape/certsrv/acls/ACLInterceptor.java b/base/common/src/com/netscape/cms/authorization/ACLInterceptor.java index c30740260..53160bb8c 100644 --- a/base/common/src/com/netscape/certsrv/acls/ACLInterceptor.java +++ b/base/common/src/com/netscape/cms/authorization/ACLInterceptor.java @@ -15,7 +15,7 @@ //(C) 2012 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.acls; +package com.netscape.cms.authorization; import java.io.IOException; import java.lang.reflect.Method; @@ -36,6 +36,7 @@ import org.jboss.resteasy.spi.Failure; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.interception.PreProcessInterceptor; +import com.netscape.certsrv.acls.ACLMapping; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthMethodInterceptor.java b/base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java index 502c89307..8d7bcb3c6 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthMethodInterceptor.java +++ b/base/common/src/com/netscape/cms/authorization/AuthMethodInterceptor.java @@ -15,7 +15,7 @@ //(C) 2013 Red Hat, Inc. //All rights reserved. //--- END COPYRIGHT BLOCK --- -package com.netscape.certsrv.authentication; +package com.netscape.cms.authorization; import java.io.IOException; import java.lang.reflect.Method; @@ -38,6 +38,9 @@ import org.jboss.resteasy.spi.Failure; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.interception.PreProcessInterceptor; +import com.netscape.certsrv.authentication.AuthMethodMapping; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.ForbiddenException; import com.netscape.cmscore.realm.PKIPrincipal; diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java index 6b7f3e2cf..f04ee9bb5 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java @@ -5,9 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import com.netscape.certsrv.acls.ACLInterceptor; -import com.netscape.certsrv.authentication.AuthMethodInterceptor; import com.netscape.certsrv.base.PKIException; +import com.netscape.cms.authorization.ACLInterceptor; +import com.netscape.cms.authorization.AuthMethodInterceptor; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; import com.netscape.cms.servlet.admin.GroupService; diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java index 3a8737856..1dc4a9df1 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPApplication.java @@ -5,9 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import com.netscape.certsrv.acls.ACLInterceptor; -import com.netscape.certsrv.authentication.AuthMethodInterceptor; import com.netscape.certsrv.base.PKIException; +import com.netscape.cms.authorization.ACLInterceptor; +import com.netscape.cms.authorization.AuthMethodInterceptor; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; import com.netscape.cms.servlet.admin.GroupService; diff --git a/base/tks/src/com/netscape/tks/TKSApplication.java b/base/tks/src/com/netscape/tks/TKSApplication.java index 1ff193058..b2d43ae87 100644 --- a/base/tks/src/com/netscape/tks/TKSApplication.java +++ b/base/tks/src/com/netscape/tks/TKSApplication.java @@ -5,9 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import com.netscape.certsrv.acls.ACLInterceptor; -import com.netscape.certsrv.authentication.AuthMethodInterceptor; import com.netscape.certsrv.base.PKIException; +import com.netscape.cms.authorization.ACLInterceptor; +import com.netscape.cms.authorization.AuthMethodInterceptor; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; import com.netscape.cms.servlet.admin.GroupService; diff --git a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java b/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java index 2f2b2a63a..fc3c18ee2 100644 --- a/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java +++ b/base/tps-tomcat/src/org/dogtagpki/tps/server/TPSApplication.java @@ -24,9 +24,9 @@ import javax.ws.rs.core.Application; import org.dogtagpki.tps.token.TokenService; -import com.netscape.certsrv.acls.ACLInterceptor; -import com.netscape.certsrv.authentication.AuthMethodInterceptor; import com.netscape.certsrv.base.PKIException; +import com.netscape.cms.authorization.ACLInterceptor; +import com.netscape.cms.authorization.AuthMethodInterceptor; import com.netscape.cms.servlet.account.AccountService; import com.netscape.cms.servlet.admin.GroupMemberService; import com.netscape.cms.servlet.admin.GroupService; |