Repository: cxf Updated Branches: refs/heads/master 6085471de -> 8644ac41e
[CXF-5944] Moving Base64UrlOutputStream to the core module Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8644ac41 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8644ac41 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8644ac41 Branch: refs/heads/master Commit: 8644ac41e656388a367608c74f02cc2c793cbfed Parents: 6085471 Author: Sergey Beryozkin <[email protected]> Authored: Mon Oct 6 12:52:47 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Oct 6 12:52:47 2014 +0100 ---------------------------------------------------------------------- .../cxf/common/util/Base64UrlOutputStream.java | 29 ++++++++++++++++++ .../jose/jaxrs/JwsWriterInterceptor.java | 2 +- .../oauth2/utils/Base64UrlOutputStream.java | 31 -------------------- 3 files changed, 30 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8644ac41/core/src/main/java/org/apache/cxf/common/util/Base64UrlOutputStream.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64UrlOutputStream.java b/core/src/main/java/org/apache/cxf/common/util/Base64UrlOutputStream.java new file mode 100644 index 0000000..8b2a43a --- /dev/null +++ b/core/src/main/java/org/apache/cxf/common/util/Base64UrlOutputStream.java @@ -0,0 +1,29 @@ +/** + * 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.common.util; + +import java.io.OutputStream; + +public class Base64UrlOutputStream extends Base64OutputStream { + + public Base64UrlOutputStream(OutputStream out) { + super(out, true); + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/8644ac41/rt/rs/security/oauth-parent/oauth2-jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java b/rt/rs/security/oauth-parent/oauth2-jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java index 1251a43..56279e5 100644 --- a/rt/rs/security/oauth-parent/oauth2-jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java +++ b/rt/rs/security/oauth-parent/oauth2-jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java @@ -27,6 +27,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptorContext; +import org.apache.cxf.common.util.Base64UrlOutputStream; import org.apache.cxf.common.util.Base64UrlUtility; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.jaxrs.utils.JAXRSUtils; @@ -39,7 +40,6 @@ import org.apache.cxf.rs.security.jose.jws.JwsOutputStream; import org.apache.cxf.rs.security.jose.jws.JwsSignature; import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider; import org.apache.cxf.rs.security.jose.jwt.JwtHeaders; -import org.apache.cxf.rs.security.oauth2.utils.Base64UrlOutputStream; @Priority(Priorities.JWS_WRITE_PRIORITY) public class JwsWriterInterceptor extends AbstractJwsWriterProvider implements WriterInterceptor { http://git-wip-us.apache.org/repos/asf/cxf/blob/8644ac41/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/Base64UrlOutputStream.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/Base64UrlOutputStream.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/Base64UrlOutputStream.java deleted file mode 100644 index 549b062..0000000 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/Base64UrlOutputStream.java +++ /dev/null @@ -1,31 +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.oauth2.utils; - -import java.io.OutputStream; - -import org.apache.cxf.common.util.Base64OutputStream; - -public class Base64UrlOutputStream extends Base64OutputStream { - - public Base64UrlOutputStream(OutputStream out) { - super(out, true); - } - -}
