Repository: cxf Updated Branches: refs/heads/master 808a1a778 -> 24963006f
Removing Jwe/Jws factories for now as filters already support the injection of custom Jwe/Jws handlers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24963006 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24963006 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24963006 Branch: refs/heads/master Commit: 24963006f0a6eff2bed9991e7bd6501065f10d1a Parents: 808a1a7 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Tue Nov 25 12:34:16 2014 +0000 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Tue Nov 25 12:34:16 2014 +0000 ---------------------------------------------------------------------- .../jose/jaxrs/AbstractJweDecryptingFilter.java | 5 ---- .../jose/jaxrs/AbstractJwsReaderProvider.java | 5 ---- .../jose/jaxrs/AbstractJwsWriterProvider.java | 5 ---- .../jose/jaxrs/JweWriterInterceptor.java | 5 ---- .../cxf/rs/security/jose/jwe/JweFactory.java | 25 -------------------- .../cxf/rs/security/jose/jws/JwsFactory.java | 25 -------------------- 6 files changed, 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java index f46d523..83e00e1 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweDecryptingFilter.java @@ -27,7 +27,6 @@ import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; import org.apache.cxf.rs.security.jose.jwe.JweDecryptionOutput; import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider; -import org.apache.cxf.rs.security.jose.jwe.JweFactory; import org.apache.cxf.rs.security.jose.jwe.JweHeaders; import org.apache.cxf.rs.security.jose.jwe.JweUtils; @@ -54,10 +53,6 @@ public class AbstractJweDecryptingFilter { return decryption; } Message m = JAXRSUtils.getCurrentMessage(); - Object factory = m.getContextualProperty(JweFactory.class.getName()); - if (factory != null) { - return ((JweFactory)factory).getJweDecryptionProvider(); - } String propLoc = (String)MessageUtils.getContextualProperty(m, RSSEC_ENCRYPTION_IN_PROPS, RSSEC_ENCRYPTION_PROPS); if (propLoc == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java index eb6b300..6027e60 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsReaderProvider.java @@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.jose.jaxrs; import org.apache.cxf.jaxrs.utils.JAXRSUtils; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; -import org.apache.cxf.rs.security.jose.jws.JwsFactory; import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier; import org.apache.cxf.rs.security.jose.jws.JwsUtils; @@ -42,10 +41,6 @@ public class AbstractJwsReaderProvider { } Message m = JAXRSUtils.getCurrentMessage(); - Object factory = m.getContextualProperty(JwsFactory.class.getName()); - if (factory != null) { - return ((JwsFactory)factory).getJwsSignatureVerifier(); - } String propLoc = (String)MessageUtils.getContextualProperty(m, RSSEC_SIGNATURE_IN_PROPS, RSSEC_SIGNATURE_PROPS); if (propLoc == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsWriterProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsWriterProvider.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsWriterProvider.java index fbc7b79..139f20f 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsWriterProvider.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJwsWriterProvider.java @@ -29,7 +29,6 @@ import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; import org.apache.cxf.rs.security.jose.JoseHeaders; import org.apache.cxf.rs.security.jose.jws.JwsCompactProducer; -import org.apache.cxf.rs.security.jose.jws.JwsFactory; import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider; import org.apache.cxf.rs.security.jose.jws.JwsUtils; @@ -48,10 +47,6 @@ public class AbstractJwsWriterProvider { return sigProvider; } Message m = JAXRSUtils.getCurrentMessage(); - Object factory = m.getContextualProperty(JwsFactory.class.getName()); - if (factory != null) { - return ((JwsFactory)factory).getJwsSignatureProvider(); - } String propLoc = (String)MessageUtils.getContextualProperty(m, RSSEC_SIGNATURE_OUT_PROPS, RSSEC_SIGNATURE_PROPS); if (propLoc == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java index e98c56f..a80ac67 100644 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java +++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java @@ -42,7 +42,6 @@ import org.apache.cxf.rs.security.jose.JoseHeadersWriter; import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer; import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider; import org.apache.cxf.rs.security.jose.jwe.JweEncryptionState; -import org.apache.cxf.rs.security.jose.jwe.JweFactory; import org.apache.cxf.rs.security.jose.jwe.JweHeaders; import org.apache.cxf.rs.security.jose.jwe.JweOutputStream; import org.apache.cxf.rs.security.jose.jwe.JweUtils; @@ -120,10 +119,6 @@ public class JweWriterInterceptor implements WriterInterceptor { return encryptionProvider; } Message m = JAXRSUtils.getCurrentMessage(); - Object factory = m.getContextualProperty(JweFactory.class.getName()); - if (factory != null) { - return ((JweFactory)factory).getJweEncryptionProvider(); - } String propLoc = (String)MessageUtils.getContextualProperty(m, RSSEC_ENCRYPTION_OUT_PROPS, RSSEC_ENCRYPTION_PROPS); if (propLoc == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweFactory.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweFactory.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweFactory.java deleted file mode 100644 index 16100ef..0000000 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.rs.security.jose.jwe; - - -public interface JweFactory { - JweEncryptionProvider getJweEncryptionProvider(); - JweDecryptionProvider getJweDecryptionProvider(); -} http://git-wip-us.apache.org/repos/asf/cxf/blob/24963006/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsFactory.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsFactory.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsFactory.java deleted file mode 100644 index f810660..0000000 --- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.rs.security.jose.jws; - - -public interface JwsFactory { - JwsSignatureProvider getJwsSignatureProvider(); - JwsSignatureVerifier getJwsSignatureVerifier(); -}
