cxf-fediz git commit: Added initial support for validating SAML redirect signatures

2016-03-22 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 82ab06413 -> e68df8357


Added initial support for validating SAML redirect signatures


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

Branch: refs/heads/master
Commit: e68df8357ff18991a22e577cf480903961c08ba5
Parents: 82ab064
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 16:45:05 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 16:45:05 2016 +

--
 .../idp/beans/samlsso/AuthnRequestParser.java   |   7 +-
 .../idp/samlsso/AuthnRequestValidator.java  |  54 +++--
 .../WEB-INF/flows/saml-validate-request.xml |   5 +-
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 117 +++
 4 files changed, 168 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e68df835/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
index 737425f..410e8c1 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
@@ -31,7 +31,6 @@ import org.apache.cxf.fediz.service.idp.domain.Idp;
 import org.apache.cxf.fediz.service.idp.samlsso.AuthnRequestValidator;
 import org.apache.cxf.fediz.service.idp.util.WebUtils;
 import org.apache.cxf.rs.security.saml.DeflateEncoderDecoder;
-import org.apache.cxf.rs.security.saml.sso.SSOConstants;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.wss4j.common.saml.OpenSAMLUtil;
 import org.apache.wss4j.common.util.DOM2Writer;
@@ -49,8 +48,8 @@ public class AuthnRequestParser {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(AuthnRequestParser.class);
 
-public void parseSAMLRequest(RequestContext context, Idp idp) throws 
ProcessingException {
-String samlRequest = 
context.getFlowScope().getString(SSOConstants.SAML_REQUEST);
+public void parseSAMLRequest(RequestContext context, Idp idp, String 
signature, 
+ String relayState, String samlRequest) throws 
ProcessingException {
 LOG.debug("Received SAML Request: {}", samlRequest);
 
 AuthnRequest parsedRequest = null;
@@ -69,7 +68,7 @@ public class AuthnRequestParser {
 if (parsedRequest != null) {
 try {
 AuthnRequestValidator validator = new AuthnRequestValidator();
-validator.validateAuthnRequest(context, parsedRequest, idp);
+validator.validateAuthnRequest(context, parsedRequest, idp, 
signature, relayState, samlRequest);
 } catch (Exception ex) {
 LOG.warn("Error validating request {}", ex.getMessage(), ex);
 throw new ProcessingException(TYPE.BAD_REQUEST);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e68df835/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/samlsso/AuthnRequestValidator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/samlsso/AuthnRequestValidator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/samlsso/AuthnRequestValidator.java
index ebb48dc..b20b1f1 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/samlsso/AuthnRequestValidator.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/samlsso/AuthnRequestValidator.java
@@ -18,6 +18,10 @@
  */
 package org.apache.cxf.fediz.service.idp.samlsso;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+
 import org.w3c.dom.Document;
 
 import org.apache.cxf.fediz.core.exception.ProcessingException;
@@ -25,6 +29,7 @@ import 
org.apache.cxf.fediz.core.exception.ProcessingException.TYPE;
 import org.apache.cxf.fediz.core.util.CertsUtils;
 import org.apache.cxf.fediz.service.idp.domain.Idp;
 import org.apache.cxf.fediz.service.idp.util.WebUtils;
+import org.apache.cxf.rs.security.saml.sso.SSOConstants;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.SAMLKeyInfo;
@@ -55,28 +60,57 @@ public class AuthnRequestValidator {

cxf git commit: [CXF-6838] Correctly processing AsyncResponse resume with null

2016-03-22 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1f984e96b -> e4a296435


[CXF-6838] Correctly processing AsyncResponse resume with null


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

Branch: refs/heads/3.0.x-fixes
Commit: e4a296435129b8cfc6c633d6f5d92d6a4b6d9f23
Parents: 1f984e9
Author: Sergey Beryozkin 
Authored: Tue Mar 22 17:58:12 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Mar 22 18:00:39 2016 +0300

--
 .../org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java|  6 +-
 .../systest/jaxrs/AbstractJAXRSContinuationsTest.java   | 12 
 .../apache/cxf/systest/jaxrs/BookContinuationStore.java |  7 +++
 3 files changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4a29643/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 773faaf..7b3178d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -272,7 +272,11 @@ public class AsyncResponseImpl implements AsyncResponse, 
ContinuationCallback {
 public synchronized Object getResponseObject() {
 Object obj = cont.getObject();
 if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
-obj = Response.ok().entity(obj).build();
+if (obj == null) {
+obj = Response.noContent().build();
+} else {
+obj = Response.ok().entity(obj).build();
+}
 }
 return obj;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e4a29643/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
index b621a23..590a0f8 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
@@ -44,7 +44,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 @Test
 public void testDefaultTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/defaulttimeout");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 Response r = wc.get();
 assertEquals(503, r.getStatus());
 }
@@ -52,13 +51,20 @@ public abstract class AbstractJAXRSContinuationsTest 
extends AbstractBusClientSe
 @Test
 public void testImmediateResume() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
 }
 
 @Test
+public void testNoContent() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/nocontent");
+wc.accept("text/plain");
+Response r = wc.get(Response.class);
+assertEquals(204, r.getStatus());
+}
+
+@Test
 public void testUnmappedAfterTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/suspend/unmapped");
 Response r = wc.get();
@@ -69,7 +75,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 public void testImmediateResumeSubresource() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() 
 + getBaseAddress() + 
"/books/subresources/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
@@ -99,7 +104,6 @@ public

cxf git commit: [CXF-6838] Correctly processing AsyncResponse resume with null

2016-03-22 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9787e41fd -> e4de49b41


[CXF-6838] Correctly processing AsyncResponse resume with null


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

Branch: refs/heads/3.1.x-fixes
Commit: e4de49b410966bf70326ec7d118a6d564ae3aa1e
Parents: 9787e41
Author: Sergey Beryozkin 
Authored: Tue Mar 22 17:58:12 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Mar 22 17:59:15 2016 +0300

--
 .../org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java|  6 +-
 .../systest/jaxrs/AbstractJAXRSContinuationsTest.java   | 12 
 .../apache/cxf/systest/jaxrs/BookContinuationStore.java |  7 +++
 3 files changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de49b4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 773faaf..7b3178d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -272,7 +272,11 @@ public class AsyncResponseImpl implements AsyncResponse, 
ContinuationCallback {
 public synchronized Object getResponseObject() {
 Object obj = cont.getObject();
 if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
-obj = Response.ok().entity(obj).build();
+if (obj == null) {
+obj = Response.noContent().build();
+} else {
+obj = Response.ok().entity(obj).build();
+}
 }
 return obj;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e4de49b4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
index 9fc9d88..f2c152b 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
@@ -44,7 +44,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 @Test
 public void testDefaultTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/defaulttimeout");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 Response r = wc.get();
 assertEquals(503, r.getStatus());
 }
@@ -52,13 +51,20 @@ public abstract class AbstractJAXRSContinuationsTest 
extends AbstractBusClientSe
 @Test
 public void testImmediateResume() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
 }
 
 @Test
+public void testNoContent() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/nocontent");
+wc.accept("text/plain");
+Response r = wc.get(Response.class);
+assertEquals(204, r.getStatus());
+}
+
+@Test
 public void testUnmappedAfterTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/suspend/unmapped");
 Response r = wc.get();
@@ -69,7 +75,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 public void testImmediateResumeSubresource() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() 
 + getBaseAddress() + 
"/books/subresources/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
@@ -99,7 +104,6 @@ public

cxf git commit: [CXF-6838] Correctly processing AsyncResponse resume with null

2016-03-22 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 05cf29dc4 -> ac9b9b189


[CXF-6838] Correctly processing AsyncResponse resume with null


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

Branch: refs/heads/master
Commit: ac9b9b1898bbe0cc911b34cc3d32664ac59fdc34
Parents: 05cf29d
Author: Sergey Beryozkin 
Authored: Tue Mar 22 17:58:12 2016 +0300
Committer: Sergey Beryozkin 
Committed: Tue Mar 22 17:58:12 2016 +0300

--
 .../org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java|  6 +-
 .../systest/jaxrs/AbstractJAXRSContinuationsTest.java   | 12 
 .../apache/cxf/systest/jaxrs/BookContinuationStore.java |  7 +++
 3 files changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac9b9b18/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 773faaf..7b3178d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -272,7 +272,11 @@ public class AsyncResponseImpl implements AsyncResponse, 
ContinuationCallback {
 public synchronized Object getResponseObject() {
 Object obj = cont.getObject();
 if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
-obj = Response.ok().entity(obj).build();
+if (obj == null) {
+obj = Response.noContent().build();
+} else {
+obj = Response.ok().entity(obj).build();
+}
 }
 return obj;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/ac9b9b18/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
index 9fc9d88..f2c152b 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
@@ -44,7 +44,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 @Test
 public void testDefaultTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/defaulttimeout");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 Response r = wc.get();
 assertEquals(503, r.getStatus());
 }
@@ -52,13 +51,20 @@ public abstract class AbstractJAXRSContinuationsTest 
extends AbstractBusClientSe
 @Test
 public void testImmediateResume() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
 }
 
 @Test
+public void testNoContent() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/nocontent");
+wc.accept("text/plain");
+Response r = wc.get(Response.class);
+assertEquals(204, r.getStatus());
+}
+
+@Test
 public void testUnmappedAfterTimeout() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() + 
getBaseAddress() + "/books/suspend/unmapped");
 Response r = wc.get();
