cxf git commit: Fixing 3.0.x build failure

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5356ca1d7 -> 21f8d00c0


Fixing 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 21f8d00c0c983aa12cb7356e555283130a17fc74
Parents: 5356ca1
Author: Sergey Beryozkin 
Authored: Fri Feb 17 15:37:28 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 15:37:28 2017 +

--
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java   | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/21f8d00c/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index dc4a7c9..ac1c97e 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2219,17 +2219,10 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 this.convertResourcesToDOM = convertResourcesToDOM;
 }
 
-<<< HEAD
-===
-public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
-this.incrementNamespacePrefix = incrementNamespacePrefix;
-}
 public void setJaxbContextProperties(Map 
jaxbContextProperties) {
 this.jaxbContextProperties = jaxbContextProperties;
 }
 
-
->>> 99f6606... Adding WadlGenerator jaxbContextProperties, patch from 
Vjacheslav Borisov applied with minor updates, This closes #238
 private static class SchemaConverter extends DelegatingXMLStreamWriter {
 private static final String SCHEMA_LOCATION = "schemaLocation";
 private final Map locsMap;

svn commit: r1006932 - in /websites/production/cxf/content: cache/docs.pageCache docs/jaxrs-services-description.html

2017-02-17 Thread buildbot 
Author: buildbot
Date: Fri Feb 17 14:47:38 2017
New Revision: 1006932

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jaxrs-services-description.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jaxrs-services-description.html
==
--- websites/production/cxf/content/docs/jaxrs-services-description.html 
(original)
+++ websites/production/cxf/content/docs/jaxrs-services-description.html Fri 
Feb 17 14:47:38 2017
@@ -118,11 +118,11 @@ Apache CXF -- JAXRS Services Description


 JAX-RS Services 
Description/**/
+/*]]>*/
 Swagger
 Swagger-First 
DevelopmentSwagger Auto 
Generation
 WADL
@@ -337,7 +337,7 @@ div.rbtoc1487339236292 li {margin-left:
   version3.0.0-milestone1/version
 /dependency
 
-CXF JAX-RS supports the auto-generation of WADL for JAX-RS 
endpoints.  Note that JAX-RS subresources are late-resolved by 
default, so using annotated interfaces for subresources and a 
staticSubresourceResolution=true property will let the whole resource 
tree/graph be described in a generated instance. Schemas will be generated for 
JAXB-annotated types. See below for the information on how to get 
auto-generated WADL instances reference existing schemas.CXF 
2.4.0: org.apache.cxf.jaxrs.ext.Description and 
org.apache.cxf.jaxrs.ext.xml.XMLName have been moved to 
org.apache.cxf.jaxrs.model.wadl package given that their purpose is to improve 
the WADL generation. Also, org.apache.cxf.jaxrs.model.wadl.WadlElement has been 
renamed to 'ElementClass'.Documenting
 resource classes and methods in generated WADLWADL documents can 
include http://www.w3.org/Submission/wadl/#x3-80002.3; rel="nofollow">doc 
fragments.Users may want to use http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/Description.java;>Description
 annotations which can be attached to resource classes and methods.Note 
that starting from CXF 2.4.0, Description annotations can be applied to input 
parameters. Additionally, a method-level http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/Descriptions.java;>Descriptions
 annotation can have a collection of categorized Description annotations, with 
each Description targeting a specific WADL element by setting its 'target' 
property to one of the http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/ma
 in/java/org/apache/cxf/jaxrs/model/wadl/DocTarget.java">DocTarget values. 
For example, one can use a Descriptions annotation to document the response 
representation of a particular resource method, as well as add documentation 
fragments to WADL wadl:method/wadl:request and wadl:method/wadl:response 
elements:
+CXF JAX-RS supports the auto-generation of WADL for JAX-RS 
endpoints.  Note that JAX-RS subresources are late-resolved by 
default, so using annotated interfaces for subresources and a 
staticSubresourceResolution=true property will let the whole resource 
tree/graph be described in a generated instance. Schemas will be generated for 
JAXB-annotated types. See below for the information on how to get 
auto-generated WADL instances reference existing schemas.CXF 
2.4.0: org.apache.cxf.jaxrs.ext.Description and 
org.apache.cxf.jaxrs.ext.xml.XMLName have been moved to 
org.apache.cxf.jaxrs.model.wadl package given that their purpose is to improve 
the WADL generation. Also, org.apache.cxf.jaxrs.model.wadl.WadlElement has been 
renamed to 'ElementClass'.Documenting
 resource classes and methods in generated WADLWADL documents can 
include http://www.w3.org/Submission/wadl/#x3-80002.3; rel="nofollow">doc 
fragments.Users may want to use https://github.com/apache/cxf/tree/master/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/Description.java;
 rel="nofollow">Description annotations which can be attached to resource 
classes and methods.Note that starting from CXF 2.4.0, Description 
annotations can be applied to input parameters. Additionally, a method-level https://github.com/apache/cxf/tree/master/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/Descriptions.java;
 rel="nofollow">Descriptions annotation can have a collection of 
categorized Description annotations, with each Description targeting a specific 
WADL element by

cxf git commit: Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 70e807dc6 -> 5356ca1d7


Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov 
applied with minor updates, This closes #238


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

Branch: refs/heads/3.0.x-fixes
Commit: 5356ca1d780773c1bb00b0c34036897b207fe92d
Parents: 70e807d
Author: Sergey Beryozkin 
Authored: Fri Feb 17 14:27:34 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 14:40:35 2017 +

--
 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java  | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5356ca1d/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 486d755..dc4a7c9 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -194,7 +194,8 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 private Bus bus;
 private final List docProviders = new 
LinkedList();
 private ResourceIdGenerator idGenerator; 
-
+private Map jaxbContextProperties;
+
 public WadlGenerator() {
 }
 
@@ -299,7 +300,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
 JAXBContext jaxbContext = null;
 if (useJaxbContextForQnames && !allTypes.isEmpty()) { 
-jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet(allTypes), null, null);
+jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet(allTypes), null, jaxbContextProperties);
 if (jaxbContext == null) {
 LOG.warning("JAXB Context is null: possibly due to one of 
input classes being not accepted");
 }
@@ -2218,6 +2219,17 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 this.convertResourcesToDOM = convertResourcesToDOM;
 }
 
+<<< HEAD
+===
+public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
+this.incrementNamespacePrefix = incrementNamespacePrefix;
+}
+public void setJaxbContextProperties(Map 
jaxbContextProperties) {
+this.jaxbContextProperties = jaxbContextProperties;
+}
+
+
+>>> 99f6606... Adding WadlGenerator jaxbContextProperties, patch from 
Vjacheslav Borisov applied with minor updates, This closes #238
 private static class SchemaConverter extends DelegatingXMLStreamWriter {
 private static final String SCHEMA_LOCATION = "schemaLocation";
 private final Map locsMap;

cxf git commit: Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ed2b69ec9 -> 99f6606d7


Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov 
applied with minor updates, This closes #238


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

Branch: refs/heads/3.1.x-fixes
Commit: 99f6606d79fb64313152cdbd00c02ae5659e6df1
Parents: ed2b69e
Author: Sergey Beryozkin 
Authored: Fri Feb 17 14:27:34 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 14:38:15 2017 +

--
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/99f6606d/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index d2070ee..1b71601 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -195,7 +195,8 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 private Bus bus;
 private final List docProviders = new 
LinkedList();
 private ResourceIdGenerator idGenerator; 
-
+private Map jaxbContextProperties;
+
 public WadlGenerator() {
 }
 
@@ -301,7 +302,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
 JAXBContext jaxbContext = null;
 if (useJaxbContextForQnames && !allTypes.isEmpty()) { 
-jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet<>(allTypes), null, null);
+jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet<>(allTypes), null, jaxbContextProperties);
 if (jaxbContext == null) {
 LOG.warning("JAXB Context is null: possibly due to one of 
input classes being not accepted");
 }
@@ -2252,6 +2253,10 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
 this.incrementNamespacePrefix = incrementNamespacePrefix;
 }
