cxf git commit: fixed link to Jenkins view

2017-05-26 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master 8dbc8cbfa -> 5ce0b6eb1


fixed link to Jenkins view


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

Branch: refs/heads/master
Commit: 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf
Parents: 8dbc8cb
Author: Dennis Kieselhorst 
Authored: Fri May 26 20:42:26 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Fri May 26 20:42:26 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5ce0b6eb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index dd0ae50..f32093b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
 
 
 Jenkins
-https://builds.apache.org/view/C/view/CXF/
+https://builds.apache.org/view/A-D/view/CXF/
 
 
 mail

cxf git commit: [CXF-7386] Trying a cheaper option

2017-05-26 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 048c17bab -> 8a1cd9a9f


[CXF-7386] Trying a cheaper option


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

Branch: refs/heads/3.1.x-fixes
Commit: 8a1cd9a9f818c7eba2cb9f8bfa9863600af1ad98
Parents: 048c17b
Author: Sergey Beryozkin 
Authored: Fri May 26 17:52:10 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 26 17:54:10 2017 +0100

--
 .../AbstractSwaggerServiceDescriptionTest.java  | 21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8a1cd9a9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
index de44151..958bc0a 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -193,7 +193,7 @@ public abstract class AbstractSwaggerServiceDescriptionTest 
extends AbstractBusC
 final Response r = client.get();
 assertEquals(Status.OK.getStatusCode(), r.getStatus());
 
