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

2016-04-13 Thread asoldano 
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/c7234f41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7234f41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7234f41

Branch: refs/heads/3.1.x-fixes
Commit: c7234f41345c6e051213a83460ba210e677389da
Parents: bbc3ca2
Author: Alessio Soldano 
Authored: Wed Apr 13 23:12:54 2016 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 13 23:12:54 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c7234f41/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 241bd31..aff70a9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -53,6 +53,7 @@ M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 0578e16146527b0782530c40ba2db17531756d96
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
+M 26edcd457ea507075a4c82e2787f11f11a432876
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425

[1/2] cxf git commit: [CXF-6867] Ensure Envelope and Body element prefixes are not changed when processing messages without headers

2016-04-13 Thread asoldano 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4a749e745 -> c7234f413


[CXF-6867] Ensure Envelope and Body element prefixes are not changed when 
processing messages without headers


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

Branch: refs/heads/3.1.x-fixes
Commit: bbc3ca287cca8cf982b62fb85c6a2bbc5bb59754
Parents: 4a749e7
Author: Alessio Soldano 
Authored: Wed Apr 13 23:02:56 2016 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 13 23:08:53 2016 +0200

--
 .../interceptor/ReadHeadersInterceptor.java | 21 
 .../binding/soap/saaj/SAAJInInterceptor.java| 10 ++
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 17 ++--
 .../apache/cxf/binding/soap/saaj/SAAJUtils.java | 17 
 4 files changed, 50 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bbc3ca28/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 269ef4d..6bfa3a3 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -70,6 +70,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 
 public static final String ENVELOPE_EVENTS = "envelope.events";
 public static final String BODY_EVENTS = "body.events";
+public static final String ENVELOPE_PREFIX = "envelope.prefix";
+public static final String BODY_PREFIX = "body.prefix";
 /**
  * 
  */
@@ -205,6 +207,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 } else {
 message.put(ENVELOPE_EVENTS, 
processor.getEnvAttributeAndNamespaceEvents());
 message.put(BODY_EVENTS, 
processor.getBodyAttributeAndNamespaceEvents());
+message.put(ENVELOPE_PREFIX, 
processor.getEnvelopePrefix());
+message.put(BODY_PREFIX, processor.getBodyPrefix());
 }
 if (addNC) {
 // add the Body-level declarations
@@ -326,6 +330,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 private Document doc;
 private Node parent;
 private QName lastStartElementQName;
+private String envelopePrefix;
+private String bodyPrefix;
 
 HeadersProcessor(SoapVersion version) {
 this.header = version.getHeader().getLocalPart();
@@ -409,6 +415,13 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 throw new Fault(e);
 }
 } else {
+if (ns.equals(lastStartElementQName.getNamespaceURI())) {
+if (body.equals(lastStartElementQName.getLocalPart())) 
{
+bodyPrefix = lastStartElementQName.getPrefix();
+} else if 
(envelope.equals(lastStartElementQName.getLocalPart())) {
+envelopePrefix = lastStartElementQName.getPrefix();
+}
+}
 events.add(event);
 }
 } else {
@@ -445,5 +458,13 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 return Collections.unmodifiableList(envEvents);
 }
 }