+public void setJaxbContextProperties(Map 
jaxbContextProperties) {
+this.jaxbContextProperties = jaxbContextProperties;
+}
+
 
 private static class SchemaConverter extends DelegatingXMLStreamWriter {
 private static final String SCHEMA_LOCATION = "schemaLocation";

cxf git commit: Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 64e17b906 -> c9875c223


Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov 
applied with minor updates, This closes #238


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

Branch: refs/heads/master
Commit: c9875c223627a17f7d8128632b25bdf6bf148918
Parents: 64e17b9
Author: Sergey Beryozkin 
Authored: Fri Feb 17 14:27:34 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 14:27:34 2017 +

--
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java   | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c9875c22/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 486032c..8a17ecf 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -195,6 +195,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 private Bus bus;
 private final List docProviders = new 
LinkedList();
 private ResourceIdGenerator idGenerator;
+private Map jaxbContextProperties;
 
 public WadlGenerator() {
 }
@@ -301,7 +302,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
 JAXBContext jaxbContext = null;
 if (useJaxbContextForQnames && !allTypes.isEmpty()) {
-jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet<>(allTypes), null, null);
+jaxbContext = ResourceUtils.createJaxbContext(new 
HashSet<>(allTypes), null, jaxbContextProperties);
 if (jaxbContext == null) {
 LOG.warning("JAXB Context is null: possibly due to one of 
input classes being not accepted");
 }
@@ -2252,6 +2253,10 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
 this.incrementNamespacePrefix = incrementNamespacePrefix;
 }
+public void setJaxbContextProperties(Map 
jaxbContextProperties) {
+this.jaxbContextProperties = jaxbContextProperties;
+}
+
 
 private static class SchemaConverter extends DelegatingXMLStreamWriter {
 private static final String SCHEMA_LOCATION = "schemaLocation";

cxf git commit: Recording .gitmergeinfo Changes

2017-02-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 34594803a -> 70e807dc6


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/70e807dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70e807dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70e807dc

Branch: refs/heads/3.0.x-fixes
Commit: 70e807dc648adcd90ad4b69423502dc2ac5b3191
Parents: 3459480
Author: Colm O hEigeartaigh 
Authored: Fri Feb 17 14:26:00 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Feb 17 14:26:00 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/70e807dc/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 010a228..7de741a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -104,6 +104,7 @@ B 14ed2e2c44b6da7641c95fb57212f8b5a5e77f3d
 B 154d06822014f5cc0607cbf12706a31f88577191
 B 156ea7366ce5aa70fcacec8868b41c9c54de40a1
 B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af
+B 15aa0d6caf716d4de93f6ede2b3ae2c958ff1c06
 B 15ce3e7fb4db8eafca9a263349bc94f1e9516f7f
 B 15e4db9688617af6764f82c234e5a9582692a6e2
 B 15ebdfafcd3c54406bcb7ca3405f8aa4fe13ae35
@@ -169,6 +170,7 @@ B 20539c0278472689722204f0c08e68a86597aae1
 B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd
 B 206738103f5d783d90695aa2e3e750736746d4c3
 B 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde
+B 20b7a7d610a00493b03c79c6f4767158ce495d45
 B 211a8fb4365714b26025f6964f7542e669931969
 B 214b741754b078e41d471889b7233a90aac017b5
 B 2164a191dfa9db0d9a2a8f38efcbfd953f5679d3
@@ -601,6 +603,7 @@ B 6a77cd049fc39bfd27dfe364fc7c1970e58cc455
 B 6a89ad0ddcc6336fde214837d852256e34be
 B 6a8fbfbdd64c28cd0f6bb34c3b62c87efe44b6ac
 B 6a93fc81334352c282ac7ed594d0c14df7101e01
+B 6a960c28608058a2782aa92948a2b2ca47b2aef3
 B 6a9b6a5ebae8a1810374457eca74d09005a920cc
 B 6aa73265ae179bb4ebc3d826c1661ecab387067b
 B 6af09877545cb1fe34fce0057b5b39cb264b5f7c
@@ -623,6 +626,7 @@ B 6daabe0f4501c59c9f0a135143632d72ec79527e
 B 6e2c3553816cecfa1fa009910b6cea0aabb3331a
 B 6e4c1d4ef98d30e95475bfdcbe7c7a493d13e3e9
 B 6e4f0f60785de1f5774644323edafb4741b9e4a4
+B 6e7c86d202f19a6159ee7c7b888504f39a65090b
 B 6e9def4f5d9946b37133ec53a9b8ab622b64db57
 B 6eaa2bd9f48718d241ef6e779285c65a800862a8
 B 6ec0e90dc12c2384612f201f54d1e6e7e7f45724
@@ -660,6 +664,7 @@ B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
 B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79
 B 75115ee15740b33c5cc09b1f4b79fc4a54e4611c
 B 753368bb25f851d858c39b9f2ece764f81e14c2a
+B 7593102230c46be1007f8693353506480315d2ab
 B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
 B 75edfe9d21fd654d844e24038a72206b4e15457d
 B 7618c7501d6ba6275c10c3cf91c329184d0cef96
@@ -789,6 +794,7 @@ B 8e028a617f026fca2499f850bb680ada0692d681
 B 8e8703d676cd19f238f9b4ba78ffde41fa316422
 B 8e930bcfc6e68775db59957df8ee38d73499a6f4
 B 8e9c9571f256ddbe06514ccc0c2f232218f905d6
+B 8eaa631c578e195fe1e452da17d9367459619490
 B 8ec55ef0659a4b11fc9a9b8b0b12a65975616509
 B 8ee1ce727f04099b2bbeea4164ad38005de769b3
 B 8eeef8c9f10795c856ce81d98557d81bf853b6df
@@ -920,6 +926,7 @@ B a493fc41c1bdd5d282dac7fec57db9d01987af21
 B a4e7956135db7d41d567df2a4ad0ca121e49ec72
 B a4fb98497605dea0aef4712a32146e6564b514f8
 B a529d270668dabd1cfa6b040769cb25af97973db
+B a54b0d68d1f425b7023df9e53c90c67c0fd7d2a1
 B a564aea127fa0a385c06b1c7f9f391b68d0f9c50
 B a58edd7df323217534197cf35aca734948d8da1b
 B a5a03eab9dcc7323c422b882c63a6692ed78845c
@@ -964,6 +971,7 @@ B ab8281b0fa472ec780751f6e8b2b540d81e3
 B ac05513f03d20872279e0f5299f1b8acaf08c8c2
 B ac120f4fcea28162721fbdf4bd8a6a9e071cd540
 B ac1dbc4984cb86a0deda1db79899ff20471c9c97
+B ac280e8bd060998f39084f54ce6317c4f41fef36
 B ac33a5b83e2c487a4e7c08c6c15539e64ceea24e
 B ac40bcfa82036c262aa1cf21bcf1d4d91185b51c
 B aca7b6c780cec2af1004491c0df6e78164190e47
@@ -1321,6 +1329,7 @@ B ecbf4e78586870a507fe4cf91239d51c3f202aad
 B ecc7200c24b7cfcdff50f3ef30764984c0c3d84b
 B ed0f25116f8620841ff96dd1b751d97c11eb09c3
 B ed18c008f05af7063d5929d072b86048d12dab4c
+B ed2b69ec9b6e50790845a2ae7dd48875acb66b74
 B ed525fe47bfbb45bc8894e6b993db2ab0376ef5d
 B edb2304a4e9213051c052017a397b829048a7485
 B ede8089e0548bd4dd675414840b644dd99316323

cxf git commit: Support for the constructor injection into the singleton resources starting from Application.getClasses

2017-02-17 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 19a4d72a3 -> 64e17b906


Support for the constructor injection into the singleton resources starting 
from Application.getClasses


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

Branch: refs/heads/master
Commit: 64e17b90635e7acd6f0836ab2bb8f6ede026ecff
Parents: 19a4d72
Author: Sergey Beryozkin 
Authored: Fri Feb 17 13:58:53 2017 +
Committer: Sergey Beryozkin 
Committed: Fri Feb 17 13:58:53 2017 +

--
 .../cxf/cdi/JAXRSCdiResourceExtension.java  |   6 +-
 .../cxf/jaxrs/JAXRSServerFactoryBean.java   |  22 +--
 .../cxf/jaxrs/impl/RuntimeDelegateImpl.java |   2 +-
 .../lifecycle/SingletonResourceProvider.java|  36 -
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  22 ++-
 .../apache/cxf/jaxrs/utils/ResourceUtils.java   |  33 +++--
 .../cxf/jaxrs/model/ClassResourceInfoTest.java  |   2 +-
 .../cxf/jaxrs/utils/ResourceUtilsTest.java  |   6 +-
 .../cxf/systest/jaxrs/sse/BookStore2.java   | 136 +++
 .../cxf/systest/jaxrs/sse/SseApplication.java   |  38 ++
 .../test/resources/jaxrs_sse/WEB-INF/web.xml|   8 +-
 11 files changed, 265 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64e17b90/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
--
diff --git 
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
 
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 51c4f2f..8ec1781 100644
--- 
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ 
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -187,7 +187,8 @@ public class JAXRSCdiResourceExtension implements Extension 
{
 private JAXRSServerFactoryBean createFactoryInstance(final Application 
application, final List< ? > services,
 final List< ? > providers, final List< ? extends Feature > 
features) {
 
-final JAXRSServerFactoryBean instance = 
ResourceUtils.createApplication(application, false, false, bus);
+final JAXRSServerFactoryBean instance = 
+ResourceUtils.createApplication(application, false, false, false, 
bus);
 instance.setServiceBeans(new ArrayList<>(services));
 instance.setProviders(providers);
 instance.setProviders(loadExternalProviders());
@@ -203,7 +204,8 @@ public class JAXRSCdiResourceExtension implements Extension 
{
  */
 private JAXRSServerFactoryBean createFactoryInstance(final Application 
application, final BeanManager beanManager) {
 
-final JAXRSServerFactoryBean instance = 
ResourceUtils.createApplication(application, false, false, bus);
+final JAXRSServerFactoryBean instance = 
+ResourceUtils.createApplication(application, false, false, false, 
bus);
 final ClassifiedClasses classified = classes2singletons(application, 
beanManager);
 
 instance.setProviders(classified.getProviders());

http://git-wip-us.apache.org/repos/asf/cxf/blob/64e17b90/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index 123642f..3aff010 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -44,6 +44,7 @@ import org.apache.cxf.jaxrs.ext.ResourceComparator;
 import org.apache.cxf.jaxrs.impl.RequestPreprocessor;
 import org.apache.cxf.jaxrs.lifecycle.PerRequestResourceProvider;
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
+import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.jaxrs.model.ApplicationInfo;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
@@ -159,7 +160,6 @@ public class JAXRSServerFactoryBean extends 
AbstractJAXRSFactoryBean {
 checkResources(true);
 if (serviceFactory.getService() == null) {
 serviceFactory.create();
-updateClassResourceProviders();
 }
 
 Endpoint ep = createEndpoint();
@@ -196,6 +196,7 @@ public class JAXRSServerFactoryBean extends 
AbstractJAXRSFactoryBean {

[2/3] cxf git commit: CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting password from wrong system property

2017-02-17 Thread coheigea 
CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting password from wrong 
system property

# Conflicts:
#   core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
#   
core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 6e7c86d202f19a6159ee7c7b888504f39a65090b
Parents: 15aa0d6
Author: Colm O hEigeartaigh 
Authored: Fri Feb 17 13:44:40 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Feb 17 13:46:22 2017 +

--
 .../apache/cxf/configuration/jsse/SSLUtils.java | 44 
 .../jsse/TLSParameterJaxBUtils.java | 35 +---
 2 files changed, 74 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6e7c86d2/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 4132b35..71f24fd 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
@@ -559,14 +559,23 @@ public final class SSLUtils {
 }
 
 public static String getTrustStoreType(String trustStoreType, Logger log) {
+return getTrustStoreType(trustStoreType, log, 
DEFAULT_TRUST_STORE_TYPE);
+}
+
+public static String getTrustStoreType(String trustStoreType, Logger log, 
String def) {
 String logMsg = null;
 if (trustStoreType != null) {
 logMsg = "TRUST_STORE_TYPE_SET";
 } else {
 //Can default to JKS
 trustStoreType = 
SystemPropertyAction.getProperty("javax.net.ssl.trustStoreType");
+<<< HEAD
 if (trustStoreType == null) {
 trustStoreType = DEFAULT_TRUST_STORE_TYPE;
+===
+if (trustStoreType == null) {
+trustStoreType = def;
+>>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting 
password from wrong system property
 logMsg = "TRUST_STORE_TYPE_NOT_SET";
 } else {
 logMsg = "TRUST_STORE_TYPE_SYSTEM_SET";
@@ -576,6 +585,41 @@ public final class SSLUtils {
 return trustStoreType;
 }
 
+<<< HEAD
+===
+public static String getTruststorePassword(String trustStorePassword,
+ Logger log) {
+String logMsg = null;
+if (trustStorePassword != null) {
+logMsg = "TRUST_STORE_PASSWORD_SET";
+} else {
+trustStorePassword =
+
SystemPropertyAction.getProperty("javax.net.ssl.trustStorePassword");
+logMsg = trustStorePassword != null
+ ? "TRUST_STORE_PASSWORD_SYSTEM_PROPERTY_SET"
+ : "TRUST_STORE_PASSWORD_NOT_SET";
+}
+LogUtils.log(log, Level.FINE, logMsg);
+return trustStorePassword;
+}
+
+public static String getTruststoreProvider(String trustStoreProvider, 
Logger log) {
+String logMsg = null;
+if (trustStoreProvider != null) {
+logMsg = "TRUST_STORE_PROVIDER_SET";
+} else {
+trustStoreProvider = 
SystemPropertyAction.getProperty("javax.net.ssl.trustStoreProvider", null);
+if (trustStoreProvider == null) {
+logMsg = "TRUST_STORE_PROVIDER_NOT_SET";
+} else {
+logMsg = "TRUST_STORE_PROVIDER_SYSTEM_SET";
+}
+}
+LogUtils.log(log, Level.FINE, logMsg, trustStoreProvider);
+return trustStoreProvider;
+}
+
+>>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting 
password from wrong system property
 public static String getSecureSocketProtocol(String secureSocketProtocol,
  Logger log) {
 if (secureSocketProtocol != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/6e7c86d2/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index e8743b7..44eca7b 100644
---

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

2017-02-17 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 15aa0d6ca -> ed2b69ec9


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/ac280e8b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ac280e8b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ac280e8b

Branch: refs/heads/3.1.x-fixes
Commit: ac280e8bd060998f39084f54ce6317c4f41fef36
Parents: 6e7c86d
Author: Colm O hEigeartaigh 
Authored: Fri Feb 17 13:46:22 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Feb 17 13:46:22 2017 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac280e8b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9b5dd79..37cdcfd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -289,6 +289,7 @@ M 11637433df089a638e173d1ef57441e7456cf2ea
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 11e18bf5622cafdb10723cee895885d676b35a7b
 M 146b00d1947058705c873dffe2ba78ad35c8b03c
+M 19a4d72a32f1e18bec621af403ecdf21d97453af
 M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 20d0a2811c15cb65a402eb063e1359236d7014ea

[3/3] cxf git commit: Fixing merge

2017-02-17 Thread coheigea 
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: ed2b69ec9b6e50790845a2ae7dd48875acb66b74
Parents: ac280e8
Author: Colm O hEigeartaigh 
Authored: Fri Feb 17 13:47:56 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Feb 17 13:47:56 2017 +

--
 .../java/org/apache/cxf/configuration/jsse/SSLUtils.java | 8 
 .../apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java | 6 --
 2 files changed, 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2b69ec/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 71f24fd..fb9556d 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
@@ -569,13 +569,8 @@ public final class SSLUtils {
 } else {
 //Can default to JKS
 trustStoreType = 
SystemPropertyAction.getProperty("javax.net.ssl.trustStoreType");
-<<< HEAD
-if (trustStoreType == null) {
-trustStoreType = DEFAULT_TRUST_STORE_TYPE;
-===
 if (trustStoreType == null) {
 trustStoreType = def;
->>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting 
password from wrong system property
 logMsg = "TRUST_STORE_TYPE_NOT_SET";
 } else {
 logMsg = "TRUST_STORE_TYPE_SYSTEM_SET";
@@ -585,8 +580,6 @@ public final class SSLUtils {
 return trustStoreType;
 }
 
-<<< HEAD
-===
 public static String getTruststorePassword(String trustStorePassword,
  Logger log) {
 String logMsg = null;
@@ -619,7 +612,6 @@ public final class SSLUtils {
 return trustStoreProvider;
 }
 
->>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting 
password from wrong system property
 public static String getSecureSocketProtocol(String secureSocketProtocol,
  Logger log) {
 if (secureSocketProtocol != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2b69ec/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 44eca7b..8050e38 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -133,18 +133,12 @@ public final class TLSParameterJaxBUtils {
 password = tmp.toCharArray();
 }
 }
-<<< HEAD
-String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider() 
-   ? kst.getProvider() : 
null,
-   LOG);
-===
 String provider = null;
 if (trustStore) {
 provider = SSLUtils.getTruststoreProvider(kst.isSetProvider() ? 
kst.getProvider() : null, LOG);
 } else {
 provider = SSLUtils.getKeystoreProvider(kst.isSetProvider() ? 
kst.getProvider() : null, LOG);
 }
->>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers getting 
password from wrong system property
 KeyStore keyStore = provider == null
 ? KeyStore.getInstance(type)
 : KeyStore.getInstance(type, provider);

svn commit: r1006930 - in /websites/production/cxf/content: cache/docs.pageCache docs/jaxrs-services-description.html

2017-02-17 Thread buildbot 
Author: buildbot
Date: Fri Feb 17 13:47:52 2017
New Revision: 1006930

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jaxrs-services-description.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jaxrs-services-description.html
==
--- websites/production/cxf/content/docs/jaxrs-services-description.html 
(original)
+++ websites/production/cxf/content/docs/jaxrs-services-description.html Fri 
Feb 17 13:47:52 2017
@@ -117,12 +117,12 @@ Apache CXF -- JAXRS Services Description
  


-JAX-RS Services 
Description/*
JAX-RS Services 
Description