-JsonObject expected = Json.createObjectBuilder()
+JsonObject expected1 = Json.createObjectBuilder()
 .add("apiVersion", "1.0.0")
 .add("swaggerVersion", "1.2")
 .add("basePath", "http://localhost:; + getPort() + "/")
@@ -209,8 +209,25 @@ public abstract class 
AbstractSwaggerServiceDescriptionTest extends AbstractBusC
 .add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC
 .add("models", BOOK_MODEL_SPEC).build();
 
+JsonObject expected2 = Json.createObjectBuilder()
+.add("apiVersion", "1.0.0")
+.add("swaggerVersion", "1.2")
+.add("basePath", "http://localhost:; + getPort() + "/")
+.add("resourcePath", "/bookstore")
+.add("apis", Json.createArrayBuilder()
+.add(Json.createObjectBuilder()
+.add("path", "/bookstore/{id}")
+.add("operations", Json.createArrayBuilder()
+.add(DELETE_METHOD_SPEC)
+.add(GET_BY_ID_METHOD_SPEC)))
+.add(Json.createObjectBuilder()
+.add("path", "/bookstore")
+.add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC
+.add("models", BOOK_MODEL_SPEC).build();
+
 JsonObject received = 
Json.createReader((InputStream)r.getEntity()).readObject();
-assertEquals(expected, received);
+assertTrue(expected1.equals(received) || 
expected2.equals(received));
+
 } finally {
 client.close();
 }

cxf git commit: [CXF-7386] Trying a cheaper option

2017-05-26 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e3b77cc71 -> 8dbc8cbfa


[CXF-7386] Trying a cheaper option


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

Branch: refs/heads/master
Commit: 8dbc8cbfa532706ec138c3580543d38ee5c34daf
Parents: e3b77cc
Author: Sergey Beryozkin 
Authored: Fri May 26 17:52:10 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 26 17:52:10 2017 +0100

--
 .../AbstractSwaggerServiceDescriptionTest.java  | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8dbc8cbf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
index 203d977..ee33d63 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -193,7 +193,7 @@ public abstract class AbstractSwaggerServiceDescriptionTest 
extends AbstractBusC
 final Response r = client.get();
 assertEquals(Status.OK.getStatusCode(), r.getStatus());
 
-JsonObject expected = Json.createObjectBuilder()
+JsonObject expected1 = Json.createObjectBuilder()
 .add("apiVersion", "1.0.0")
 .add("swaggerVersion", "1.2")
 .add("basePath", "http://localhost:; + getPort() + "/")
@@ -209,8 +209,24 @@ public abstract class 
AbstractSwaggerServiceDescriptionTest extends AbstractBusC
 .add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC
 .add("models", BOOK_MODEL_SPEC).build();
 
+JsonObject expected2 = Json.createObjectBuilder()
+.add("apiVersion", "1.0.0")
+.add("swaggerVersion", "1.2")
+.add("basePath", "http://localhost:; + getPort() + "/")
+.add("resourcePath", "/bookstore")
+.add("apis", Json.createArrayBuilder()
+.add(Json.createObjectBuilder()
+.add("path", "/bookstore/{id}")
+.add("operations", Json.createArrayBuilder()
+.add(DELETE_METHOD_SPEC)
+.add(GET_BY_ID_METHOD_SPEC)))
+.add(Json.createObjectBuilder()
+.add("path", "/bookstore")
+.add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC
+.add("models", BOOK_MODEL_SPEC).build();
+
 JsonObject received = 
Json.createReader((InputStream)r.getEntity()).readObject();
-assertEquals(expected, received);
+assertTrue(expected1.equals(received) || 
expected2.equals(received));
 
 } finally {
 client.close();

cxf git commit: Revert "[CXF-7309] Trying to prevent NPE when the providers are hot-redeployed, patch from Ezequiel Rosas Garcia applied"

2017-05-26 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 84b6266ae -> 048c17bab


Revert "[CXF-7309] Trying to prevent NPE when the providers are hot-redeployed, 
patch from Ezequiel Rosas Garcia applied"

This reverts commit 84b6266ae8bf57067040120fb0336e0480546ec7.


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

Branch: refs/heads/3.1.x-fixes
Commit: 048c17baba3ce991fb514ecf782a4299ab5f9747
Parents: 84b6266
Author: Sergey Beryozkin 
Authored: Fri May 26 17:23:50 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 26 17:23:50 2017 +0100

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 34 
 .../java/org/apache/cxf/jaxrs/Customer.java |  4 +--
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  2 +-
 3 files changed, 16 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/048c17ba/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 9101949..73b3e56 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -1093,13 +1093,18 @@ public final class InjectionUtils {
 synchronized (instance) {
 for (Map.Entry entry : 
cri.getContextMethods().entrySet()) {
 Method method = entry.getValue();
-final Object proxy = extractFromSetter(instance, method);
-if (proxy instanceof ThreadLocalProxy) {
-continue;
-}
 Object value = method.getParameterTypes()[0] == 
Application.class 
-? app : cri.getContextSetterProxy(method);
+? app : cri.getContextSetterProxy(method);
+try {
+if (value == InjectionUtils.extractFromMethod(instance, 
+  
getGetterFromSetter(method), 
+  false)) {
+continue;
+}
 
+} catch (Throwable t) {
+// continue
+}
 InjectionUtils.injectThroughMethod(instance, method, value);
 }
 
@@ -1162,12 +1167,10 @@ public final class InjectionUtils {
 if (!cri.isSingleton()) {
 InjectionUtils.injectThroughMethod(requestObject, method, 
o, message);
 } else {
-Object proxy = extractFromSetter(requestObject, method);
-if (!(proxy instanceof ThreadLocalProxy)) {
-proxy = cri.getContextSetterProxy(method);
-}
+ThreadLocalProxy proxy 
+= 
(ThreadLocalProxy)cri.getContextSetterProxy(method);
 if (proxy != null) {
-((ThreadLocalProxy) proxy).set(o);
+proxy.set(o);
 }
 }
 
@@ -1472,15 +1475,4 @@ public final class InjectionUtils {
 public static Object getEntity(Object o) {
 return o instanceof GenericEntity ? ((GenericEntity)o).getEntity() 
: o;
 }
-public static Object extractFromSetter(Object provider, Method m) {
-if (provider == null) {
-return null;
-}
-try {
-final Method getter = getGetterFromSetter(m);
-return extractFromMethod(provider, getter, false);
-} catch (Throwable t) {
-return null;
-}
-}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/048c17ba/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
--
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
index 53c7bab..f55fc1d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
@@ -273,11 +273,11 @@ public class Customer extends AbstractCustomer implements 
CustomerInfo {
 }
 
 @Context
-public void

cxf git commit: [CXF-7309] Trying to prevent NPE when the providers are hot-redeployed, patch from Ezequiel Rosas Garcia applied

2017-05-26 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ab09ffcae -> 84b6266ae


[CXF-7309] Trying to prevent NPE when the providers are hot-redeployed, patch 
from Ezequiel Rosas Garcia applied


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

Branch: refs/heads/3.1.x-fixes
Commit: 84b6266ae8bf57067040120fb0336e0480546ec7
Parents: ab09ffc
Author: Sergey Beryozkin 
Authored: Fri May 26 17:14:00 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 26 17:14:00 2017 +0100

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 34 
 .../java/org/apache/cxf/jaxrs/Customer.java |  4 +--
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/84b6266a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 73b3e56..9101949 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -1093,18 +1093,13 @@ public final class InjectionUtils {
 synchronized (instance) {
 for (Map.Entry entry : 
cri.getContextMethods().entrySet()) {
 Method method = entry.getValue();
+final Object proxy = extractFromSetter(instance, method);
+if (proxy instanceof ThreadLocalProxy) {
+continue;
+}
 Object value = method.getParameterTypes()[0] == 
Application.class 
-? app : cri.getContextSetterProxy(method);
-try {
-if (value == InjectionUtils.extractFromMethod(instance, 
-  
getGetterFromSetter(method), 
-  false)) {
-continue;
-}
+? app : cri.getContextSetterProxy(method);
 
-} catch (Throwable t) {
-// continue
-}
 InjectionUtils.injectThroughMethod(instance, method, value);
 }
 
@@ -1167,10 +1162,12 @@ public final class InjectionUtils {
 if (!cri.isSingleton()) {
 InjectionUtils.injectThroughMethod(requestObject, method, 
o, message);
 } else {
-ThreadLocalProxy proxy 
-= 
(ThreadLocalProxy)cri.getContextSetterProxy(method);
+Object proxy = extractFromSetter(requestObject, method);
+if (!(proxy instanceof ThreadLocalProxy)) {
+proxy = cri.getContextSetterProxy(method);
+}
 if (proxy != null) {
-proxy.set(o);
+((ThreadLocalProxy) proxy).set(o);
 }
 }
 
@@ -1475,4 +1472,15 @@ public final class InjectionUtils {
 public static Object getEntity(Object o) {
 return o instanceof GenericEntity ? ((GenericEntity)o).getEntity() 
: o;
 }
+public static Object extractFromSetter(Object provider, Method m) {
+if (provider == null) {
+return null;
+}
+try {
+final Method getter = getGetterFromSetter(m);
+return extractFromMethod(provider, getter, false);
+} catch (Throwable t) {
+return null;
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/84b6266a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
--
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
index f55fc1d..53c7bab 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
@@ -273,11 +273,11 @@ public class Customer extends AbstractCustomer implements 
CustomerInfo {
 }
 
 @Context
-public void setServletContext(ServletContext sc) {
+public void setServletContext3(ServletContext sc)

cxf git commit: fixed test

2017-05-26 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ba3ea52a5 -> ab09ffcae


fixed test


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

Branch: refs/heads/3.1.x-fixes
Commit: ab09ffcae3434ec426d19f7141bb2c6bd22da310
Parents: ba3ea52
Author: Dennis Kieselhorst 
Authored: Fri May 26 09:42:33 2017 +0200
Committer: Sergey Beryozkin 
Committed: Fri May 26 14:02:11 2017 +0100

--
 .../jaxrs/description/AbstractSwaggerServiceDescriptionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ab09ffca/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
index 1d5b46d..de44151 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -202,8 +202,8 @@ public abstract class AbstractSwaggerServiceDescriptionTest 
extends AbstractBusC
 .add(Json.createObjectBuilder()
 .add("path", "/bookstore/{id}")
 .add("operations", Json.createArrayBuilder()
-.add(DELETE_METHOD_SPEC)
-.add(GET_BY_ID_METHOD_SPEC)))
+.add(GET_BY_ID_METHOD_SPEC)
+.add(DELETE_METHOD_SPEC)))
 .add(Json.createObjectBuilder()
 .add("path", "/bookstore")
 .add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC

svn commit: r1012908 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-jose.html

2017-05-26 Thread buildbot 
Author: buildbot
Date: Fri May 26 12:47:44 2017
New Revision: 1012908

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-jose.html

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

Modified: websites/production/cxf/content/docs/jax-rs-jose.html
==
--- websites/production/cxf/content/docs/jax-rs-jose.html (original)
+++ websites/production/cxf/content/docs/jax-rs-jose.html Fri May 26 12:47:44 
2017
@@ -119,11 +119,11 @@ Apache CXF -- JAX-RS JOSE


 /**/
+/*]]>*/
 IntroductionMaven DependenciesJava and JCE 
PolicyJOSE Overview and 
Implementation
 JWA AlgorithmsJWK KeysJWS Signature
 Signature and Verification 
ProvidersJWS 
CompactJWS 
JSONJWS 
with Detached ContentJWS with Unencoded 
Payload
@@ -131,7 +131,11 @@ div.rbtoc1494946025536 li {margin-left:
 Key and Content Encryption 
ProvidersJWE 
CompactJWE 
JSON
 JSON Web 
TokenJWS and 
JWE Combined
 JOSE JAX-RS 
Filters
-JWSSigning and 
Verification of HTTP AttachmentsJWELinking JWT 
authentications to JWS or JWE contentOptional protection of HTTP 
headers
+JWS
+JWS CompactJWS Compact With Unencoded 
PayloadJWS 
JSONJWS JSON with Unencoded 
Payload
+Signing and 
Verification of HTTP AttachmentsJWE
+JWE CompactJWE JSON
+Linking JWT 
authentications to JWS or JWE contentOptional protection of HTTP 
headers
 Configuration
 Configuration Property 
Containers
 SignatureEncryption
@@ -415,7 +419,7 @@ public class BookStore {
 return book;
 }
 }
-would expect JWS and/or JWE processing done before the resource 
method is invoked or after this method returned some response.This is 
what CXF JOSE JAX-RS filters do, they help the client or server code get the 
application data JWS- or JWE-secured. The filters do it by loadng the 
configuration properties as described below in the Configuration section, and 
produce or consume JWS or JWE sequences.Note, JWS Compact and JSON, as 
well as JWE Compact client and server output filters can do the best effort at 
keeping the streaming process going while they are signing or 
encrypting the payload. JWE JSON client/server output filter and JWS Compact 
client/server input filters will be enhanced in due time to support the 
streaming too. Most of CXF JOSE system tests enable the streaming capable 
filters to stream. JWS and JWE JSON input filters are expected to 
process JSON containers with the properties set in a random order hence by def
 ault they wil not stream the data in. Register both JWS and JWE 
out filters if the data need to be signed and encrypted (the filters are 
ordered such that the data are signed first and encrypted next) and JWS and JWE 
in filters if the signed data need to be decrypted first and then 
verified.JWShttps://github.com/apache/cxf/blob/master/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java;
 rel="nofollow">JwsWriterInterceptor creates compact JWS sequences on the 
client or server out directions. For example, if you have the client code 
posting a Book or the server code returning a Book, with this Book 
representation expected to be signed, then addhttps://github.com/apache/cxf/blob/master/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsW
 riterInterceptor.java" rel="nofollow">JwsWriterInterceptor and set the 
signature properties on the JAX-RS client or server.https://github.com/apache/cxf/blob/master/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsClientResponseFilter.java;
 rel="nofollow">JwsClientResponseFilter and https://github.com/apache/cxf/blob/master/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsContainerRequestFilter.java;
 rel="nofollow">JwsContainerRequestFilter process the incoming client or 
server Compact JWS sequences.Here is an example of a JSON Book 
representation being HS256 signed and converted into Compact JWS and 
POSTed to the target service:
+would expect JWS and/or JWE processing done before the resource 
method is invoked or after this method returned some response.This is 
what CXF JOSE JAX-RS filters do, they help the client or server code get the 
application data JWS- or JWE-secured. The filters do it by loadng the 
configuration properties as described below in

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

2017-05-26 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes aa5f8811e -> 049d52d60


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

Branch: refs/heads/3.0.x-fixes
Commit: 049d52d60d72179cb0cb3a6bf34c8daa15d718b1
Parents: 4e50970
Author: Colm O hEigeartaigh 
Authored: Fri May 26 11:03:56 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 26 11:03:56 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/049d52d6/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 809fded..3a5d0d2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1291,6 +1291,7 @@ B ba00202288bce9ba80692f151c2d73b101400c50
 B ba17570e53cec4386f7c6fd40f075c6fbc1c3981
 B ba293c6e7456e80a5fe92f25a4893d3e45380bf0
 B ba2d7b85d44970cb4abd8cd18ac24178394ef404
+B ba3ea52a59661dd1b4dcea941d5e838c4ce4761c
 B ba6c3d4806597d682458a9bad781afd7727b8259
 B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
 B baae01aba5265dcfcbaa7630959e3a85a4797f1c
@@ -1969,6 +1970,7 @@ M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5
 M 87bbc7f8110fc2629aeb6a706e83392442ab0507
 M 88a7cd850f0471d6e51f9045bf01f775a905cbf2
 M 89b87071f3dedd2cd5ed874e56f69ab7dcf7953d
+M 89cc0697c2e19670d3ccfd72c37003a26226b412
 M 8a9952073cf5edffd848c43d63ac173a2c7455a5
 M 8bcb5133c602b1cbe642cfd5fbb46099a28b3016
 M 8c22c4cee5ab1b31a4c8e843601627b3445da312

[1/2] cxf git commit: Updating BouncyCastle

2017-05-26 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8b12a4777 -> ba3ea52a5


Updating BouncyCastle


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

Branch: refs/heads/3.1.x-fixes
Commit: 89cc0697c2e19670d3ccfd72c37003a26226b412
Parents: 8b12a47
Author: Colm O hEigeartaigh 
Authored: Fri May 26 11:03:08 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 26 11:03:27 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/89cc0697/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index dc7266e..e4d63ba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -73,7 +73,7 @@
 2.3.7
 [2.0,2.4)
 1.2.14
-1.55
+1.57
 2.2_2
 [2.1.3,3.0.0)
 1.1.0

[2/2] cxf git commit: Updating BouncyCastle

2017-05-26 Thread coheigea 
Updating BouncyCastle


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

Branch: refs/heads/3.0.x-fixes
Commit: 4e509708210c8755a7003c03985e907c7f81e975
Parents: aa5f881
Author: Colm O hEigeartaigh 
Authored: Fri May 26 11:03:08 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 26 11:03:56 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/4e509708/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 959e05f..07986eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
 2.3.7
 [2.0,2.4)
 1.2.14
-1.55
+1.57
 2.2_2
 [2.1.3,3.0.0)
 1.10

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

2017-05-26 Thread coheigea 
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/ba3ea52a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ba3ea52a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ba3ea52a

Branch: refs/heads/3.1.x-fixes
Commit: ba3ea52a59661dd1b4dcea941d5e838c4ce4761c
Parents: 89cc069
Author: Colm O hEigeartaigh 
Authored: Fri May 26 11:03:28 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 26 11:03:28 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ba3ea52a/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 87ace44..eae5290 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -455,6 +455,7 @@ M 3b7587395586f59d0fe9427038dd2d891fbe223d
 M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
 M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
+M 3d1c69dbe3c1f4ce1e9fe0a962fd022b17dac773
 M 3d783a5a17c03348da031865fb5278fe777f0fc9
 M 3e30d8892a723adcf04268efd7d407e164607065
 M 408fe3384925122c4e68b7d020de5ff9d1376096

cxf git commit: Updating BouncyCastle

2017-05-26 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 93b07cfd3 -> 3d1c69dbe


Updating BouncyCastle


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

Branch: refs/heads/master
Commit: 3d1c69dbe3c1f4ce1e9fe0a962fd022b17dac773
Parents: 93b07cf
Author: Colm O hEigeartaigh 
Authored: Fri May 26 11:03:08 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 26 11:03:08 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/3d1c69db/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0bf6cd8..5103557 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,7 +74,7 @@
 2.4.9
 [2.4,3.0)
 1.2.14
-1.55
+1.57
 2.2_2
 [2.1.3,3.0.0)
 1.1.0

svn commit: r1012902 - in /websites/production/cxf/content: cache/main.pageCache index.html mailing-lists.html project-status.html special-thanks.html support.html

2017-05-26 Thread buildbot 
Author: buildbot
Date: Fri May 26 09:47:42 2017
New Revision: 1012902

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/index.html
websites/production/cxf/content/mailing-lists.html
websites/production/cxf/content/project-status.html
websites/production/cxf/content/special-thanks.html
websites/production/cxf/content/support.html

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

Modified: websites/production/cxf/content/index.html
==
--- websites/production/cxf/content/index.html (original)
+++ websites/production/cxf/content/index.html Fri May 26 09:47:42 2017
@@ -99,7 +99,7 @@ Apache CXF -- Index
  


-Apache CXF: An Open-Source 
Services FrameworkOverviewApache CXF is an 
open source services framework. CXF helps you build and develop services using 
frontend programming APIs, like JAX-WS and JAX-RS. These services can speak a 
variety of protocols such as SOAP, XML/HTTP, RESTful HTTP, or CORBA and work 
over a variety of transports such as HTTP, JMS or JBI.NewsApril 10, 2017 - Apache 
CXF 3.1.11/3.0.13 released!The Apache CXF team is proud to announce the 
availability of the latest patch releases. Over 100 JIRA issues were fixed for 
3.1.11 which many of those fixes back ported to 3.0.13.This is mostly a 
patch release to fix problems and issues that users have encountered. 
Downloads are availablehere.January 31, 2017 - Apache 
CXF 3.1.10 released!The Apache CXF team is proud to announce the 
availability of the latest patch releases. Over 25 JIRA issues were fixed for 
3.1.10.This is mostly a patch release to fix problems and issues that 
users have encountered. Downloads are availablehere.FeaturesCXF includes a broad feature set, but it is 
primarily focused on the following areas:Web Services 
Standards Support: CXF supports a variety of web service standards 
including SOAP, the WS-I Basic Profile, WSDL, WS-Addressing, WS-Policy, 
WS-ReliableMessaging, WS-Security, WS-SecurityPolicy, WS-SecureConverstation, 
and WS-Trust (partial).Frontends: CXF supports a 
variety of "frontend" programming models.CXF implements the JAX-WS 
APIs. CXF JAX-WS support includes so
 me extensions to the standard that make it significantly easier to use, 
compared to the reference implementation: It will automatically generate code 
for request and response bean classes, and does not require a WSDL for simple 
cases.It also includes a "simple frontend" which allows creation of 
clients and endpoints without annotations. CXF supports both contract first 
development with WSDL and code first development starting from Java.For 
REST, CXF also supports a JAX-RS frontend.Ease of 
use: CXF is designed to be intuitive and easy to use. There are simple 
APIs to quickly build code-first services, Maven plug-ins to make tooling 
integration easy, JAX-WS API support, Spring 2.x XML support to make 
configuration a snap, and much more.Binary and Legacy Protocol 
Support: CXF has been designed to provide a pluggable architecture 
that supports not only XML but also non-XML type bindings, such as JSON and 
CORBA, in comb
 ination with any type of transport.To get started using CXF, 
check out the downloads, the http://cxf.apache.org/docs/index.html;>user's guide, or 
the mailing lists to get more 
information!GoalsGeneralHigh 
PerformanceExtensibleIntuitive  Easy to UseSupport for StandardsJSR SupportJAX-WS - Java API for XML-Based 
Web Services (JAX-WS) 2.0 - http://jcp.org/en/jsr/detail?id=224; 
rel="nofollow">JSR-224Web Services Metadata for the Java Platform 
- http://jcp.org/en/jsr/detail?id=181; 
rel="nofollow">JSR-181JAX-RS - The Java API for RESTful Web 
Services - http://jcp.org/en/jsr/detail?id=311; 
rel="nofollow">JSR-311SAAJ - SOAP with Attachments API for Java 
(SAAJ) - http://jcp.org/aboutJava/communityprocess/mrel/jsr067/index3.html; 
rel="nofollow">JSR-67WS-* and related Specifications 
SupportBasic support: WS-I Basic Profile 1.1Quality of 
Service: WS-Reliable MessagingMetadata: WS-Policy, WSDL 1.1 - Web 
Service Definition LanguageCommunication Security: WS-Security, 
WS-SecurityPolicy, WS-SecureConversation, WS-Trust (partial 
support)Messaging Support: WS-Addressing, SOAP 1.1, SOAP 1.2, Message 
Transmission Optimization Mechanism (MTOM)Multiple 
Transports, Protocol Bindings, Data Bindings, and 
FormatsTransports: HTTP, Servlet, JMS, In-VM and many others via
  the http://camel.apache.org/camel-transport-for-cxf.html;>Camel transport for 
CXF such as SMTP/POP3, TCP and JabberProtocol Bindings: SOAP, 
REST/HTTP, pure XMLData bindings: JAXB 2.x, Aegis, Apache XMLBeans, 
Service Data Objects (SDO), JiBXFormats: XML Textual, JSON, 
FastInfosetExtensibility API allows

cxf git commit: Update maven-dependency-plugin

2017-05-26 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master 737c64de1 -> 93b07cfd3


Update maven-dependency-plugin


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

Branch: refs/heads/master
Commit: 93b07cfd3c39f6eb62ec1f428174811a87307ba2
Parents: 737c64d
Author: Dennis Kieselhorst 
Authored: Fri May 26 10:18:49 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Fri May 26 10:18:49 2017 +0200

--
 distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 1 -
 pom.xml   | 2 +-
 rt/rs/client/pom.xml  | 1 -
 rt/rs/extensions/search/pom.xml   | 1 -
 rt/rs/security/oauth-parent/oauth2/pom.xml| 1 -
 rt/rs/security/sso/oidc/pom.xml   | 1 -
 rt/transports/jms/pom.xml | 1 -
 systests/cdi/cdi-owb/pom.xml  | 1 -
 systests/jaxrs/pom.xml| 1 -
 systests/jaxws/pom.xml| 1 -
 systests/rs-security/pom.xml  | 1 -
 systests/tracing/pom.xml  | 1 -
 systests/transport-jms/pom.xml| 1 -
 systests/uncategorized/pom.xml| 1 -
 systests/ws-specs/pom.xml | 1 -
 15 files changed, 1 insertion(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/93b07cfd/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml 
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 4b0e7a7..3fb513d 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -127,7 +127,6 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.2
 
 
 copy-dependencies

http://git-wip-us.apache.org/repos/asf/cxf/blob/93b07cfd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e60c684..18f76e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,7 +544,7 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.10
+3.0.0
 
 
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/cxf/blob/93b07cfd/rt/rs/client/pom.xml
--
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index d05d13e..b04f9a7 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -164,7 +164,6 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.10
 
 
 copy

http://git-wip-us.apache.org/repos/asf/cxf/blob/93b07cfd/rt/rs/extensions/search/pom.xml
--
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 77224b5..4d8d4f2 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -164,7 +164,6 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.10
 
 
 copy

http://git-wip-us.apache.org/repos/asf/cxf/blob/93b07cfd/rt/rs/security/oauth-parent/oauth2/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml 
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 5723c62..dcdd42d 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -286,7 +286,6 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-2.10
 
 
 copy

cxf git commit: fixed test

2017-05-26 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master ecb3ccd32 -> 737c64de1


fixed test


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

Branch: refs/heads/master
Commit: 737c64de1284d0298f6d52153d076e7a12ddb28c
Parents: ecb3ccd
Author: Dennis Kieselhorst 
Authored: Fri May 26 09:42:33 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Fri May 26 09:42:33 2017 +0200

--
 .../jaxrs/description/AbstractSwaggerServiceDescriptionTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/737c64de/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
index 10a2cec..203d977 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -202,8 +202,8 @@ public abstract class AbstractSwaggerServiceDescriptionTest 
extends AbstractBusC
 .add(Json.createObjectBuilder()
 .add("path", "/bookstore/{id}")
 .add("operations", Json.createArrayBuilder()
-.add(DELETE_METHOD_SPEC)
-.add(GET_BY_ID_METHOD_SPEC)))
+.add(GET_BY_ID_METHOD_SPEC)
+.add(DELETE_METHOD_SPEC)))
 .add(Json.createObjectBuilder()
 .add("path", "/bookstore")
 .add("operations", 
Json.createArrayBuilder().add(GET_METHOD_SPEC

cxf git commit: [CXF-7043] already merged This closes #165

2017-05-26 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master c282dcee8 -> ecb3ccd32


[CXF-7043] already merged This closes #165


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

Branch: refs/heads/master
Commit: ecb3ccd32cfa82d1175e2e15642e22e8172ec25a
Parents: c282dce
Author: Dennis Kieselhorst 
Authored: Fri May 26 09:03:44 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Fri May 26 09:03:44 2017 +0200

--

--

cxf git commit: [CXF-7235] already merged This closes #231

2017-05-26 Thread deki 
Repository: cxf
Updated Branches:
  refs/heads/master 1cee25961 -> c282dcee8


[CXF-7235] already merged This closes #231


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

Branch: refs/heads/master
Commit: c282dcee8373b9564c747fc8fac4e4e9a3b3afc6
Parents: 1cee259
Author: Dennis Kieselhorst 
Authored: Fri May 26 08:57:39 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Fri May 26 08:57:39 2017 +0200

--

--