+
+public String getEnvelopePrefix() {
+return envelopePrefix;
+}
+
+public String getBodyPrefix() {
+return bodyPrefix;
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bbc3ca28/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 51afbf5..516bf89 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++

cxf git commit: [CXF-6867] Ensure Envelope and Body element prefixes are not changed when processing messages without headers

2016-04-13 Thread asoldano 
Repository: cxf
Updated Branches:
  refs/heads/master 6566e5c6e -> 26edcd457


[CXF-6867] Ensure Envelope and Body element prefixes are not changed when 
processing messages without headers


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

Branch: refs/heads/master
Commit: 26edcd457ea507075a4c82e2787f11f11a432876
Parents: 6566e5c
Author: Alessio Soldano 
Authored: Wed Apr 13 23:02:56 2016 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 13 23:02:56 2016 +0200

--
 .../interceptor/ReadHeadersInterceptor.java | 21 
 .../binding/soap/saaj/SAAJInInterceptor.java| 10 ++
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 17 ++--
 .../apache/cxf/binding/soap/saaj/SAAJUtils.java | 17 
 4 files changed, 50 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/26edcd45/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 269ef4d..6bfa3a3 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -70,6 +70,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 
 public static final String ENVELOPE_EVENTS = "envelope.events";
 public static final String BODY_EVENTS = "body.events";
+public static final String ENVELOPE_PREFIX = "envelope.prefix";
+public static final String BODY_PREFIX = "body.prefix";
 /**
  * 
  */
@@ -205,6 +207,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 } else {
 message.put(ENVELOPE_EVENTS, 
processor.getEnvAttributeAndNamespaceEvents());
 message.put(BODY_EVENTS, 
processor.getBodyAttributeAndNamespaceEvents());
+message.put(ENVELOPE_PREFIX, 
processor.getEnvelopePrefix());
+message.put(BODY_PREFIX, processor.getBodyPrefix());
 }
 if (addNC) {
 // add the Body-level declarations
@@ -326,6 +330,8 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 private Document doc;
 private Node parent;
 private QName lastStartElementQName;
+private String envelopePrefix;
+private String bodyPrefix;
 
 HeadersProcessor(SoapVersion version) {
 this.header = version.getHeader().getLocalPart();
@@ -409,6 +415,13 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 throw new Fault(e);
 }
 } else {
+if (ns.equals(lastStartElementQName.getNamespaceURI())) {
+if (body.equals(lastStartElementQName.getLocalPart())) 
{
+bodyPrefix = lastStartElementQName.getPrefix();
+} else if 
(envelope.equals(lastStartElementQName.getLocalPart())) {
+envelopePrefix = lastStartElementQName.getPrefix();
+}
+}
 events.add(event);
 }
 } else {
@@ -445,5 +458,13 @@ public class ReadHeadersInterceptor extends 
AbstractSoapInterceptor {
 return Collections.unmodifiableList(envEvents);
 }
 }
+
+public String getEnvelopePrefix() {
+return envelopePrefix;
+}
+
+public String getBodyPrefix() {
+return bodyPrefix;
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/26edcd45/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 51afbf5..516bf89 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java

cxf git commit: Fixing some potential Null dereferences in the codebase

2016-04-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b6dca9325 -> 4a749e745


Fixing some potential Null dereferences in the codebase


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

Branch: refs/heads/3.1.x-fixes
Commit: 4a749e745ee64b3d9ee09eb9e7a35039127d6f40
Parents: b6dca93
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 12:23:39 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 17:12:34 2016 +0100

--
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   |  6 -
 .../cxf/interceptor/FaultOutInterceptor.java|  5 ++--
 .../cxf/xmlbeans/XmlBeansWrapperHelper.java |  6 +++--
 .../interceptors/WrapperClassInInterceptor.java |  8 ++-
 .../apache/cxf/transport/jms/util/JMSUtil.java  |  4 +++-
 .../ws/addressing/impl/MAPAggregatorTest.java   |  2 +-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |  5 ++--
 .../systest/sts/issueunit/IssueUnitTest.java|  8 +++
 .../apache/cxf/systest/jaxrs/JMSBookStore.java  |  6 +++--
 .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 24 +---
 .../processors/idl/ConstrTypeSpecVisitor.java   |  8 ---
 .../processor/internal/ParameterProcessor.java  |  4 ++--
 .../processor/internal/ServiceProcessor.java|  5 
 .../tools/wsdlto/jaxws/JAXWSContainerTest.java  |  1 +
 14 files changed, 57 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4a749e74/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index f8a21d0..9ff8800 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -676,7 +676,11 @@ public final class JAXBUtils {
 
 }
 }