@@ -69,7 +75,6 @@ public abstract class AbstractJAXRSContinuationsTest extends 
AbstractBusClientSe
 public void testImmediateResumeSubresource() throws Exception {
 WebClient wc = WebClient.create("http://localhost:; + getPort() 
 + getBaseAddress() + 
"/books/subresources/books/resume");
-
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(100L);
 wc.accept("text/plain");
 String str = wc.get(String.class);
 assertEquals("immediateResume", str);
@@ -99,7 +104,6 @@ public abstract

cxf-fediz git commit: Updating WSS4J

2016-03-22 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 68b626610 -> 80977a9b2


Updating WSS4J


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

Branch: refs/heads/1.2.x-fixes
Commit: 80977a9b236f93eefc5cce3f51b40e02c87478ed
Parents: 68b6266
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 10:18:31 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 10:18:31 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/80977a9b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 26249a7..981b74e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 3.2.8.RELEASE
 3.1.7.RELEASE
 7.0.68
-2.0.6
+2.0.7
 2.7.2
 0.5

cxf-fediz git commit: Updating WSS4J

2016-03-22 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master d6e13e521 -> 82ab06413


Updating WSS4J


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

Branch: refs/heads/master
Commit: 82ab06413b54178f5d21dacd7c8fc1bf32ec0a0c
Parents: d6e13e5
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 10:08:21 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 10:08:21 2016 +

--
 .../apache/cxf/fediz/core/federation/FederationResponseTest.java   | 2 +-
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/82ab0641/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
--
diff --git 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
index d6d97f8..10c6e43 100644
--- 
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
+++ 
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationResponseTest.java
@@ -1635,7 +1635,7 @@ public class FederationResponseTest {
 
 builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
 builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOEP);
+builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
 builder.setEmbedEncryptedKey(true);
 
 WSEncryptionPart encryptionPart = new 
WSEncryptionPart(assertion.getId(), "Element");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/82ab0641/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d8c6a7a..e769b5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 3.2.9.RELEASE
 7.0.68
 8.0.32
-2.1.4
+2.1.5
 2.7.2
 
 http://localhost:8080/manager/text

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

2016-03-22 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 860a19d80 -> 1f984e96b


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

Branch: refs/heads/3.0.x-fixes
Commit: d863e6b2060d9ed646df537d3c6a89c17e57c247
Parents: 860a19d
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 09:47:57 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 09:47:57 2016 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/d863e6b2/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9c92887..a5902d4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -515,6 +515,7 @@ B 96cd11b044262584561049d881e965a1e18b8a01
 B 96d0e7c75f6e583f7a3a8ae1849528863c81d5ad
 B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
 B 970feeed0db20bfe9df5095b6b335146344c222c
+B 9787e41fdd0f4cbb85895769ac266a32ef14e336
 B 985b824e0997d65aeb969330cd71b7f8b8b02f9d
 B 988caadb6f2eed12456dc576704d4b118c98995f
 B 9896b920035a1d1be1aef28a1d1a5eb876445c82

[2/2] cxf git commit: Updating WSS4J and XML Sec

2016-03-22 Thread coheigea 
Updating WSS4J and XML Sec


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

Branch: refs/heads/3.0.x-fixes
Commit: 1f984e96b5bce681d7f6ebbdd43a045d2ce6fd94
Parents: d863e6b
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 09:51:15 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 09:51:15 2016 +

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f984e96/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 18abcc7..4450981 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,7 @@
 4.4.1
 3.1.4
 1.6.3
-2.0.7-SNAPSHOT
+2.0.7
 2.11.0
 2.6.0
 2.2.1
@@ -196,7 +196,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.0.5
+2.0.6
 1.7R2_3
 1.2_5
 2.11.0_1

cxf git commit: Updating WSS4J + XML Sec

2016-03-22 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes cb8185f18 -> 9787e41fd


Updating WSS4J + XML Sec


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

Branch: refs/heads/3.1.x-fixes
Commit: 9787e41fdd0f4cbb85895769ac266a32ef14e336
Parents: cb8185f
Author: Colm O hEigeartaigh 
Authored: Tue Mar 22 09:47:31 2016 +
Committer: Colm O hEigeartaigh 
Committed: Tue Mar 22 09:47:31 2016 +

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9787e41f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ccf6de9..91b99a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,7 +151,7 @@
 4.4.1
 3.1.4
 1.6.3
-2.1.5-SNAPSHOT
+2.1.5
 2.11.0
 2.6.0
 2.2.1
@@ -191,7 +191,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.0.5
+2.0.6
 1.7R2_3
 1.2_5
 2.11.0_1