cxf git commit: [CXF-7347] Dynamically setting a Swagger host property if needed

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 5f04f8f70 -> fb069dc54


[CXF-7347] Dynamically setting a Swagger host property if needed


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb069dc5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb069dc5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb069dc5

Branch: refs/heads/3.1.x-fixes
Commit: fb069dc54d47d9f4358b1d450356a1cbe189
Parents: 5f04f8f
Author: Sergey Beryozkin 
Authored: Mon Apr 24 22:16:33 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 22:18:26 2017 +0100

--
 .../jaxrs/swagger/DefaultSwagger2Serializers.java  | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fb069dc5/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index 6a51acc..8048fa1 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Comparator;
@@ -73,9 +74,10 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 final MultivaluedMap headers,
 final OutputStream out) throws IOException {
 
+MessageContext ctx = null;
+   
 if (dynamicBasePath) {
-MessageContext ctx = JAXRSUtils.createContextValue(
-JAXRSUtils.getCurrentMessage(), null, 
MessageContext.class);
+ctx = createMessageContext();
 String currentBasePath = 
StringUtils.substringBeforeLast(ctx.getHttpServletRequest().getRequestURI(), 
"/");
 if (!currentBasePath.equals(beanConfig.getBasePath())) {
 data.setBasePath(currentBasePath);
@@ -88,6 +90,12 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 
data.setSecurityDefinitions(beanConfig.getSwagger().getSecurityDefinitions());
 }
 }
+if (data.getHost() == null) {
+ctx = ctx == null ? createMessageContext() : ctx;
+URI uri = ctx.getUriInfo().getAbsolutePath();
+String authority = uri.getAuthority();
+data.setHost(authority);
+}
 
 if (replaceTags || javadocProvider != null) {
 Map operations = new HashMap<>();
@@ -158,6 +166,11 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 super.writeTo(data, type, genericType, annotations, mediaType, 
headers, out);
 }
 
+private MessageContext createMessageContext() {
+return JAXRSUtils.createContextValue(
+   JAXRSUtils.getCurrentMessage(), null, 
MessageContext.class);
+}
+
 protected String getNormalizedPath(String classResourcePath, String 
operationResourcePath) {
 StringBuilder normalizedPath = new StringBuilder();

cxf git commit: [CXF-7347] Dynamically setting a Swagger host property if needed

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 59cab46f4 -> 4494a00d6


[CXF-7347] Dynamically setting a Swagger host property if needed


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4494a00d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4494a00d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4494a00d

Branch: refs/heads/master
Commit: 4494a00d6bed17e71171a583abf31a2ced6d934e
Parents: 59cab46
Author: Sergey Beryozkin 
Authored: Mon Apr 24 22:16:33 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 22:16:33 2017 +0100

--
 .../jaxrs/swagger/DefaultSwagger2Serializers.java  | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4494a00d/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
index 6a51acc..8048fa1 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/DefaultSwagger2Serializers.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Comparator;
@@ -73,9 +74,10 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 final MultivaluedMap headers,
 final OutputStream out) throws IOException {
 
+MessageContext ctx = null;
+   
 if (dynamicBasePath) {
-MessageContext ctx = JAXRSUtils.createContextValue(
-JAXRSUtils.getCurrentMessage(), null, 
MessageContext.class);
+ctx = createMessageContext();
 String currentBasePath = 
StringUtils.substringBeforeLast(ctx.getHttpServletRequest().getRequestURI(), 
"/");
 if (!currentBasePath.equals(beanConfig.getBasePath())) {
 data.setBasePath(currentBasePath);
@@ -88,6 +90,12 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 
data.setSecurityDefinitions(beanConfig.getSwagger().getSecurityDefinitions());
 }
 }
+if (data.getHost() == null) {
+ctx = ctx == null ? createMessageContext() : ctx;
+URI uri = ctx.getUriInfo().getAbsolutePath();
+String authority = uri.getAuthority();
+data.setHost(authority);
+}
 
 if (replaceTags || javadocProvider != null) {
 Map operations = new HashMap<>();
@@ -158,6 +166,11 @@ public class DefaultSwagger2Serializers extends 
SwaggerSerializers implements Sw
 super.writeTo(data, type, genericType, annotations, mediaType, 
headers, out);
 }
 
+private MessageContext createMessageContext() {
+return JAXRSUtils.createContextValue(
+   JAXRSUtils.getCurrentMessage(), null, 
MessageContext.class);
+}
+
 protected String getNormalizedPath(String classResourcePath, String 
operationResourcePath) {
 StringBuilder normalizedPath = new StringBuilder();

cxf git commit: [CXF-7347] Adjusting the pattern to capture Swagger UI 3.0.x resources as well

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b12af728a -> 5f04f8f70


[CXF-7347] Adjusting the pattern to capture Swagger UI 3.0.x resources as well


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5f04f8f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5f04f8f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5f04f8f7

Branch: refs/heads/3.1.x-fixes
Commit: 5f04f8f708f14208179ffac8e18b3e47274ab25b
Parents: b12af72
Author: Sergey Beryozkin 
Authored: Mon Apr 24 17:14:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 17:20:31 2017 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java  | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5f04f8f7/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 7dbda71..4458df5 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -442,9 +442,12 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 @PreMatching
 @Priority(Priorities.USER)
 protected static class SwaggerUIResourceFilter implements 
ContainerRequestFilter {
-private static final Pattern PATTERN = 
-
Pattern.compile(".*[.]js|/css/.*|/images/.*|/lib/.*|.*ico|/fonts/.*"); 
-
+private static final Pattern PATTERN =
+Pattern.compile(
+  ".*js|.*gz|.*map|oauth2*[.]html|.*png|.*css|.*ico|"
+  + "/css/.*|/images/.*|/lib/.*|/fonts/.*"
+);
+
 @Override
 public void filter(ContainerRequestContext rc) throws IOException {
 if (HttpMethod.GET.equals(rc.getRequest().getMethod())) {

buildbot success in on cxf-site-production

2017-04-24 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/15943

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

cxf git commit: Build fix

2017-04-24 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6b9d2d649 -> b12af728a


Build fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b12af728
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b12af728
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b12af728

Branch: refs/heads/3.1.x-fixes
Commit: b12af728a7f136c412ee07ea64616a216a63fd00
Parents: 6b9d2d6
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 16:46:22 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 16:46:22 2017 +0100

--
 .../main/java/org/apache/cxf/configuration/jsse/SSLUtils.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b12af728/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java 
b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 9f911e7..b9c4a44 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -22,11 +22,12 @@ package org.apache.cxf.configuration.jsse;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
@@ -246,7 +247,7 @@ public final class SSLUtils {
  new Object[]{trustStoreLocation, e.getMessage()});
 } 
 } else {
-try (FileInputStream trustStoreInputStream = new 
FileInputStream(trustStoreLocation)) {
+try (InputStream trustStoreInputStream = 
Files.newInputStream(Paths.get(trustStoreLocation))) {
 trustedCertStore.load(trustStoreInputStream, null);
 }
 }

cxf git commit: Recording .gitmergeinfo Changes

2017-04-24 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4777fc76f -> 8c8a1faf8


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c8a1faf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c8a1faf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c8a1faf

Branch: refs/heads/3.0.x-fixes
Commit: 8c8a1faf82abceb0f63719563c7a437c93fa676f
Parents: 4777fc7
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 16:03:39 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 16:03:39 2017 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8c8a1faf/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 54c4105..2db0dd0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,7 @@
 origin/3.1.x-fixes
 
 B 000c347db18d4a774cccbc826cb1384360f272df
+B 0010efbe2e31fbc6068e79ce8a0f7586ad04972e
 B 004321a2e955665005b9c5bfe304feaf9cb622b0
 B 004a87831c55655f2b91054eaeb3fff0f8e8986f
 B 00589e44810f2d8cf1a830bb80842067c73cb8c2
@@ -726,6 +727,7 @@ B 6aa73265ae179bb4ebc3d826c1661ecab387067b
 B 6af09877545cb1fe34fce0057b5b39cb264b5f7c
 B 6b206657384568c5e8a85e0483234d1deffdf4fc
 B 6b7631060e263852af694c3bb307db19a3d68c19
+B 6b9d2d649a0b67fb15904b5b99deda2824a7553c
 B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6c14b437f2fadd1ab273455c0d6779e45180f642
 B 6c5225f0b84517f869808e8f6a9665f3ebdfe0bc

[2/2] cxf git commit: Removing FileInput/OutputStream

2017-04-24 Thread coheigea 
Removing FileInput/OutputStream

# Conflicts:
#   core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
#   
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
#   
testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
#   tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
#   
tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
#   
tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0010efbe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0010efbe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0010efbe

Branch: refs/heads/3.1.x-fixes
Commit: 0010efbe2e31fbc6068e79ce8a0f7586ad04972e
Parents: c5e3bd8
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 15:59:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 16:03:06 2017 +0100

--
 .../cxf/attachment/ImageDataContentHandler.java |  4 ++--
 .../apache/cxf/configuration/jsse/SSLUtils.java | 20 
 .../jsse/TLSParameterJaxBUtils.java | 10 
 .../java/org/apache/cxf/helpers/FileUtils.java  |  3 +--
 .../java/org/apache/cxf/helpers/IOUtils.java|  6 ++---
 .../org/apache/cxf/io/CachedOutputStream.java   | 10 
 .../java/org/apache/cxf/io/CachedWriter.java|  6 ++---
 .../org/apache/cxf/resource/URIResolver.java|  4 ++--
 .../org/apache/cxf/staxutils/StaxUtils.java |  4 ++--
 .../maven_plugin/wsdl2java/WSDL2JavaMojo.java   |  7 +++---
 .../maven_plugin/javatowadl/DumpJavaDoc.java| 12 ++
 .../javatowadl/ResourceMapJavaDocProvider.java  | 10 
 .../cxf/binding/corba/utils/OrbConfig.java  |  5 ++--
 .../cxf/jaxrs/provider/BinaryDataProvider.java  | 11 -
 .../cxf/jaxrs/provider/MultipartProvider.java   |  4 ++--
 .../endpoint/dynamic/DynamicClientFactory.java  | 10 
 .../persistence/FilesystemExchangeDataDAO.java  |  5 ++--
 .../httpclient/PublicSuffixMatcherLoader.java   |  4 ++--
 .../x509/repo/file/FileCertificateRepo.java | 24 +++-
 .../cxf/testutil/common/ServerLauncher.java | 14 +++-
 .../org/apache/cxf/tools/common/ClassUtils.java |  9 
 .../org/apache/cxf/tools/util/JAXBUtils.java| 13 ++-
 .../cxf/tools/util/OutputStreamCreator.java |  4 ++--
 .../apache/cxf/tools/util/ToolsStaxUtils.java   | 10 
 .../cxf/tools/corba/common/SchemaFactory.java   |  9 
 .../tools/corba/common/WSDLCorbaFactory.java|  9 
 .../corba/utils/FileOutputStreamFactory.java|  7 +++---
 .../java2js/processor/JavaToJSProcessor.java|  9 
 .../generator/wsdl11/WSDL11Generator.java   |  4 ++--
 .../tools/wadlto/jaxb/CustomizationParser.java  |  4 ++--
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java |  4 ++--
 .../cxf/tools/wsdlto/WSDLToJavaContainer.java   | 11 -
 .../databinding/jaxb/JAXBDataBinding.java   |  7 +++---
 .../javascript/WSDLToJavaScriptProcessor.java   | 13 ++-
 .../customization/CustomizationParser.java  |  4 ++--
 .../misc/processor/XSDToWSDLProcessor.java  |  5 ++--
 36 files changed, 155 insertions(+), 140 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0010efbe/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java 
b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
index 8bd0223..854d8ba 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
@@ -27,10 +27,10 @@ import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Iterator;
 
 import javax.activation.ActivationDataFlavor;
@@ -98,7 +98,7 @@ public class ImageDataContentHandler implements 
DataContentHandler {
 } else if (obj instanceof InputStream) {
 IOUtils.copyAndCloseInput((InputStream)obj, os);
 } else if (obj instanceof File) {
-FileInputStream file = new FileInputStream((File)obj);
+InputStream file = Files.newInputStream(((File)obj).toPath());
 IOUtils.copyAndCloseInput(file, os);
 } else {

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2017-04-24 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c5e3bd874 -> 6b9d2d649


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6b9d2d64
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b9d2d64
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b9d2d64

Branch: refs/heads/3.1.x-fixes
Commit: 6b9d2d649a0b67fb15904b5b99deda2824a7553c
Parents: 0010efb
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 16:03:06 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 16:03:06 2017 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6b9d2d64/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7e60a22..a09a6ec 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -28,6 +28,7 @@ B 111d52fd4b92d0222af9bf1c22156145ea01ed01
 B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff
 B 122d1f64f248294a4303632571ec363aea4c2179
 B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
+B 1329e2c2b2f83a7b6e80ad2f15a2602161343749
 B 137485de37b3bf81e305e616a5af81741620f547
 B 140ad80be96ea11d360cd7a1d8e791ca91a2220d
 B 1552f881183ba35b3706dc3c8061d7c6d85c7238
@@ -539,6 +540,7 @@ M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
 M ed9298066428c0dfc4590a556876d696a4ba13c0
 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
 M f133df0f691191fac9566726db06c9b4dc7b65a6
+M f3304a89a7e93e9c466ee5dbd8d97ffe2d50f50f
 M f462c797eab75e9b6c6c352b4baeb84429866068
 M f7f017f2187d59369a7b94bb053f1e297972dce7
 M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5

[1/2] cxf git commit: Removing FileInput/OutputStream

2017-04-24 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master e647cb1f8 -> f3304a89a


Removing FileInput/OutputStream


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3304a89
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3304a89
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3304a89

Branch: refs/heads/master
Commit: f3304a89a7e93e9c466ee5dbd8d97ffe2d50f50f
Parents: 1329e2c
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 15:59:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 15:59:34 2017 +0100

--
 .../cxf/attachment/ImageDataContentHandler.java |  4 ++--
 .../apache/cxf/configuration/jsse/SSLUtils.java | 16 ++---
 .../jsse/TLSParameterJaxBUtils.java | 10 
 .../java/org/apache/cxf/helpers/FileUtils.java  |  3 +--
 .../java/org/apache/cxf/helpers/IOUtils.java|  6 ++---
 .../org/apache/cxf/io/CachedOutputStream.java   | 10 
 .../java/org/apache/cxf/io/CachedWriter.java|  6 ++---
 .../org/apache/cxf/resource/URIResolver.java|  4 ++--
 .../org/apache/cxf/staxutils/StaxUtils.java |  4 ++--
 .../maven_plugin/wsdl2java/WSDL2JavaMojo.java   |  7 +++---
 .../maven_plugin/javatowadl/DumpJavaDoc.java| 12 ++
 .../javatowadl/ResourceMapJavaDocProvider.java  | 10 
 .../cxf/binding/corba/utils/OrbConfig.java  |  5 ++--
 .../cxf/jaxrs/provider/BinaryDataProvider.java  | 11 -
 .../cxf/jaxrs/provider/MultipartProvider.java   |  4 ++--
 .../endpoint/dynamic/DynamicClientFactory.java  | 10 
 .../persistence/FilesystemExchangeDataDAO.java  |  5 ++--
 .../httpclient/PublicSuffixMatcherLoader.java   |  4 ++--
 .../x509/repo/file/FileCertificateRepo.java | 24 +++-
 .../cxf/testutil/common/ServerLauncher.java | 12 ++
 .../org/apache/cxf/tools/common/ClassUtils.java |  9 
 .../org/apache/cxf/tools/util/JAXBUtils.java| 13 ++-
 .../cxf/tools/util/OutputStreamCreator.java |  4 ++--
 .../apache/cxf/tools/util/ToolsStaxUtils.java   |  8 +++
 .../cxf/tools/corba/common/SchemaFactory.java   |  9 
 .../tools/corba/common/WSDLCorbaFactory.java|  9 
 .../corba/utils/FileOutputStreamFactory.java|  7 +++---
 .../java2js/processor/JavaToJSProcessor.java|  9 
 .../generator/wsdl11/WSDL11Generator.java   |  4 ++--
 .../tools/wadlto/jaxb/CustomizationParser.java  |  4 ++--
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java |  4 ++--
 .../cxf/tools/wsdlto/WSDLToJavaContainer.java   | 11 -
 .../databinding/jaxb/JAXBDataBinding.java   |  7 +++---
 .../javascript/WSDLToJavaScriptProcessor.java   |  9 
 .../customization/CustomizationParser.java  |  4 ++--
 .../misc/processor/XSDToWSDLProcessor.java  |  5 ++--
 36 files changed, 149 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f3304a89/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java 
b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
index 2b28980..f007377 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
@@ -27,10 +27,10 @@ import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Iterator;
 
 import javax.activation.ActivationDataFlavor;
@@ -98,7 +98,7 @@ public class ImageDataContentHandler implements 
DataContentHandler {
 } else if (obj instanceof InputStream) {
 IOUtils.copyAndCloseInput((InputStream)obj, os);
 } else if (obj instanceof File) {
-FileInputStream file = new FileInputStream((File)obj);
+InputStream file = Files.newInputStream(((File)obj).toPath());
 IOUtils.copyAndCloseInput(file, os);
 } else {
 throw new IOException("Attachment type not spported " + 
obj.getClass());

http://git-wip-us.apache.org/repos/asf/cxf/blob/f3304a89/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java 
b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 1bf116b..99716f1 100644
---

[2/2] cxf git commit: Updating Santuario version

2017-04-24 Thread coheigea 
Updating Santuario version


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1329e2c2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1329e2c2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1329e2c2

Branch: refs/heads/master
Commit: 1329e2c2b2f83a7b6e80ad2f15a2602161343749
Parents: e647cb1
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 15:16:20 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 15:59:34 2017 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1329e2c2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3d60dcd..2560100 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -204,7 +204,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.0.8
+2.1.0-SNAPSHOT
 1.7R2_3
 1.2_5
 2.11.0_1

cxf git commit: Removing a duplicate and wrong grant type auth code update as noticed by Adrian Gonzalez

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a2c97032e -> c5e3bd874


Removing a duplicate and wrong grant type auth code update as noticed by Adrian 
Gonzalez


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5e3bd87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5e3bd87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5e3bd87

Branch: refs/heads/3.1.x-fixes
Commit: c5e3bd87475d3df1a8e110f6ce57afe4323c24d0
Parents: a2c9703
Author: Sergey Beryozkin 
Authored: Mon Apr 24 13:37:07 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 13:40:02 2017 +0100

--
 .../security/oauth2/grants/code/AuthorizationCodeGrantHandler.java  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c5e3bd87/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index 7adc665..1935c7b 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -146,7 +146,6 @@ public class AuthorizationCodeGrantHandler extends 
AbstractGrantHandler {
 reg.setAudiences(audiences);
 reg.setResponseType(grant.getResponseType());
 reg.setClientCodeVerifier(codeVerifier);
-reg.setGrantType(OAuthConstants.CODE_RESPONSE_TYPE);
 reg.getExtraProperties().putAll(grant.getExtraProperties());
 return getDataProvider().createAccessToken(reg);
 }

cxf git commit: Removing a duplicate and wrong grant type auth code update as noticed by Adrian Gonzalez

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 02e822fa5 -> e647cb1f8


Removing a duplicate and wrong grant type auth code update as noticed by Adrian 
Gonzalez


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e647cb1f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e647cb1f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e647cb1f

Branch: refs/heads/master
Commit: e647cb1f8e4046139fe808458e92ce2c9a69ed31
Parents: 02e822f
Author: Sergey Beryozkin 
Authored: Mon Apr 24 13:37:07 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 13:37:07 2017 +0100

--
 .../security/oauth2/grants/code/AuthorizationCodeGrantHandler.java  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e647cb1f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
index 1fe42d1..a5f0e2a 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrantHandler.java
@@ -145,7 +145,6 @@ public class AuthorizationCodeGrantHandler extends 
AbstractGrantHandler {
 reg.setAudiences(audiences);
 reg.setResponseType(grant.getResponseType());
 reg.setClientCodeVerifier(codeVerifier);
-reg.setGrantType(OAuthConstants.CODE_RESPONSE_TYPE);
 reg.getExtraProperties().putAll(grant.getExtraProperties());
 return getDataProvider().createAccessToken(reg);
 }

cxf-fediz git commit: Removing FileInputStream

2017-04-24 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1e7a29358 -> 5af780362


Removing FileInputStream


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5af78036
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5af78036
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5af78036

Branch: refs/heads/master
Commit: 5af78036284a5615d6fb6580af6841eb72130c41
Parents: 1e7a293
Author: Colm O hEigeartaigh 
Authored: Mon Apr 24 12:23:23 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Apr 24 12:23:23 2017 +0100

--
 .../java/org/apache/cxf/fediz/core/config/FedizConfigurator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5af78036/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
--
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
index 00f8129..e4a61c1 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
@@ -20,11 +20,11 @@
 package org.apache.cxf.fediz.core.config;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,7 +43,7 @@ public class FedizConfigurator {
 private List fedizContextList;
 
 public FedizConfig loadConfig(File f) throws JAXBException, IOException {
-try (InputStream input = new FileInputStream(f)) {
+try (InputStream input = Files.newInputStream(f.toPath())) {
 rootConfig = (FedizConfig) 
getJaxbContext().createUnmarshaller().unmarshal(input);
 }
 parseFedizContextList();

cxf git commit: Updating and aligning Spring (Boot) versions, patch from Dennis Kieselhorst applied, This closes #268

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master f209d05f9 -> 02e822fa5


Updating and aligning Spring (Boot) versions, patch from Dennis Kieselhorst 
applied, This closes #268


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/02e822fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02e822fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02e822fa

Branch: refs/heads/master
Commit: 02e822fa5a3c550f7cb963be5abc0b57a78c5571
Parents: f209d05
Author: Sergey Beryozkin 
Authored: Mon Apr 24 12:17:28 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 12:17:28 2017 +0100

--
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/02e822fa/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index ffa3fcc..048ee42 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,7 +30,7 @@
 
 true
 UTF-8
-1.5.1.RELEASE
+1.5.3.RELEASE
 
1.1.3.RELEASE
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/02e822fa/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 626557d..3d60dcd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -150,8 +150,8 @@
 1.2
 1.7.24
 1.2
-4.3.7.RELEASE
-1.5.2.RELEASE
+4.3.8.RELEASE
+1.5.3.RELEASE
 
4.2.2.RELEASE
 1.2.1
 2.3.1.RELEASE

cxf git commit: [CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch from Dennis Kieselhorst applied, This closes #267

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e7774e76e -> a2c97032e


[CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch 
from Dennis Kieselhorst applied, This closes #267


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a2c97032
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a2c97032
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a2c97032

Branch: refs/heads/3.1.x-fixes
Commit: a2c97032e8185862f3ef27be83b05da167d89ad9
Parents: e7774e7
Author: Sergey Beryozkin 
Authored: Mon Apr 24 12:08:26 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 12:09:32 2017 +0100

--
 .../AbstractSpringComponentScanServer.java   | 19 ---
 1 file changed, 4 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a2c97032/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index 840c1fd..e7a008c 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -46,7 +46,6 @@ import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
@@ -72,9 +71,6 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 private List resourceProviders = new 
LinkedList();
 private List jaxrsProviders = new LinkedList();
 private List cxfFeatures = new LinkedList();
-private List cxfInInterceptors = new 
LinkedList();
-private List cxfOutInterceptors = new 
LinkedList();
-private List cxfOutFaultInterceptors = new 
LinkedList();
 private Class serviceAnnotation;
 
 protected AbstractSpringComponentScanServer() {
@@ -252,11 +248,11 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 if (ann.value() == org.apache.cxf.annotations.Provider.Type.Feature) {
 cxfFeatures.add((Feature)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.InInterceptor) {
-cxfInInterceptors.add((Interceptor)bean);
+super.getInInterceptors().add((Interceptor)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.OutInterceptor) {
-cxfOutInterceptors.add((Interceptor)bean);
+super.getOutInterceptors().add((Interceptor)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.OutFaultInterceptor) {
-cxfOutFaultInterceptors.add((Interceptor)bean);
+super.getOutFaultInterceptors().add((Interceptor)bean);
 }
 }
 
@@ -278,14 +274,7 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 public List getFeatures() {
 return cxfFeatures;
 }
-@Override
-public List getInInterceptors() {
-return cxfInInterceptors;
-}
-public List getOutInterceptors() {
-return cxfOutInterceptors;
-}
-
+
 protected JAXRSServerFactoryBean 
createFactoryBeanFromApplication(Application app) {
 return ResourceUtils.createApplication(app, false, true, false, 
getBus());
 }

cxf git commit: [CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch from Dennis Kieselhorst applied, This closes #267

2017-04-24 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 2735d624a -> f209d05f9


[CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch 
from Dennis Kieselhorst applied, This closes #267


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f209d05f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f209d05f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f209d05f

Branch: refs/heads/master
Commit: f209d05f9c32b845fb9ea0071aaddf1bc0468ebd
Parents: 2735d62
Author: Sergey Beryozkin 
Authored: Mon Apr 24 12:08:26 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Apr 24 12:08:26 2017 +0100

--
 .../AbstractSpringComponentScanServer.java   | 19 ---
 1 file changed, 4 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f209d05f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index 36c0b7e..3e808e6 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -46,7 +46,6 @@ import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
@@ -72,9 +71,6 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 private List resourceProviders = new 
LinkedList();
 private List jaxrsProviders = new LinkedList();
 private List cxfFeatures = new LinkedList();
-private List cxfInInterceptors = new 
LinkedList();
-private List cxfOutInterceptors = new 
LinkedList();
-private List cxfOutFaultInterceptors = new 
LinkedList();
 private Class serviceAnnotation;
 
 protected AbstractSpringComponentScanServer() {
@@ -251,11 +247,11 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 if (ann.value() == org.apache.cxf.annotations.Provider.Type.Feature) {
 cxfFeatures.add((Feature)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.InInterceptor) {
-cxfInInterceptors.add((Interceptor)bean);
+super.getInInterceptors().add((Interceptor)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.OutInterceptor) {
-cxfOutInterceptors.add((Interceptor)bean);
+super.getOutInterceptors().add((Interceptor)bean);
 } else if (ann.value() == 
org.apache.cxf.annotations.Provider.Type.OutFaultInterceptor) {
-cxfOutFaultInterceptors.add((Interceptor)bean);
+super.getOutFaultInterceptors().add((Interceptor)bean);
 }
 }
 
@@ -277,14 +273,7 @@ public abstract class AbstractSpringComponentScanServer 
extends AbstractSpringCo
 public List getFeatures() {
 return cxfFeatures;
 }
-@Override
-public List getInInterceptors() {
-return cxfInInterceptors;
-}
-public List getOutInterceptors() {
-return cxfOutInterceptors;
-}
-
+
 protected JAXRSServerFactoryBean 
createFactoryBeanFromApplication(Application app) {
 return ResourceUtils.createApplication(app, false, true, false, 
getBus());
 }

buildbot failure in on cxf-site-production

2017-04-24 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/15934

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot