This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b8fc2da Moving the ClaimsAuthorizingFilter into the JAX-RS frontend
as it's common to the Claims stuff in cxf-rt-security now as well
b8fc2da is described below
commit b8fc2da105029c10cf24ed344198fbefdd190648
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Sep 14 15:56:11 2018 +0100
Moving the ClaimsAuthorizingFilter into the JAX-RS frontend as it's common
to the Claims stuff in cxf-rt-security now as well
---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
rt/frontend/jaxrs/pom.xml | 7 ++++++-
.../org/apache/cxf/jaxrs/security}/ClaimsAuthorizingFilter.java | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index b9773ed..9a643c7 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -136,7 +136,6 @@
</feature>
<feature name="cxf-rt-security" version="${project.version}">
<feature version="${project.version}">cxf-core</feature>
- <feature version="${project.version}">cxf-wsdl</feature>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-security/${project.version}</bundle>
</feature>
<feature name="cxf-rt-security-saml" version="${project.version}">
@@ -235,6 +234,7 @@
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-http</feature>
<feature version="${project.version}">cxf-jackson</feature>
+ <feature version="${project.version}">cxf-rt-security</feature>
<bundle start-level="30"
dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 6a44e60..d0fd505 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -112,9 +112,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>${cxf.servlet-api.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/claims/ClaimsAuthorizingFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/ClaimsAuthorizingFilter.java
similarity index 97%
rename from
rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/claims/ClaimsAuthorizingFilter.java
rename to
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/ClaimsAuthorizingFilter.java
index 9d5dfcd..b19d269 100644
---
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/claims/ClaimsAuthorizingFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/ClaimsAuthorizingFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.rs.security.claims;
+package org.apache.cxf.jaxrs.security;
import java.util.List;
import java.util.Map;
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
index 3c6a049..85508b4 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml
@@ -71,7 +71,7 @@ under the License.
</property>
</bean>
- <bean id="claimsHandler"
class="org.apache.cxf.rs.security.claims.ClaimsAuthorizingFilter">
+ <bean id="claimsHandler"
class="org.apache.cxf.jaxrs.security.ClaimsAuthorizingFilter">
<property name="securedObject" ref="serviceBean"/>
</bean>
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
index fd9620d..365f8ff 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
@@ -40,7 +40,7 @@ under the License.
<bean id="serviceBean"
class="org.apache.cxf.systest.jaxrs.security.saml.SecureBookStore"/>
<bean id="serviceBeanClaims"
class="org.apache.cxf.systest.jaxrs.security.saml.SecureClaimBookStore"/>
<bean id="samlEnvHandler"
class="org.apache.cxf.rs.security.saml.SamlEnvelopedInHandler"/>
- <bean id="claimsHandler"
class="org.apache.cxf.rs.security.claims.ClaimsAuthorizingFilter">
+ <bean id="claimsHandler"
class="org.apache.cxf.jaxrs.security.ClaimsAuthorizingFilter">
<property name="securedObject" ref="serviceBeanClaims"/>
</bean>
<bean id="authorizationInterceptor"
class="org.apache.cxf.interceptor.security.SecureAnnotationsInterceptor">
