Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE5469569 for ; Thu, 29 Mar 2012 21:17:58 +0000 (UTC) Received: (qmail 51515 invoked by uid 500); 29 Mar 2012 21:17:58 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 51456 invoked by uid 500); 29 Mar 2012 21:17:58 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 51449 invoked by uid 99); 29 Mar 2012 21:17:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 21:17:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 21:17:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CF17F2388847; Thu, 29 Mar 2012 21:17:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307112 - in /cxf/trunk: api/src/main/java/org/apache/cxf/security/claims/ api/src/main/java/org/apache/cxf/security/claims/authorization/ rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ rt/rs/security/xml/s... Date: Thu, 29 Mar 2012 21:17:36 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120329211736.CF17F2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Mar 29 21:17:35 2012 New Revision: 1307112 URL: http://svn.apache.org/viewvc?rev=1307112&view=rev Log: [CXF-4215] Moving Claim annotations to the api module Added: cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/ cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java - copied, changed from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claim.java cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ClaimMode.java - copied, changed from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimMode.java cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claims.java - copied, changed from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claims.java Removed: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claim.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimMode.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claims.java Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimBean.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java cxf/trunk/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptorTest.java cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SecureClaimBookStore.java Copied: cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java (from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claim.java) URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java&p1=cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claim.java&r1=1306788&r2=1307112&rev=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claim.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java Thu Mar 29 21:17:35 2012 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.rs.security.saml.authorization; +package org.apache.cxf.security.claims.authorization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Copied: cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ClaimMode.java (from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimMode.java) URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ClaimMode.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ClaimMode.java&p1=cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimMode.java&r1=1306788&r2=1307112&rev=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimMode.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/ClaimMode.java Thu Mar 29 21:17:35 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.rs.security.saml.authorization; +package org.apache.cxf.security.claims.authorization; public enum ClaimMode { STRICT, Copied: cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claims.java (from r1306788, cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claims.java) URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claims.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claims.java&p1=cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claims.java&r1=1306788&r2=1307112&rev=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/Claims.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/security/claims/authorization/Claims.java Thu Mar 29 21:17:35 2012 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.rs.security.saml.authorization; +package org.apache.cxf.security.claims.authorization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimBean.java?rev=1307112&r1=1307111&r2=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimBean.java (original) +++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimBean.java Thu Mar 29 21:17:35 2012 @@ -18,6 +18,8 @@ */ package org.apache.cxf.rs.security.saml.authorization; +import org.apache.cxf.security.claims.authorization.ClaimMode; + public class ClaimBean { private org.apache.cxf.rs.security.saml.assertion.Claim claim; Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java?rev=1307112&r1=1307111&r2=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java (original) +++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java Thu Mar 29 21:17:35 2012 @@ -37,6 +37,9 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; +import org.apache.cxf.security.claims.authorization.Claim; +import org.apache.cxf.security.claims.authorization.ClaimMode; +import org.apache.cxf.security.claims.authorization.Claims; import org.apache.cxf.service.Service; import org.apache.cxf.service.invoker.MethodDispatcher; import org.apache.cxf.service.model.BindingOperationInfo; Modified: cxf/trunk/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptorTest.java?rev=1307112&r1=1307111&r2=1307112&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptorTest.java (original) +++ cxf/trunk/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptorTest.java Thu Mar 29 21:17:35 2012 @@ -34,6 +34,10 @@ import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.rs.security.saml.assertion.Subject; import org.apache.cxf.security.SecurityContext; +import org.apache.cxf.security.claims.authorization.Claim; +import org.apache.cxf.security.claims.authorization.ClaimMode; +import org.apache.cxf.security.claims.authorization.Claims; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SecureClaimBookStore.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SecureClaimBookStore.java?rev=1307112&r1=1307111&r2=1307112&view=diff ============================================================================== --- cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SecureClaimBookStore.java (original) +++ cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SecureClaimBookStore.java Thu Mar 29 21:17:35 2012 @@ -25,8 +25,8 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.apache.cxf.rs.security.saml.authorization.Claim; -import org.apache.cxf.rs.security.saml.authorization.Claims; +import org.apache.cxf.security.claims.authorization.Claim; +import org.apache.cxf.security.claims.authorization.Claims; import org.apache.cxf.systest.jaxrs.security.Book; @Path("/bookstore")