cxf git commit: [CXF-7482] Let users customize Swagger2Feature with the external properties file

2017-08-22 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b283ae8cd -> 756014e9c


[CXF-7482] Let users customize Swagger2Feature with the external properties file


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

Branch: refs/heads/3.1.x-fixes
Commit: 756014e9c36d5b481b0b4556a375af0c86abc254
Parents: b283ae8
Author: Sergey Beryozkin 
Authored: Tue Aug 22 16:43:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Tue Aug 22 17:50:26 2017 +0100

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   |  15 +-
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 243 +++
 .../cxf/jaxrs/swagger/SwaggerFeature.java   |  45 +++-
 .../AbstractSwagger2ServiceDescriptionTest.java |  25 +-
 .../Swagger2CustomPropertiesTest.java   |  66 +
 .../src/test/resources/files/swagger.properties |   5 +
 6 files changed, 338 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/756014e9/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index 427ab49..c073bb0 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -31,6 +31,9 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 
 public abstract class AbstractSwaggerFeature extends AbstractFeature {
 
+static final String DEFAULT_LICENSE_VALUE = "Apache 2.0 License";
+static final String DEFAULT_LICENSE_URL = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+
 private static final boolean SWAGGER_JAXRS_AVAILABLE;
 
 static {
@@ -41,14 +44,14 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 protected boolean runAsFilter;
 private boolean activateOnlyIfJaxrsSupported;
 private String resourcePackage;
-private String version = "1.0.0";
+private String version;
 // depending on swagger version basePath is set differently
 private String basePath;
-private String title = "Sample REST Application";
-private String description = "The Application";
-private String contact = "us...@cxf.apache.org";
-private String license = "Apache 2.0 License";
-private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+private String title;
+private String description;
+private String contact;
+private String license;
+private String licenseUrl;
 private String termsOfServiceUrl;
 private String filterClass;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/756014e9/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 108db51..ed1bb6e 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
@@ -19,6 +19,7 @@
 package org.apache.cxf.jaxrs.swagger;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
@@ -28,6 +29,7 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -53,6 +55,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.Provider;
 import org.apache.cxf.annotations.Provider.Scope;
 import org.apache.cxf.annotations.Provider.Type;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
@@ -62,6 +65,7 @@ import org.apache.cxf.jaxrs.model.ApplicationInfo;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
+import org.apache.cxf.jaxrs.utils.ResourceUtils;
 import

cxf git commit: [CXF-7482] Let users customize Swagger2Feature with the external properties file

2017-08-22 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e127bc912 -> 982556218


[CXF-7482] Let users customize Swagger2Feature with the external properties file


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

Branch: refs/heads/master
Commit: 982556218c86ad834a6bf76e62e0a77d055e291d
Parents: e127bc9
Author: Sergey Beryozkin 
Authored: Tue Aug 22 16:43:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Tue Aug 22 16:43:16 2017 +0100

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   |   4 +-
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 232 +++
 .../AbstractSwagger2ServiceDescriptionTest.java |  19 +-
 .../Swagger2CustomPropertiesTest.java   |  69 ++
 .../src/test/resources/files/swagger.properties |   5 +
 5 files changed, 280 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/98255621/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index d5135ae..11ba731 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -47,8 +47,8 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 private String title;
 private String description;
 private String contact;
-private String license = "Apache 2.0 License";
-private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+private String license;
+private String licenseUrl;
 private String termsOfServiceUrl;
 private String filterClass;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/98255621/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 8260281..78bc676 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
@@ -19,6 +19,7 @@
 package org.apache.cxf.jaxrs.swagger;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
@@ -28,6 +29,7 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -53,6 +55,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.Provider;
 import org.apache.cxf.annotations.Provider.Scope;
 import org.apache.cxf.annotations.Provider.Type;
+import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
@@ -62,6 +65,7 @@ import org.apache.cxf.jaxrs.model.ApplicationInfo;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
+import org.apache.cxf.jaxrs.utils.ResourceUtils;
 import org.apache.cxf.message.Message;
 
 import io.swagger.jaxrs.config.BeanConfig;
@@ -74,13 +78,27 @@ import io.swagger.models.auth.SecuritySchemeDefinition;
 
 @Provider(value = Type.Feature, scope = Scope.Server)
 public class Swagger2Feature extends AbstractSwaggerFeature {
-
-private String host;
-
-private String[] schemes;
-
-private boolean prettyPrint;
 
+private static final String DEFAULT_LICENSE_VALUE = "Apache 2.0 License";
+private static final String DEFAULT_LICENSE_URL = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+
+private static final String DEFAULT_PROPS_LOCATION = "/swagger.properties";
+private static final String RESOURCE_PACKAGE_PROPERTY = "resource.package";
+private static final String TITLE_PROPERTY = "title";
+private static final String SCHEMES_PROPERTY = "schemes";
+private static final String VERSION_PROPERTY = "version";
+private static final String

[1/3] cxf git commit: update maven-compiler-plugin

2017-08-22 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 417b13b07 -> b283ae8cd


update maven-compiler-plugin


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

Branch: refs/heads/3.1.x-fixes
Commit: ece77ee0513156c67969bd2a65f17c0ecefee42f
Parents: 417b13b
Author: Dennis Kieselhorst 
Authored: Mon Aug 7 14:47:14 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Tue Aug 22 09:51:59 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ece77ee0/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 7a4da47..13bcf38 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -155,7 +155,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.6.1
+3.6.2
 
 1.7
 1.7

http://git-wip-us.apache.org/repos/asf/cxf/blob/ece77ee0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 58e6727..21e6e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.6.1
+3.6.2
 
 ${cxf.jdk.version}
 ${cxf.jdk.version}
@@ -483,7 +483,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.6.1
+3.6.2
 
 1.7
 1.7

http://git-wip-us.apache.org/repos/asf/cxf/blob/ece77ee0/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
--
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml 
b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 3184606..b027cfa 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -38,7 +38,7 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
-3.6.1
+3.6.2
 
 1.7
 1.7

[2/3] cxf git commit: fixed typo in log message

2017-08-22 Thread deki 
fixed typo in log message


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

Branch: refs/heads/3.1.x-fixes
Commit: b504fcb7041aa2a29d8602d5d1e72670a953813c
Parents: ece77ee
Author: Dennis Kieselhorst 
Authored: Tue Aug 22 09:41:25 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Tue Aug 22 09:54:28 2017 +0200

--
 .../java/org/apache/cxf/transport/servlet/ServletController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b504fcb7/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
index dbd59ad..6f60da6 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
@@ -179,7 +179,7 @@ public class ServletController {
 d = destinationRegistry.checkRestfulRequest(pathInfo);
 if (d == null || d.getMessageObserver() == null) {
 if (returnErrors) {
-LOG.warning("Can't find the the request for "
+LOG.warning("Can't find the request for "
 + request.getRequestURL() + "'s Observer ");
 generateNotFound(request, res);
 }

[3/3] cxf git commit: Recording .gitmergeinfo Changes

2017-08-22 Thread deki 
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/b283ae8c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b283ae8c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b283ae8c

Branch: refs/heads/3.1.x-fixes
Commit: b283ae8cdeee75b2badd9073606297cae6210678
Parents: b504fcb
Author: Dennis Kieselhorst 
Authored: Tue Aug 22 09:54:28 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Tue Aug 22 09:54:28 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b283ae8c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c313db5..036ed61 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -462,6 +462,7 @@ M 048b46de4b2973bbccbaacf5effe34b06faf3e68
 M 055f1d738016ae5caf3eba42e656782de8490890
 M 0578e16146527b0782530c40ba2db17531756d96
 M 07093d2f50f8e37b10b45f5e24e4b1e71dec352e
+M 070c4fce493328a534c1ea766fdf1af74087cc64
 M 07707cd522e63cd0574db378e08f2f820882b5ec
 M 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b
 M 088b1235dd3af856fd9c2298e28d26ee685d803f
@@ -497,6 +498,7 @@ M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
 M 1a45914bca678b4be3c52a8c2f2a479aae7b8347
 M 1a7411c270810507626a15d4a4cdc574d6ff62c3
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
+M 1b0d3c964e0896dbdeb8fe5d59178c10cf4fab06
 M 1e57d379863d01b9330fff797c14d81a56b0b0f2
 M 1f9cbe3678c1984fd2fd57e26fdd5626841c32e9
 M 20d0a2811c15cb65a402eb063e1359236d7014ea
@@ -504,6 +506,8 @@ M 21031e3ab2ae227540e2a078d0336d894361acba
 M 21618dad08506cc80edde02cf1661cecd06c49ab
 M 2519863ca4d11ca1b6f3ac74361f3eaba3918690
 M 2538ae42fb0c774023deed5264291b2fe6658cb8
+M 262ebe6bd5a46a7f5c27976b02e2e4ba25e589f8
+M 265a4c04b29d3c9e792cb014c2e9ee86128e28e8
 M 26edcd457ea507075a4c82e2787f11f11a432876
 M 26feb75455abbf3ef999804395d4c5d5348042a2
 M 2735d624afed00841621ce4fe0e9c864d76f5bcc
@@ -545,6 +549,7 @@ M 428f7700de80d4d6ea09158f42d057e9f24abe48
 M 437c7daa3345c8482deab4a4da9b164e68fd417a
 M 43e19de6c7409070aa4c7c52158ec33f5a4651b9
 M 45d54d558625236b84752b0d7976f0cf85518c16
+M 468edbdcb420128c29d16ee143ab073a475852b8
 M 4719a033d54fd9fcd173be273e6c320d8353b631
 M 47691ae5c2c6528d95795a51e98e02b54a033c88
 M 4799fef822a96f5d1b2827d5cc42ab886fd4e673
@@ -568,6 +573,7 @@ M 539cbd70fb39676d64d0987e570fe69ff3d485d3
 M 56fc03c41782ef3e706d7126063a7baffd4a5cb9
 M 5724e615409916ce3176d430cb91bae44f3447d9
 M 574b2a9997c94011794fa2e083181e23c9936f15
+M 5813a363bf75d63d9e3186ba10fb06d3c83fe3f6
 M 585df048b7730ee36644a4bb7c1a20fcf977d79e
 M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
 M 598a45d5b2add46995cbced55209be7ecacd4a51
@@ -589,6 +595,7 @@ M 63e100e48f7c34ec167728497a3ef006a7a34024
 M 65c1204abcef8720d4eb985d58e3f865e39a1da3
 M 6613e46662317ea151f72e26e5deb4f50148a148
 M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
+M 696287d157d5b89e8eff7ef4196cc46bdaa5ccb7
 M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
 M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
 M 6fec911ee7848bd35c3ad5aaa5ff7607ba30e624
@@ -660,6 +667,7 @@ M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
 M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
 M 9d64bcedb508732cdc377312f0fb433ee1dc630e
 M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
+M 9ef150dd971b8f8752e3fd3c7eec2fe5de41f160
 M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
@@ -716,6 +724,7 @@ M cbb8261fc8f7261b8ef91a5931a2b343a7177d33
 M cbd4e7fa6b3e15d39f12d39a448ee3742d5d3efe
 M cbf0ca69edb54ce58fc8063dfaa03fa497004ec6
 M cd782fef123d2147a6f5cb04fb6cdfe8cf0ac81a
+M ce3de8e355a58fae2c52e89d1fd37c80a60e2d6b
 M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
 M cf8ac102e728b8745da265ec969f7b5160829fdb
 M cfe59def64bdfa2f73b6c05668602ee3cdf75b1d

cxf git commit: fixed typo in log message

2017-08-22 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master 6b99105c1 -> e127bc912


fixed typo in log message


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

Branch: refs/heads/master
Commit: e127bc912d3094e906cdf73ba5783089638c0cbb
Parents: 6b99105
Author: Dennis Kieselhorst 
Authored: Tue Aug 22 09:41:25 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Tue Aug 22 09:41:25 2017 +0200

--
 .../java/org/apache/cxf/transport/servlet/ServletController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e127bc91/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
index 4ae5f5a..10b5421 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
@@ -179,7 +179,7 @@ public class ServletController {
 d = destinationRegistry.checkRestfulRequest(pathInfo);
 if (d == null || d.getMessageObserver() == null) {
 if (returnErrors) {
-LOG.warning("Can't find the the request for "
+LOG.warning("Can't find the request for "
 + request.getRequestURL() + "'s Observer ");
 generateNotFound(request, res);
 }