-
+
+if (ctx == null) {
+throw new JAXBException("No ctx found");
+}
+
 Object bridge = ctx.getClass().getMethod("createBridge", 
refClass).invoke(ctx, ref);
 return ReflectionInvokationHandler.createProxyWrapper(bridge,
   
BridgeWrapper.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/4a749e74/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java 
b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
index 22bf984..2a9cf80 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
@@ -157,11 +157,10 @@ public class FaultOutInterceptor extends 
AbstractPhaseInterceptor {
 
 FaultInfo faultInfo = bfi.getFaultInfo();
 Class c = 
(Class)faultInfo.getProperty(Class.class.getName());
-if (c != null && c.isAssignableFrom(class1)
-&& (selectedFaultInfo == null || 
selectedFaultInfoClass.isAssignableFrom(c))) {
+if (c != null && c.isAssignableFrom(class1) && (selectedFaultInfo 
== null
+|| (selectedFaultInfoClass != null && 
selectedFaultInfoClass.isAssignableFrom(c {
 selectedFaultInfo = faultInfo;
 selectedFaultInfoClass = c;
-
 }
 }
 return selectedFaultInfo;

http://git-wip-us.apache.org/repos/asf/cxf/blob/4a749e74/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
--
diff --git 
a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
 
b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
index 6b41ebe..c98de9b 100644
--- 
a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
+++ 
b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
@@ -56,8 +56,10 @@ public class XmlBeansWrapperHelper extends 
AbstractWrapperHelper {
 Method method = c.getMethod("newInstance", NO_CLASSES);
 obj = method.invoke(null, NO_PARAMS);
 }
-// create the value object
-obj = newType.invoke(obj, NO_PARAMS);
+

cxf git commit: Recording .gitmergeinfo Changes

2016-04-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ad60c6768 -> f01d17173


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

Branch: refs/heads/3.0.x-fixes
Commit: f01d17173227caafa1f46c6ebe1b673885e5a55b
Parents: ad60c67
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 19:45:55 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 19:45:55 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f01d1717/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 12255bf..e366d84 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -264,6 +264,7 @@ B 48ecb0fced1dd2e3a68f1f0785e1ced275895aee
 B 494ff7640d78b1667547c8aacfc1d517fff00ef8
 B 49829a180d3924f3dfc8ecf41ac904e8da020ba1
 B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
+B 4a749e745ee64b3d9ee09eb9e7a35039127d6f40
 B 4b44512d8c3fe76620dbac37d220038435c75ba5
 B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
 B 4b577dc98cc61e4aead2f0bdff6d017c8a7679df

cxf git commit: Fixing some potential Null dereferences in the codebase

2016-04-13 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 8215aeb4a -> 6566e5c6e


Fixing some potential Null dereferences in the codebase


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

Branch: refs/heads/master
Commit: 6566e5c6e7a3ae27965f14788b4002e80eaf9d46
Parents: 8215aeb
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 12:23:39 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 16:19:55 2016 +0100

--
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   |  6 -
 .../cxf/interceptor/FaultOutInterceptor.java|  5 ++--
 .../cxf/xmlbeans/XmlBeansWrapperHelper.java |  6 +++--
 .../interceptors/WrapperClassInInterceptor.java |  8 ++-
 .../apache/cxf/transport/jms/util/JMSUtil.java  |  4 +++-
 .../ws/addressing/impl/MAPAggregatorTest.java   |  2 +-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java  |  5 ++--
 .../systest/sts/issueunit/IssueUnitTest.java|  8 +++
 .../apache/cxf/systest/jaxrs/JMSBookStore.java  |  6 +++--
 .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 24 +---
 .../processors/idl/ConstrTypeSpecVisitor.java   |  8 ---
 .../processor/internal/ParameterProcessor.java  |  4 ++--
 .../processor/internal/ServiceProcessor.java|  5 
 .../tools/wsdlto/jaxws/JAXWSContainerTest.java  |  1 +
 14 files changed, 57 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6566e5c6/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index f8a21d0..9ff8800 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -676,7 +676,11 @@ public final class JAXBUtils {
 
 }
 }
-
+
+if (ctx == null) {
+throw new JAXBException("No ctx found");
+}
+
 Object bridge = ctx.getClass().getMethod("createBridge", 
refClass).invoke(ctx, ref);
 return ReflectionInvokationHandler.createProxyWrapper(bridge,
   
BridgeWrapper.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/6566e5c6/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java 
b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
index 22bf984..2a9cf80 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
@@ -157,11 +157,10 @@ public class FaultOutInterceptor extends 
AbstractPhaseInterceptor {
 
 FaultInfo faultInfo = bfi.getFaultInfo();
 Class c = 
(Class)faultInfo.getProperty(Class.class.getName());
-if (c != null && c.isAssignableFrom(class1)
-&& (selectedFaultInfo == null || 
selectedFaultInfoClass.isAssignableFrom(c))) {
+if (c != null && c.isAssignableFrom(class1) && (selectedFaultInfo 
== null
+|| (selectedFaultInfoClass != null && 
selectedFaultInfoClass.isAssignableFrom(c {
 selectedFaultInfo = faultInfo;
 selectedFaultInfoClass = c;
-
 }
 }
 return selectedFaultInfo;

http://git-wip-us.apache.org/repos/asf/cxf/blob/6566e5c6/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
--
diff --git 
a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
 
b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
index 6b41ebe..c98de9b 100644
--- 
a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
+++ 
b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansWrapperHelper.java
@@ -56,8 +56,10 @@ public class XmlBeansWrapperHelper extends 
AbstractWrapperHelper {
 Method method = c.getMethod("newInstance", NO_CLASSES);
 obj = method.invoke(null, NO_PARAMS);
 }
-// create the value object
-obj = newType.invoke(obj, NO_PARAMS);
+

cxf-fediz git commit: Fixing backmerge

2016-04-13 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 7fb519c25 -> 54fc13679


Fixing backmerge


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

Branch: refs/heads/1.2.x-fixes
Commit: 54fc13679c6ceaa43144937354e7ad36a6d8cc7c
Parents: 7fb519c
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 17:09:46 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 17:09:46 2016 +0100

--
 .../idp/src/main/webapp/WEB-INF/federation-validate-request.xml| 2 +-
 .../src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54fc1367/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
index 62dd5b9..114bb5d 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
@@ -36,7 +36,7 @@
 
 
-
+
 
 http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54fc1367/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git 
a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java 
b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index a6b1e4e..5998bcf 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -253,8 +253,6 @@ public class IdpTest {
 }
 
 Assert.assertNotNull(wresult);
-
-webClient.close();
 }
 
 @Test

[2/2] cxf-fediz git commit: [FEDIZ-164] - IdP default flow doesn't support multiple realms

2016-04-13 Thread coheigea 
[FEDIZ-164] - IdP default flow doesn't support multiple realms


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

Branch: refs/heads/1.2.x-fixes
Commit: 7fb519c251b47dbeb573952e2b687b19aa4efba6
Parents: 9779277
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 15:32:54 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 16:39:30 2016 +0100

--
 .../idp/src/main/webapp/WEB-INF/federation-validate-request.xml| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7fb519c2/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
index ffded3a..62dd5b9 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
@@ -36,7 +36,7 @@
 
 
-
+

[1/2] cxf-fediz git commit: Added SSO test for IdP

2016-04-13 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 0821461a0 -> 7fb519c25


Added SSO test for IdP


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

Branch: refs/heads/1.2.x-fixes
Commit: 9779277b57ee3469edbcc4b89f922cc43df69e1f
Parents: 0821461
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 15:09:33 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 16:39:12 2016 +0100

--
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 67 
 1 file changed, 67 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9779277b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git 
a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java 
b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index ca69583..a6b1e4e 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -47,6 +47,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.xml.security.keys.KeyInfo;
 import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.utils.Base64;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -189,6 +190,72 @@ public class IdpTest {
 
 Assert.assertNotNull(wresult);
 }
+
+@org.junit.Test
+public void testSuccessfulSSOInvokeOnIdP() throws Exception {
+String url = "https://localhost:; + getIdpHttpsPort() + 
"/fediz-idp/federation?";
+url += "wa=wsignin1.0";
+url += "=urn:org:apache:cxf:fediz:idp:realm-A";
+url += "=urn:org:apache:cxf:fediz:fedizhelloworld";
+String wreply = "https://localhost:; + getRpHttpsPort() + "/" + 
getServletContextName() + "/secure/fedservlet";
+url += "=" + wreply;
+
+String user = "alice";
+String password = "ecila";
+
+final WebClient webClient = new WebClient();
+webClient.getOptions().setUseInsecureSSL(true);
+webClient.addRequestHeader("Authorization", "Basic " + 
Base64.encode((user + ":" + password).getBytes()));
+
+//
+// First invocation
+//
+
+webClient.getOptions().setJavaScriptEnabled(false);
+HtmlPage idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals("IDP SignIn Response Form", 
idpPage.getTitleText());
+
+// Parse the form to get the token (wresult)
+DomNodeList results = 
idpPage.getElementsByTagName("input");
+
+String wresult = null;
+for (DomElement result : results) {
+if ("wresult".equals(result.getAttributeNS(null, "name"))) {
+wresult = result.getAttributeNS(null, "value");
+break;
+}
+}
+
+Assert.assertNotNull(wresult);
+
+//
+// Second invocation - change the credentials to make sure the session 
is set up correctly
+// 
+
+webClient.removeRequestHeader("Authorization");
+webClient.addRequestHeader("Authorization", "Basic " + 
Base64.encode(("mallory" + ":" + password).getBytes()));
+
+webClient.getOptions().setJavaScriptEnabled(false);
+idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals("IDP SignIn Response Form", 
idpPage.getTitleText());
+
+// Parse the form to get the token (wresult)
+results = idpPage.getElementsByTagName("input");
+
+wresult = null;
+for (DomElement result : results) {
+if ("wresult".equals(result.getAttributeNS(null, "name"))) {
+wresult = result.getAttributeNS(null, "value");
+break;
+}
+}
+
+Assert.assertNotNull(wresult);
+
+webClient.close();
+}
 
 @Test
 public void testIdPMetadata() throws Exception {

[4/4] cxf-fediz git commit: [FEDIZ-165] - Part II

2016-04-13 Thread coheigea 
[FEDIZ-165] - Part II


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

Branch: refs/heads/master
Commit: cc8708e1bac7bac8fdf1f1ac30c8a54272d2f004
Parents: a616dc6
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 16:18:54 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 16:18:54 2016 +0100

--
 .../idp/beans/samlsso/LocalRedirectCreator.java |  54 ++
 .../WEB-INF/flows/saml-validate-request.xml |   9 +-
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 108 +++
 3 files changed, 164 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cc8708e1/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/LocalRedirectCreator.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/LocalRedirectCreator.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/LocalRedirectCreator.java
new file mode 100644
index 000..9dfd626
--- /dev/null
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/LocalRedirectCreator.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.fediz.service.idp.beans.samlsso;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.apache.cxf.fediz.service.idp.domain.Idp;
+import org.apache.cxf.fediz.service.idp.util.WebUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.webflow.execution.RequestContext;
+
+/**
+ * Parse the parameters to create the URL for local redirection
+ */
+@Component
+public class LocalRedirectCreator {
+
+public String createRedirectURL(RequestContext context, Idp idp) throws 
UnsupportedEncodingException {
+StringBuilder redirectURL = new StringBuilder();
+redirectURL.append(idp.getIdpUrl().toString()).append("?");
+
+String relayState = 
(String)WebUtils.getAttributeFromFlowScope(context, "RelayState");
+redirectURL.append("RelayState=").append(relayState).append("&");
+String samlRequest = 
(String)WebUtils.getAttributeFromFlowScope(context, "SAMLRequest");
+
redirectURL.append("SAMLRequest=").append(URLEncoder.encode(samlRequest, 
"UTF-8"));
+
+String signature = (String)WebUtils.getAttributeFromFlowScope(context, 
"Signature");
+if (signature != null) {
+redirectURL.append("&");
+
redirectURL.append("Signature=").append(URLEncoder.encode(signature, "UTF-8"));
+}
+
+return redirectURL.toString();
+}
+
+
+}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cc8708e1/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
index 6c156ac..6808554 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
@@ -147,13 +147,8 @@
 
 
 
-
-
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cc8708e1/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git 
a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java 
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index c8356ee..86e9628 100644
---

[3/4] cxf-fediz git commit: [FEDIZ-165] - SAML SSO redirection on ForceAuthn or token expiry not working

2016-04-13 Thread coheigea 
[FEDIZ-165] - SAML SSO redirection on ForceAuthn or token expiry not working


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

Branch: refs/heads/master
Commit: a616dc6ca15d38c82d3939cf6eb754c0b2da34c2
Parents: ec486bf
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 15:48:34 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 15:48:34 2016 +0100

--
 .../WEB-INF/flows/saml-validate-request.xml |   4 +-
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 246 +++
 2 files changed, 249 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a616dc6c/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
index 4479a5b..6c156ac 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
@@ -147,10 +147,12 @@
 
 
 
+
 
++'SAMLRequest='+flowScope.encodedRequest">
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a616dc6c/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git 
a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java 
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 91a82d1..c8356ee 100644
--- 
a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ 
b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -396,6 +396,176 @@ public class IdpTest {
 webClient.close();
 }
 
+@org.junit.Test
+public void testSuccessfulSSOInvokeOnIdP() throws Exception {
+OpenSAMLUtil.initSamlEngine();
+
+// Create SAML AuthnRequest
+Document doc = DOMUtils.createDocument();
+doc.appendChild(doc.createElement("root"));
+// Create the AuthnRequest
+String consumerURL = "https://localhost:; + getRpHttpsPort() + "/" 
++ getServletContextName() + "/secure/fedservlet";
+AuthnRequest authnRequest = 
+new DefaultAuthnRequestBuilder().createAuthnRequest(
+null, "urn:org:apache:cxf:fediz:fedizhelloworld", consumerURL
+);
+authnRequest.setDestination("https://localhost:; + getIdpHttpsPort() + 
"/fediz-idp/saml");
+signAuthnRequest(authnRequest);
+
+Element authnRequestElement = OpenSAMLUtil.toDom(authnRequest, doc);
+String authnRequestEncoded = encodeAuthnRequest(authnRequestElement);
+
+String urlEncodedRequest = URLEncoder.encode(authnRequestEncoded, 
"UTF-8");
+
+String relayState = UUID.randomUUID().toString();
+String url = "https://localhost:; + getIdpHttpsPort() + 
"/fediz-idp/saml?";
+url += SSOConstants.RELAY_STATE + "=" + relayState;
+url += "&" + SSOConstants.SAML_REQUEST + "=" + urlEncodedRequest;
+
+String user = "alice";
+String password = "ecila";
+
+final WebClient webClient = new WebClient();
+webClient.getOptions().setUseInsecureSSL(true);
+webClient.addRequestHeader("Authorization", "Basic " + 
Base64.encode((user + ":" + password).getBytes()));
+
+//
+// First invocation
+//
+
+webClient.getOptions().setJavaScriptEnabled(false);
+HtmlPage idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals("IDP SignIn Response Form", 
idpPage.getTitleText());
+
+org.opensaml.saml.saml2.core.Response samlResponse = 
+parseSAMLResponse(idpPage, relayState, consumerURL, 
authnRequest.getID());
+String expected = "urn:oasis:names:tc:SAML:2.0:status:Success";
+Assert.assertEquals(expected, 
samlResponse.getStatus().getStatusCode().getValue());
+
+// Check claims
+String parsedResponse = 
DOM2Writer.nodeToString(samlResponse.getDOM().getOwnerDocument());
+String claim = ClaimTypes.FIRSTNAME.toString();
+Assert.assertTrue(parsedResponse.contains(claim));
+claim = ClaimTypes.LASTNAME.toString();
+Assert.assertTrue(parsedResponse.contains(claim));
+claim =

[2/4] cxf-fediz git commit: [FEDIZ-164] - IdP default flow doesn't support multiple realms

2016-04-13 Thread coheigea 
[FEDIZ-164] - IdP default flow doesn't support multiple realms


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

Branch: refs/heads/master
Commit: ec486bf662ef504c177a80ec031dca48aedfe806
Parents: 188e20c
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 15:32:54 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 15:32:54 2016 +0100

--
 .../src/main/webapp/WEB-INF/flows/federation-validate-request.xml  | 2 +-
 .../idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ec486bf6/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
index a242c80..2964176 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
@@ -38,7 +38,7 @@
 
 
-
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ec486bf6/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml 
b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
index ae05ae2..4479a5b 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
@@ -28,7 +28,7 @@
 
 
 
-
+

[1/4] cxf-fediz git commit: Added SSO test for IdP

2016-04-13 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 139fb6bd4 -> cc8708e1b


Added SSO test for IdP


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

Branch: refs/heads/master
Commit: 188e20c16b4938f2fc40d32a90baba03db1838a2
Parents: 139fb6b
Author: Colm O hEigeartaigh 
Authored: Wed Apr 13 15:09:33 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Apr 13 15:09:33 2016 +0100

--
 .../apache/cxf/fediz/systests/idp/IdpTest.java  | 67 
 1 file changed, 67 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/188e20c1/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
--
diff --git 
a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java 
b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 1bc4791..04bc875 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -47,6 +47,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.wss4j.dom.engine.WSSConfig;
 import org.apache.xml.security.keys.KeyInfo;
 import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.utils.Base64;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -191,6 +192,72 @@ public class IdpTest {
 
 webClient.close();
 }
+
+@org.junit.Test
+public void testSuccessfulSSOInvokeOnIdP() throws Exception {
+String url = "https://localhost:; + getIdpHttpsPort() + 
"/fediz-idp/federation?";
+url += "wa=wsignin1.0";
+url += "=urn:org:apache:cxf:fediz:idp:realm-A";
+url += "=urn:org:apache:cxf:fediz:fedizhelloworld";
+String wreply = "https://localhost:; + getRpHttpsPort() + "/" + 
getServletContextName() + "/secure/fedservlet";
+url += "=" + wreply;
+
+String user = "alice";
+String password = "ecila";
+
+final WebClient webClient = new WebClient();
+webClient.getOptions().setUseInsecureSSL(true);
+webClient.addRequestHeader("Authorization", "Basic " + 
Base64.encode((user + ":" + password).getBytes()));
+
+//
+// First invocation
+//
+
+webClient.getOptions().setJavaScriptEnabled(false);
+HtmlPage idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals("IDP SignIn Response Form", 
idpPage.getTitleText());
+
+// Parse the form to get the token (wresult)
+DomNodeList results = 
idpPage.getElementsByTagName("input");
+
+String wresult = null;
+for (DomElement result : results) {
+if ("wresult".equals(result.getAttributeNS(null, "name"))) {
+wresult = result.getAttributeNS(null, "value");
+break;
+}
+}
+
+Assert.assertNotNull(wresult);
+
+//
+// Second invocation - change the credentials to make sure the session 
is set up correctly
+// 
+
+webClient.removeRequestHeader("Authorization");
+webClient.addRequestHeader("Authorization", "Basic " + 
Base64.encode(("mallory" + ":" + password).getBytes()));
+
+webClient.getOptions().setJavaScriptEnabled(false);
+idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals("IDP SignIn Response Form", 
idpPage.getTitleText());
+
+// Parse the form to get the token (wresult)
+results = idpPage.getElementsByTagName("input");
+
+wresult = null;
+for (DomElement result : results) {
+if ("wresult".equals(result.getAttributeNS(null, "name"))) {
+wresult = result.getAttributeNS(null, "value");
+break;
+}
+}
+
+Assert.assertNotNull(wresult);
+
+webClient.close();
+}
 
 @Test
 public void testIdPMetadata() throws Exception {

cxf git commit: Fixing the system WADL test

2016-04-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3b2ce76de -> b6dca9325


Fixing the system WADL test


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

Branch: refs/heads/3.1.x-fixes
Commit: b6dca932548fc130bef28610646699bfafd80798
Parents: 3b2ce76
Author: Sergey Beryozkin 
Authored: Wed Apr 13 16:11:26 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Apr 13 16:12:31 2016 +0100

--
 .../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 5 ++---
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b6dca932/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index f89c6fb..2754c61 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -1222,11 +1222,10 @@ public abstract class ProviderFactory {
 return theProviders;
 }
 
-public MessageBodyWriter getRegisteredJaxbWriter() {
+public MessageBodyWriter getDefaultJaxbWriter() {
 for (ProviderInfo pi : this.messageWriters) {
 Class cls = pi.getProvider().getClass();
-if (cls.getName().equals(JAXB_PROVIDER_NAME)
-|| cls.getSuperclass().getName().equals(JAXB_PROVIDER_NAME)) {
+if (cls.getName().equals(JAXB_PROVIDER_NAME)) {
 return pi.getProvider();
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/b6dca932/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 a110e3c..5f3aeb0 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
@@ -286,7 +286,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
 
 MessageBodyWriter jaxbWriter = (m != null && 
useJaxbContextForQnames) 
-? ServerProviderFactory.getInstance(m).getRegisteredJaxbWriter() : 
null;
+? ServerProviderFactory.getInstance(m).getDefaultJaxbWriter() : 
null;
 ResourceTypes resourceTypes = 
ResourceUtils.getAllRequestResponseTypes(cris, 

useJaxbContextForQnames,

jaxbWriter);

cxf git commit: Fixing the system WADL test

2016-04-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 2f8a1f764 -> 8215aeb4a


Fixing the system WADL test


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

Branch: refs/heads/master
Commit: 8215aeb4a3a0bb4d0755642e4ffe67117a61ec29
Parents: 2f8a1f7
Author: Sergey Beryozkin 
Authored: Wed Apr 13 16:11:26 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Apr 13 16:11:26 2016 +0100

--
 .../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 5 ++---
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8215aeb4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index f89c6fb..2754c61 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -1222,11 +1222,10 @@ public abstract class ProviderFactory {
 return theProviders;
 }
 
-public MessageBodyWriter getRegisteredJaxbWriter() {
+public MessageBodyWriter getDefaultJaxbWriter() {
 for (ProviderInfo pi : this.messageWriters) {
 Class cls = pi.getProvider().getClass();
-if (cls.getName().equals(JAXB_PROVIDER_NAME)
-|| cls.getSuperclass().getName().equals(JAXB_PROVIDER_NAME)) {
+if (cls.getName().equals(JAXB_PROVIDER_NAME)) {
 return pi.getProvider();
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8215aeb4/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 a110e3c..5f3aeb0 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
@@ -286,7 +286,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
 
 MessageBodyWriter jaxbWriter = (m != null && 
useJaxbContextForQnames) 
-? ServerProviderFactory.getInstance(m).getRegisteredJaxbWriter() : 
null;
+? ServerProviderFactory.getInstance(m).getDefaultJaxbWriter() : 
null;
 ResourceTypes resourceTypes = 
ResourceUtils.getAllRequestResponseTypes(cris, 

useJaxbContextForQnames,

jaxbWriter);

cxf git commit: Trying to save OAuth2 model with both OpenJPA and Hibernate

2016-04-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes fe9f45584 -> 3b2ce76de


Trying to save OAuth2 model with both OpenJPA and Hibernate


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

Branch: refs/heads/3.1.x-fixes
Commit: 3b2ce76de26f35cf782f2607ca65f715a2caae50
Parents: fe9f455
Author: Sergey Beryozkin 
Authored: Wed Apr 13 12:58:32 2016 +0100
Committer: Sergey Beryozkin 
Committed: Wed Apr 13 13:40:10 2016 +0100

--
 rt/rs/security/oauth-parent/oauth2/pom.xml  | 61 +--
 .../security/oauth2/common/OAuthPermission.java | 28 +
 .../rs/security/oauth2/common/Permission.java   |  4 ++
 .../oauth2/common/ServerAccessToken.java|  4 +-
 .../grants/code/AuthorizationCodeGrant.java | 10 ++--
 .../code/ServerAuthorizationCodeGrant.java  |  6 +-
 .../oauth2/provider/JPAOAuthDataProvider.java   | 41 +
 .../oauth2/tokens/refresh/RefreshToken.java |  4 +-
 .../src/test/resources/META-INF/persistence.xml | 14 -
 rt/rs/security/sso/oidc/pom.xml | 62 ++--
 .../rs/security/oidc/idp/OidcUserSubject.java   | 11 
 .../oidc/idp/JPAOidcUserSubjectTest.java| 28 -
 .../src/test/resources/META-INF/persistence.xml | 17 +-
 13 files changed, 203 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3b2ce76d/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 86565be..975c74a 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -37,6 +37,7 @@
 
 4.1.0.Final
 1.8.0.10
+2.4.0
 
 
 
@@ -95,18 +96,19 @@
 easymock
 test
 
+
 
 org.hibernate
 hibernate-entitymanager
 ${hibernate.em.version}
 test
-
-
-
-xml-apis
-xml-apis
-
-
 
 
 hsqldb
@@ -114,13 +116,38 @@
 ${hsqldb.version}
 test
 
-
-
-
+ 
+ 
+   

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b2ce76d/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 0ae85ba..1026915 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -21,6 +21,8 @@ package org.apache.cxf.rs.security.oauth2.common;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -31,6 +33,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  * a limited set of HTTP verbs and request URIs
  */
 @XmlRootElement
+@Entity
 public class OAuthPermission extends Permission {
 private static final long serialVersionUID = -6486616235830491290L;
 private List httpVerbs = new LinkedList();
@@ -61,6 +64,7 @@ public class OAuthPermission extends Permission {
  * Gets the optional list of HTTP verbs
  * @return the list of HTTP verbs
  */
+@ElementCollection
 public List getHttpVerbs() {
 return httpVerbs;
 }
@@ -77,6 +81,7 @@ public class OAuthPermission extends Permission {
  * Gets the optional list of relative request URIs
  * @return the list of URIs
  */
+@ElementCollection
 public List getUris() {
 return uris;
 }
@@ -86,31 +91,28 @@ public class OAuthPermission extends Permission {
 if (!(object instanceof OAuthPermission) || !super.equals(object)) {
 return false;
 }
-
 OAuthPermission that = (OAuthPermission)object;
-if (this.httpVerbs != null && that.httpVerbs == null
-|| this.httpVerbs == null && that.httpVerbs != null
-|| this.httpVerbs != null &&