cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 590ab0113 -> 0928b2f09


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

Branch: refs/heads/3.0.x-fixes
Commit: 0928b2f09f2b9bbfdfd7c8573e1571049169b371
Parents: 590ab01
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 18:45:24 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 18:45:24 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/0928b2f0/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f79de5f..1cd54d8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -607,6 +607,7 @@ B 5ce682771ae91eab61e25eaa90ef416168eb4402
 B 5d0476df494674fae85463792acdbfe6744cee84
 B 5d0ac9e12b9658fbfea8c7c952783973462eabac
 B 5d387616bc1787f3ae50dbe2a185c6abb0e9955b
+B 5d4433e2077e65f9f6bde5a20793ca3c09a3d446
 B 5dd6b7aa92a3acb15e716959f39e83f5d6f48a9a
 B 5de4b86701c6787a7ed53087cb57a4ab47d9d7dd
 B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
@@ -674,6 +675,7 @@ B 69b2098d6e3bc83e26b614c5766b808f6d23f108
 B 69c28ad3faee6e0ef5b341460bbea224a3f6c3a2
 B 6a08736476f84c3bc40826d6debc6d4d96589cde
 B 6a1826d04db57d013caf72384796e58a86041daf
+B 6a23ff6455b9b2a2685a1587ca35010772601c58
 B 6a328a5c03cf04330293221fb1bb44173afa790f
 B 6a778890e91542ce0f8b92c6bbf3c3d403fa7aaa
 B 6a77cd049fc39bfd27dfe364fc7c1970e58cc455
@@ -1599,6 +1601,7 @@ B fcb6141014e9c66fcdf404f49776cbd853a18c71
 B fcc8bcb38f33febf5c73c5f5f56d877272f27e20
 B fcf585eb1b260c320281f1a5128307e9ae082547
 B fd090b694bc32468d50994b5146036cbbadd5640
+B fd28dc95e719fdd29a05eee48ad99ae505cfbc9e
 B fd33282da576997a31962ca7ea4dfdf653927f82
 B fd3471e58e63ee672babc015ed0929f6cd6862dd
 B fd5abbd3793e232638e4d0793ebb9765e49c638a

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

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

Branch: refs/heads/3.1.x-fixes
Commit: 6a23ff6455b9b2a2685a1587ca35010772601c58
Parents: 5d4433e
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 17:35:04 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 18:45:05 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6a23ff64/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b2a2aed..e7ee421 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -483,6 +483,7 @@ M df3854cefae5d2da71f8d222a86218e81df7bd05
 M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
 M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
+M e70c78ead201362c1a2f0937c23d9c50e3ca9542
 M e92e57c1f14de911cd2315a907443c79e91a94de
 M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
 M ed9298066428c0dfc4590a556876d696a4ba13c0

[3/3] cxf git commit: CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code

[coheigea]

CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code

# Conflicts:
#   
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 5d4433e2077e65f9f6bde5a20793ca3c09a3d446
Parents: d69a34b
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 16:55:53 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 18:45:05 2017 +

--
 .../JettyHTTPServerEngineFactory.java   | 22 
 1 file changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d4433e2/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
--
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index bd468a6..f9d0765 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -263,15 +263,28 @@ public class JettyHTTPServerEngineFactory {
  *server will listen on all local addresses.
  * @param port listen port for server
  * @param protocol "http" or "https"
+ * @param id The key to reference into the tlsParametersMap. Can be null.
  * @return
  * @throws GeneralSecurityException
  * @throws IOException
  */
+<<< HEAD
 public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port, 
 String protocol) throws GeneralSecurityException, IOException {
 LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");  
  
 JettyHTTPServerEngine ref = getOrCreate(this, host, port, null);
 // checking the protocol
+===
+public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
+String protocol, String id) throws GeneralSecurityException, 
IOException {
+LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
+TLSServerParameters tlsParameters = null;
+if (id != null && tlsParametersMap != null && 
tlsParametersMap.containsKey(id)) {
+tlsParameters = tlsParametersMap.get(id);
+}
+JettyHTTPServerEngine ref = getOrCreate(this, host, port, 
tlsParameters);
+// checking the protocol
+>>> e70c78e... CXF-7299 - No way to configure TLS for the 
JettyHTTPServerEngineFactory in code
 if (!protocol.equals(ref.getProtocol())) {
 throw new IOException("Protocol mismatch for port " + port + ": "
 + "engine's protocol is " + ref.getProtocol()
@@ -301,7 +314,16 @@ public class JettyHTTPServerEngineFactory {
 String protocol) throws GeneralSecurityException, IOException {
 return createJettyHTTPServerEngine(null, port, protocol);
 }
+<<< HEAD
 
+===
+
+public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
+String protocol) throws GeneralSecurityException, IOException {
+return createJettyHTTPServerEngine(host, port, protocol, null);
+}
+
+>>> e70c78e... CXF-7299 - No way to configure TLS for the 
JettyHTTPServerEngineFactory in code
 /**
  * This method removes the Server Engine from the port map and stops it.
  */

[1/3] cxf git commit: Fixing merge

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d69a34be8 -> fd28dc95e


Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: fd28dc95e719fdd29a05eee48ad99ae505cfbc9e
Parents: 6a23ff6
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 18:44:52 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 18:45:05 2017 +

--
 .../http_jetty/JettyHTTPServerEngineFactory.java| 12 
 1 file changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fd28dc95/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
--
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index f9d0765..e5e85a8 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -268,13 +268,6 @@ public class JettyHTTPServerEngineFactory {
  * @throws GeneralSecurityException
  * @throws IOException
  */
-<<< HEAD
-public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port, 
-String protocol) throws GeneralSecurityException, IOException {
-LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");  
  
-JettyHTTPServerEngine ref = getOrCreate(this, host, port, null);
-// checking the protocol
-===
 public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
 String protocol, String id) throws GeneralSecurityException, 
IOException {
 LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
@@ -284,7 +277,6 @@ public class JettyHTTPServerEngineFactory {
 }
 JettyHTTPServerEngine ref = getOrCreate(this, host, port, 
tlsParameters);
 // checking the protocol
->>> e70c78e... CXF-7299 - No way to configure TLS for the 
JettyHTTPServerEngineFactory in code
 if (!protocol.equals(ref.getProtocol())) {
 throw new IOException("Protocol mismatch for port " + port + ": "
 + "engine's protocol is " + ref.getProtocol()
@@ -314,16 +306,12 @@ public class JettyHTTPServerEngineFactory {
 String protocol) throws GeneralSecurityException, IOException {
 return createJettyHTTPServerEngine(null, port, protocol);
 }
-<<< HEAD
-
-===
 
 public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
 String protocol) throws GeneralSecurityException, IOException {
 return createJettyHTTPServerEngine(host, port, protocol, null);
 }
 
->>> e70c78e... CXF-7299 - No way to configure TLS for the 
JettyHTTPServerEngineFactory in code
 /**
  * This method removes the Server Engine from the port map and stops it.
  */

[2/3] cxf git commit: [CXF-6029] Debug log a throwable

[dkulp]

[CXF-6029] Debug log a throwable


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

Branch: refs/heads/3.0.x-fixes
Commit: e5ca4a1d5ab26679a757a0935fcaae4f43214d36
Parents: 3aecbd7
Author: Daniel Kulp 
Authored: Fri Mar 24 11:13:22 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:45:50 2017 -0400

--
 .../main/java/org/apache/cxf/bus/spring/SpringBusFactory.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e5ca4a1d/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
--
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java 
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
index 04ea866..c4840ac 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
@@ -66,8 +66,8 @@ public class SpringBusFactory extends BusFactory {
 if (r != null && !r.isEmpty()) {
 return r.get(0);
 }
-} catch (Throwable t) {
-//ignore
+} catch (Exception t) {
+LOG.log(Level.FINEST, "Could not find NamespaceHandlerResolver",  
t);
 }
 return null;
 }

[1/3] cxf git commit: [CXF-6161] Make sure wsdl import uses valid file name This closes #43

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes cae5b6fb8 -> 590ab0113


[CXF-6161] Make sure wsdl import uses valid file name
This closes #43


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

Branch: refs/heads/3.0.x-fixes
Commit: 3aecbd75418a527966e91ea260f58c26b3a320c9
Parents: cae5b6f
Author: Daniel Kulp 
Authored: Fri Mar 24 11:05:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:45:26 2017 -0400

--
 core/src/main/java/org/apache/cxf/helpers/FileUtils.java | 4 ++--
 .../org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java | 8 +---
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3aecbd75/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java 
b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index a8d3fa5..cd7a512 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -45,8 +45,8 @@ public final class FileUtils {
 private FileUtils() {
 
 }
-
-public boolean isValidFileName(String name) {
+
+public static boolean isValidFileName(String name) {
 for (int i = name.length(); i > 0; i--) {
 char c = name.charAt(i - 1);
 for (char c2 : ILLEGAL_CHARACTERS) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/3aecbd75/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
--
diff --git 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 3b57251..1a28859 100644
--- 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -789,7 +789,8 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 }

 //get imported wsdls
-List defs = 
(List)context.get(ToolConstants.IMPORTED_DEFINITION);
+int wsdlImportCount = 0;
+List defs = 
(List)context.get(ToolConstants.IMPORTED_DEFINITION);
 Map importWSDLMap = new HashMap();
 for (Definition importDef : defs) {
 File importedWsdlFile = null;
@@ -798,10 +799,11 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 } else {
 importedWsdlFile = new 
File(importDef.getQName().getLocalPart() + ".wsdl");
 }
+if (!FileUtils.isValidFileName(importedWsdlFile.getName())) {
+importedWsdlFile = new File("import" + (++wsdlImportCount) 
+ ".wsdl");
+}
 importWSDLMap.put(importDef.getTargetNamespace(), 
importedWsdlFile.getName());
 }
-
-
 OutputStreamCreator outputStreamCreator = null;
 if (context.get(OutputStreamCreator.class) != null) {
 outputStreamCreator = context.get(OutputStreamCreator.class);

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

[dkulp]

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

Branch: refs/heads/3.0.x-fixes
Commit: 590ab0113bf4013b663255789023f6a0b49382be
Parents: e5ca4a1
Author: Daniel Kulp 
Authored: Fri Mar 24 13:46:16 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:46:35 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/590ab011/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3764167..f79de5f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -448,6 +448,7 @@ B 4534b29556a1da628c920c36e4245d0d35ca6905
 B 4559444c83d4aa4745674a402c0461d170df6d84
 B 456bd834ca5a7a6b9bff3a546b445960012b88e2
 B 456eff5885d85e2cfe30b639bd5a442929a3f9de
+B 45a04b3ec3281ea04a06e0dfc88502d2f182f4b6
 B 45bdda8482aa38509cf62283c159bce347894e24
 B 45f6dac04dc543371c9de1ac3fbd4260f7805dd6
 B 46017d9a23bb46238c029fb21ca7a7ed4ea9e198
@@ -1173,6 +1174,7 @@ B b7657a47aca211d46df04998bf79a9e2ca76a545
 B b79272c09949cea80572fb86bc170cb344a9b731
 B b7ce0bf1e5106b7913269c1aa24c4ab3aa5631ee
 B b7d89466ab1c0ef68156cef6deb5a911fbf511f2
+B b7e9d2e0dc0c9f4248fbc8a8448c37b510c9a96c
 B b81dd0934986a17a46da8efdd4d3faee02e1d82c
 B b84103bba2e3731fba4dbf6c7f90b57039001da0
 B b84bd51dad062c605e8acdcdcfce610aaed7c3b3
@@ -1361,6 +1363,7 @@ B d5ea460f20d60c0496c70a2cf0b7f0484d48c806
 B d649aed452bb668ec575bd140c7a085e12b4b255
 B d67e9bb186751ac0edebaede9fce0dc98fac3400
 B d68f140c76cf7e390dfce134ea5c5d97f129e65d
+B d69a34be8be020b213d3c3abf86bfcf2e473f0d0
 B d69a9c8cc8309cf58d132aa65a5b7bf5e0e2432a
 B d6ff1564248ae7926ab105f6f56018acdc6494b3
 B d7872e7faa2f919154467158cd8790d6bd4f4be2

[1/4] cxf git commit: [CXF-6161] Make sure wsdl import uses valid file name This closes #43

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b7e9d2e0d -> d69a34be8


[CXF-6161] Make sure wsdl import uses valid file name
This closes #43


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

Branch: refs/heads/3.1.x-fixes
Commit: 61de9b89f504d6053bdf84a10ffabc2047657d11
Parents: b7e9d2e
Author: Daniel Kulp 
Authored: Fri Mar 24 11:05:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:43:07 2017 -0400

--
 core/src/main/java/org/apache/cxf/helpers/FileUtils.java | 4 ++--
 .../org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java | 8 +---
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/61de9b89/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java 
b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index cdab0ab..2cf1291 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -47,8 +47,8 @@ public final class FileUtils {
 private FileUtils() {
 
 }
-
-public boolean isValidFileName(String name) {
+
+public static boolean isValidFileName(String name) {
 for (int i = name.length(); i > 0; i--) {
 char c = name.charAt(i - 1);
 for (char c2 : ILLEGAL_CHARACTERS) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/61de9b89/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
--
diff --git 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 01f073b..8f608aa 100644
--- 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -790,7 +790,8 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 }

 //get imported wsdls
-List defs = 
(List)context.get(ToolConstants.IMPORTED_DEFINITION);
+int wsdlImportCount = 0;
+List defs = 
(List)context.get(ToolConstants.IMPORTED_DEFINITION);
 Map importWSDLMap = new HashMap();
 for (Definition importDef : defs) {
 File importedWsdlFile = null;
@@ -799,10 +800,11 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 } else {
 importedWsdlFile = new 
File(importDef.getQName().getLocalPart() + ".wsdl");
 }
+if (!FileUtils.isValidFileName(importedWsdlFile.getName())) {
+importedWsdlFile = new File("import" + (++wsdlImportCount) 
+ ".wsdl");
+}
 importWSDLMap.put(importDef.getTargetNamespace(), 
importedWsdlFile.getName());
 }
-
-
 OutputStreamCreator outputStreamCreator = null;
 if (context.get(OutputStreamCreator.class) != null) {
 outputStreamCreator = context.get(OutputStreamCreator.class);

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

[dkulp]

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

Branch: refs/heads/3.1.x-fixes
Commit: d69a34be8be020b213d3c3abf86bfcf2e473f0d0
Parents: 45a04b3
Author: Daniel Kulp 
Authored: Fri Mar 24 13:44:55 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:44:55 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/d69a34be/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c92b23f..b2a2aed 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -165,6 +165,7 @@ B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf
 B 7f4a24d037c06f76770e969ad7e2a47f4687a33a
 B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
 B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
+B 8172db9fcfd3472731fdd9e26704bcdd7f63cd76
 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
 B 86251ae75e6a663d6419623f47e393dd7a042742
 B 885b65d32198083961e380c8c55c7d7a6d00ed33
@@ -325,6 +326,7 @@ M 01d06cee06203b0ba616ca1924f1878aecc1a791
 M 01fdc40526185ee89202692088fd5367f0690af0
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 0252de53c8b2bd230544e7c9cffc9355741dc2f1
+M 02c11bb9191ce5712cb32e33bb5519362a9975d2
 M 0344b6bc0d1e61a3d3b5194f5ae3ebcdf62e8d56
 M 03987585902ef5db3c265a353e483f20e31b2c18
 M 04720d55a297aa4778a8194a766d9159ba662d33
@@ -336,6 +338,7 @@ M 08c9194ce2c567ebfe59f59ee628b1197d90fd43
 M 090fa6100ae3a5aa8ae894b0e238acb793f705ec
 M 09fb22b25333c66514f06652ceaf7fc11bde51cc
 M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
+M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
 M 11637433df089a638e173d1ef57441e7456cf2ea
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 11e18bf5622cafdb10723cee895885d676b35a7b
@@ -378,6 +381,7 @@ M 4799fef822a96f5d1b2827d5cc42ab886fd4e673
 M 4824bfe59878dd9dbbd2a067e8772b1971897cfc
 M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
+M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
 M 4f4ce80ba2de80219e13943cbd6edbf47234
 M 5022be0c15d90800ee983fe94b07a10a54814991
 M 52d77470228a3560f464003c68b30ffe8f1e8b9c

[3/4] cxf git commit: CXF-7292 additional privileged blocks required when Security Manager is enabled This closes #248

[dkulp]

CXF-7292 additional privileged blocks required when Security Manager is enabled
This closes #248


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

Branch: refs/heads/3.1.x-fixes
Commit: 45a04b3ec3281ea04a06e0dfc88502d2f182f4b6
Parents: 1eac82a
Author: Ivo Studensky 
Authored: Thu Feb 18 14:00:29 2016 +0100
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:43:12 2017 -0400

--
 .../apache/cxf/catalog/OASISCatalogManager.java | 38 +++--
 .../common/classloader/ClassLoaderUtils.java| 41 +++---
 .../org/apache/cxf/common/i18n/BundleUtils.java | 35 +--
 .../cxf/common/injection/ResourceInjector.java  |  2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   | 19 +++--
 .../org/apache/cxf/common/logging/LogUtils.java | 45 
 .../org/apache/cxf/common/util/ProxyHelper.java | 31 --
 .../java/org/apache/cxf/helpers/DOMUtils.java   | 32 --
 .../java/org/apache/cxf/helpers/XPathUtils.java | 18 +++-
 .../org/apache/cxf/resource/URIResolver.java| 14 --
 .../cxf/binding/soap/SOAPBindingUtil.java   | 39 ++---
 .../handler/AnnotationHandlerChainBuilder.java  | 16 ++-
 .../cxf/frontend/ClientProxyFactoryBean.java| 17 +++-
 .../cxf/transport/http/CXFAuthenticator.java|  8 ++--
 .../http/URLConnectionHTTPConduit.java  | 19 -
 15 files changed, 322 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45a04b3e/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
--
diff --git a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java 
b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
index 2aa061e..5a6911f 100644
--- a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
+++ b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
@@ -24,6 +24,10 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.Enumeration;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -133,7 +137,7 @@ public class OASISCatalogManager {
 }
 public final void loadContextCatalogs(String name) {
 try {
-loadCatalogs(Thread.currentThread().getContextClassLoader(), name);
+loadCatalogs(getContextClassLoader(), name);
 } catch (IOException e) {
 LOG.log(Level.WARNING, "Error loading " + name + " catalog files", 
e);
 }
@@ -146,12 +150,27 @@ public class OASISCatalogManager {
 
 Enumeration catalogs = classLoader.getResources(name);
 while (catalogs.hasMoreElements()) {
-URL catalogURL = catalogs.nextElement();
+final URL catalogURL = catalogs.nextElement();
 if (catalog == null) {
 LOG.log(Level.WARNING, "Catalog found at {0} but no 
org.apache.xml.resolver.CatalogManager was found."
 + "  Check the classpatch for an xmlresolver jar.", 
catalogURL.toString());
 } else if (!loadedCatalogs.contains(catalogURL.toString())) {
-((Catalog)catalog).parseCatalog(catalogURL);
+final SecurityManager sm = System.getSecurityManager();
+if (sm == null) {
+((Catalog)catalog).parseCatalog(catalogURL);
+} else {
+try {
+AccessController.doPrivileged(new 
PrivilegedExceptionAction() {
+@Override
+public Void run() throws Exception {
+((Catalog)catalog).parseCatalog(catalogURL);
+return null;
+}
+});
+} catch (PrivilegedActionException e) {
+throw (IOException) e.getException();
+}
+}
 loadedCatalogs.add(catalogURL.toString());
 }
 }
@@ -230,4 +249,17 @@ public class OASISCatalogManager {
 return resolver;
 }
 
+private static ClassLoader getContextClassLoader() {
+final SecurityManager sm = System.getSecurityManager();
+if (sm != null) {
+return AccessController.doPrivileged(new 
PrivilegedAction() {
+@Over

[2/4] cxf git commit: [CXF-6029] Debug log a throwable

[dkulp]

[CXF-6029] Debug log a throwable


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

Branch: refs/heads/3.1.x-fixes
Commit: 1eac82a6263bc7106b629144274013bd775c3827
Parents: 61de9b8
Author: Daniel Kulp 
Authored: Fri Mar 24 11:13:22 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:43:12 2017 -0400

--
 .../main/java/org/apache/cxf/bus/spring/SpringBusFactory.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1eac82a6/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
--
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java 
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
index 04ea866..c4840ac 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
@@ -66,8 +66,8 @@ public class SpringBusFactory extends BusFactory {
 if (r != null && !r.isEmpty()) {
 return r.get(0);
 }
-} catch (Throwable t) {
-//ignore
+} catch (Exception t) {
+LOG.log(Level.FINEST, "Could not find NamespaceHandlerResolver",  
t);
 }
 return null;
 }

[4/4] cxf git commit: [CXF-6161] Make sure wsdl import uses valid file name This closes #43

[dkulp]

[CXF-6161] Make sure wsdl import uses valid file name
This closes #43


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

Branch: refs/heads/master
Commit: 02c11bb9191ce5712cb32e33bb5519362a9975d2
Parents: e70c78e
Author: Daniel Kulp 
Authored: Fri Mar 24 11:05:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:36:49 2017 -0400

--
 core/src/main/java/org/apache/cxf/helpers/FileUtils.java| 2 +-
 .../java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java   | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/02c11bb9/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java 
b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index ded0785..5ebb23d 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -48,7 +48,7 @@ public final class FileUtils {
 
 }
 
-public boolean isValidFileName(String name) {
+public static boolean isValidFileName(String name) {
 for (int i = name.length(); i > 0; i--) {
 char c = name.charAt(i - 1);
 for (char c2 : ILLEGAL_CHARACTERS) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/02c11bb9/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
--
diff --git 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 29c623c..0b18dad 100644
--- 
a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ 
b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -790,6 +790,7 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 }
 
 //get imported wsdls
+int wsdlImportCount = 0;
 List defs = 
(List)context.get(ToolConstants.IMPORTED_DEFINITION);
 Map importWSDLMap = new HashMap<>();
 for (Definition importDef : defs) {
@@ -799,10 +800,12 @@ public class WSDLToJavaContainer extends 
AbstractCXFToolContainer {
 } else {
 importedWsdlFile = new 
File(importDef.getQName().getLocalPart() + ".wsdl");
 }
+if (!FileUtils.isValidFileName(importedWsdlFile.getName())) {
+importedWsdlFile = new File("import" + (++wsdlImportCount) 
+ ".wsdl");
+}
 importWSDLMap.put(importDef.getTargetNamespace(), 
importedWsdlFile.getName());
 }
 
-
 OutputStreamCreator outputStreamCreator = null;
 if (context.get(OutputStreamCreator.class) != null) {
 outputStreamCreator = context.get(OutputStreamCreator.class);

[2/4] cxf git commit: [CXF-6029] Debug log a throwable

[dkulp]

[CXF-6029] Debug log a throwable


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

Branch: refs/heads/master
Commit: 1f888b8c6132528df27ad319f23904f5a5ba4826
Parents: 02c11bb
Author: Daniel Kulp 
Authored: Fri Mar 24 11:13:22 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:36:49 2017 -0400

--
 .../main/java/org/apache/cxf/bus/spring/SpringBusFactory.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f888b8c/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
--
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java 
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
index 84b2761..e1a5c71 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
@@ -66,8 +66,8 @@ public class SpringBusFactory extends BusFactory {
 if (r != null && !r.isEmpty()) {
 return r.get(0);
 }
-} catch (Throwable t) {
-//ignore
+} catch (Exception t) {
+LOG.log(Level.FINEST, "Could not find NamespaceHandlerResolver",  
t);
 }
 return null;
 }

[3/4] cxf git commit: [CXF-4778] Increase memory given to command line tools

[dkulp]

[CXF-4778] Increase memory given to command line tools


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

Branch: refs/heads/master
Commit: 8172db9fcfd3472731fdd9e26704bcdd7f63cd76
Parents: 1f888b8
Author: Daniel Kulp 
Authored: Fri Mar 24 11:28:17 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:36:49 2017 -0400

--
 distribution/src/main/release/bin/idl2wsdl  | 7 ++-
 distribution/src/main/release/bin/idl2wsdl.bat  | 8 ++--
 distribution/src/main/release/bin/java2js   | 7 ++-
 distribution/src/main/release/bin/java2js.bat   | 9 +++--
 distribution/src/main/release/bin/java2ws   | 7 ++-
 distribution/src/main/release/bin/java2ws.bat   | 6 +-
 distribution/src/main/release/bin/mc| 7 ++-
 distribution/src/main/release/bin/mc.bat| 7 ++-
 distribution/src/main/release/bin/wadl2java | 7 ++-
 distribution/src/main/release/bin/wadl2java.bat | 6 +-
 distribution/src/main/release/bin/wsdl2corba| 7 ++-
 distribution/src/main/release/bin/wsdl2corba.bat| 5 -
 distribution/src/main/release/bin/wsdl2java | 6 +-
 distribution/src/main/release/bin/wsdl2java.bat | 6 +-
 distribution/src/main/release/bin/wsdl2js   | 7 ++-
 distribution/src/main/release/bin/wsdl2js.bat   | 5 -
 distribution/src/main/release/bin/wsdl2service  | 7 ++-
 distribution/src/main/release/bin/wsdl2service.bat  | 7 ++-
 distribution/src/main/release/bin/wsdl2soap | 7 ++-
 distribution/src/main/release/bin/wsdl2soap.bat | 6 +-
 distribution/src/main/release/bin/wsdl2xml  | 7 ++-
 distribution/src/main/release/bin/wsdl2xml.bat  | 6 +-
 distribution/src/main/release/bin/wsdlvalidator | 7 ++-
 distribution/src/main/release/bin/wsdlvalidator.bat | 6 +-
 distribution/src/main/release/bin/xsd2wsdl  | 8 +++-
 distribution/src/main/release/bin/xsd2wsdl.bat  | 7 ++-
 26 files changed, 147 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8172db9f/distribution/src/main/release/bin/idl2wsdl
--
diff --git a/distribution/src/main/release/bin/idl2wsdl 
b/distribution/src/main/release/bin/idl2wsdl
index 8c4c5f8..ed6e264 100755
--- a/distribution/src/main/release/bin/idl2wsdl
+++ b/distribution/src/main/release/bin/idl2wsdl
@@ -67,7 +67,12 @@ else
cxf_classpath=${cxf_jar}:${CLASSPATH}
 fi
 
-$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp 
"${cxf_classpath}" -Djava.util.logging.config.file=$log_config 
org.apache.cxf.tools.corba.IDLToWSDL "$@"
+if [ "x${JAVA_MAX_MEM}" = "x" ]; then
+JAVA_MAX_MEM=512M
+export JAVA_MAX_MEM
+fi
+
+$JAVA_HOME/bin/java -Xmx${JAVA_MAX_MEM} 
-Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}" 
-Djava.util.logging.config.file=$log_config 
org.apache.cxf.tools.corba.IDLToWSDL "$@"
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8172db9f/distribution/src/main/release/bin/idl2wsdl.bat
--
diff --git a/distribution/src/main/release/bin/idl2wsdl.bat 
b/distribution/src/main/release/bin/idl2wsdl.bat
index c3e8465..38b4e31 100644
--- a/distribution/src/main/release/bin/idl2wsdl.bat
+++ b/distribution/src/main/release/bin/idl2wsdl.bat
@@ -36,7 +36,11 @@ if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto 
no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp 
"%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" 
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" 
org.apache.cxf.tools.corba.IDLToWSDL %*
+if "%JAVA_MAX_MEM%" == "" (
+set JAVA_MAX_MEM=512M
+)
+
+"%JAVA_HOME%\bin\java" -Xmx%JAVA_MAX_MEM% 
-Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp 
"%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" 
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" 
org.apache.cxf.tools.corba.IDLToWSDL %*
 
 @endlocal
 
@@ -54,4 +58,4 @@ goto end
 set CXF_HOME=%~dp0..
 goto cont
 
-:end
\ No newline at end of file
+:end

http://git-wip-us.apache.org/repos/asf/cxf/blob/8172db9f/distribution/src/main/release/bin/java2js
--
diff --git a/distribution/src/main/release/bin/java2js 
b/distribution/src/main/release/bin/java2js
index 493c471..4778cb0 100755
--- a/distribution/src/main/release/bin/java2js
+++ b/distribution/src/main/release/bin/java2js
@@ -93,4 +93,9 @@ else
   cxf_classpath=${c

[1/4] cxf git commit: CXF-7292 additional privileged blocks required when Security Manager is enabled This closes #248

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master e70c78ead -> 10ed38c6d


CXF-7292 additional privileged blocks required when Security Manager is enabled
This closes #248


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

Branch: refs/heads/master
Commit: 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
Parents: 8172db9
Author: Ivo Studensky 
Authored: Thu Feb 18 14:00:29 2016 +0100
Committer: Daniel Kulp 
Committed: Fri Mar 24 13:36:49 2017 -0400

--
 .../apache/cxf/catalog/OASISCatalogManager.java | 38 +++--
 .../common/classloader/ClassLoaderUtils.java| 41 +++---
 .../org/apache/cxf/common/i18n/BundleUtils.java | 35 +--
 .../cxf/common/injection/ResourceInjector.java  |  2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   | 23 +++---
 .../org/apache/cxf/common/logging/LogUtils.java | 45 
 .../org/apache/cxf/common/util/ProxyHelper.java | 31 --
 .../java/org/apache/cxf/helpers/DOMUtils.java   | 30 -
 .../java/org/apache/cxf/helpers/XPathUtils.java | 16 ++-
 .../org/apache/cxf/resource/URIResolver.java| 12 --
 .../cxf/binding/soap/SOAPBindingUtil.java   | 35 +--
 .../handler/AnnotationHandlerChainBuilder.java  | 16 ++-
 .../cxf/frontend/ClientProxyFactoryBean.java| 17 +++-
 .../cxf/transport/http/CXFAuthenticator.java|  8 ++--
 .../http/URLConnectionHTTPConduit.java  | 19 -
 15 files changed, 319 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/10ed38c6/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
--
diff --git a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java 
b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
index 6950ac2..d971c1a 100644
--- a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
+++ b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
@@ -24,6 +24,10 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.Enumeration;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -133,7 +137,7 @@ public class OASISCatalogManager {
 }
 public final void loadContextCatalogs(String name) {
 try {
-loadCatalogs(Thread.currentThread().getContextClassLoader(), name);
+loadCatalogs(getContextClassLoader(), name);
 } catch (IOException e) {
 LOG.log(Level.WARNING, "Error loading " + name + " catalog files", 
e);
 }
@@ -146,12 +150,27 @@ public class OASISCatalogManager {
 
 Enumeration catalogs = classLoader.getResources(name);
 while (catalogs.hasMoreElements()) {
-URL catalogURL = catalogs.nextElement();
+final URL catalogURL = catalogs.nextElement();
 if (catalog == null) {
 LOG.log(Level.WARNING, "Catalog found at {0} but no 
org.apache.xml.resolver.CatalogManager was found."
 + "  Check the classpatch for an xmlresolver jar.", 
catalogURL.toString());
 } else if (!loadedCatalogs.contains(catalogURL.toString())) {
-((Catalog)catalog).parseCatalog(catalogURL);
+final SecurityManager sm = System.getSecurityManager();
+if (sm == null) {
+((Catalog)catalog).parseCatalog(catalogURL);
+} else {
+try {
+AccessController.doPrivileged(new 
PrivilegedExceptionAction() {
+@Override
+public Void run() throws Exception {
+((Catalog)catalog).parseCatalog(catalogURL);
+return null;
+}
+});
+} catch (PrivilegedActionException e) {
+throw (IOException) e.getException();
+}
+}
 loadedCatalogs.add(catalogURL.toString());
 }
 }
@@ -230,4 +249,17 @@ public class OASISCatalogManager {
 return resolver;
 }
 
+private static ClassLoader getContextClassLoader() {
+final SecurityManager sm = System.getSecurityManager();
+if (sm != null) {
+return AccessC

cxf git commit: CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 4d493d461 -> e70c78ead


CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code


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

Branch: refs/heads/master
Commit: e70c78ead201362c1a2f0937c23d9c50e3ca9542
Parents: 4d493d4
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 16:55:53 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 16:56:02 2017 +

--
 .../http_jetty/JettyHTTPServerEngineFactory.java  | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e70c78ea/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
--
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index f1e8d6e..2e5d624 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -258,14 +258,19 @@ public class JettyHTTPServerEngineFactory {
  *server will listen on all local addresses.
  * @param port listen port for server
  * @param protocol "http" or "https"
+ * @param id The key to reference into the tlsParametersMap. Can be null.
  * @return
  * @throws GeneralSecurityException
  * @throws IOException
  */
 public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
-String protocol) throws GeneralSecurityException, IOException {
+String protocol, String id) throws GeneralSecurityException, 
IOException {
 LOG.fine("Creating Jetty HTTP Server Engine for port " + port + ".");
-JettyHTTPServerEngine ref = getOrCreate(this, host, port, null);
+TLSServerParameters tlsParameters = null;
+if (id != null && tlsParametersMap != null && 
tlsParametersMap.containsKey(id)) {
+tlsParameters = tlsParametersMap.get(id);
+}
+JettyHTTPServerEngine ref = getOrCreate(this, host, port, 
tlsParameters);
 // checking the protocol
 if (!protocol.equals(ref.getProtocol())) {
 throw new IOException("Protocol mismatch for port " + port + ": "
@@ -297,6 +302,11 @@ public class JettyHTTPServerEngineFactory {
 return createJettyHTTPServerEngine(null, port, protocol);
 }
 
+public synchronized JettyHTTPServerEngine 
createJettyHTTPServerEngine(String host, int port,
+String protocol) throws GeneralSecurityException, IOException {
+return createJettyHTTPServerEngine(host, port, protocol, null);
+}
+
 /**
  * This method removes the Server Engine from the port map and stops it.
  */

cxf git commit: Fix compile failures

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9abefd26b -> cae5b6fb8


Fix compile failures


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

Branch: refs/heads/3.0.x-fixes
Commit: cae5b6fb8b2189bd57959c7ca5e7fb88c5c0eb34
Parents: 9abefd2
Author: Daniel Kulp 
Authored: Fri Mar 24 12:36:48 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 12:37:23 2017 -0400

--
 .../jms/util/PollingMessageListenerContainer.java| 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cae5b6fb/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index c087f25..7e9113e 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -70,12 +70,17 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 session.commit();
 }
 } catch (Throwable e) {
-LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
+if (e instanceof Exception) {
+LOG.log(Level.WARNING, "Exception while 
processing jms message in cxf. Rolling back",
+(Exception)e);
+}
 safeRollBack(session, e);
 }
 }
 } catch (Throwable e) {
-LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
+if (e instanceof Exception) {
+LOG.log(Level.WARNING, "Unexpected exception. 
Restarting session and consumer", (Exception)e);
+}
 } finally {
 ResourceCloser.close(consumer);
 ResourceCloser.close(session);
@@ -84,7 +89,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 
 }
 
-private void safeRollBack(Session session, Exception e) {
+private void safeRollBack(Session session, Throwable e) {
 try {
 if (session.getTransacted()) {
 session.rollback();

cxf git commit: [CXF-7298] Add jackson-module-jaxb-annotations

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes be269a8f7 -> b7e9d2e0d


[CXF-7298] Add jackson-module-jaxb-annotations


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

Branch: refs/heads/3.1.x-fixes
Commit: b7e9d2e0dc0c9f4248fbc8a8448c37b510c9a96c
Parents: be269a8
Author: Christian Schneider 
Authored: Fri Mar 24 17:02:55 2017 +0100
Committer: Christian Schneider 
Committed: Fri Mar 24 17:45:40 2017 +0100

--
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b7e9d2e0/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 7585564..7106619 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -239,6 +239,7 @@
 mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${cxf.jackson.version}
 
 
 cxf-jaxrs

cxf git commit: Fix compile failures

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ca87eda64 -> be269a8f7


Fix compile failures


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

Branch: refs/heads/3.1.x-fixes
Commit: be269a8f7b9409792963dee097da76cb5fdd5757
Parents: ca87eda
Author: Daniel Kulp 
Authored: Fri Mar 24 12:36:48 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 12:36:48 2017 -0400

--
 .../jms/util/PollingMessageListenerContainer.java| 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/be269a8f/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 8b904e2..36352bf 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -72,12 +72,17 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 session.commit();
 }
 } catch (Throwable e) {
-LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
+if (e instanceof Exception) {
+LOG.log(Level.WARNING, "Exception while 
processing jms message in cxf. Rolling back",
+(Exception)e);
+}
 safeRollBack(session, e);
 }
 }
 } catch (Throwable e) {
-LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
+if (e instanceof Exception) {
+LOG.log(Level.WARNING, "Unexpected exception. 
Restarting session and consumer", (Exception)e);
+}
 } finally {
 ResourceCloser.close(consumer);
 ResourceCloser.close(session);
@@ -86,7 +91,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 
 }
 
-private void safeRollBack(Session session, Exception e) {
+private void safeRollBack(Session session, Throwable e) {
 try {
 if (session.getTransacted()) {
 session.rollback();

[3/4] cxf git commit: [CXF-6598] Fix problem of inout headers when unwrapped causing IndexOutOfBoundsException

[dkulp]

[CXF-6598] Fix problem of inout headers when unwrapped causing 
IndexOutOfBoundsException


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

Branch: refs/heads/3.0.x-fixes
Commit: 28c213f33c7dc8c3f314ec6dcc81fd106c3abe98
Parents: c0b5983
Author: Daniel Kulp 
Authored: Fri Mar 24 10:02:24 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:51:18 2017 -0400

--
 .../factory/ReflectionServiceFactoryBean.java   | 54 
 1 file changed, 43 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/28c213f3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
--
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index 872076e..b62e469 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -126,6 +126,7 @@ import org.apache.ws.commons.schema.utils.NamespaceMap;
  * will be filled in from the service class. If no WSDL URL is specified, the
  * Service will be constructed directly from the class structure.
  */
+//CHECKSTYLE:OFF:NCSS-   This class is just huge and complex
 public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory.AbstractServiceFactoryBean {
 
 public static final String ENDPOINT_CLASS = "endpoint.class";
@@ -752,6 +753,15 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 o.setProperty(METHOD_PARAM_ANNOTATIONS, 
method.getParameterAnnotations());
 o.setProperty(METHOD_ANNOTATIONS, method.getAnnotations());
+//Set all out of band indexes to MAX_VALUE, anything left at MAX_VALUE 
after this is unmapped
+for (MessagePartInfo mpi : o.getInput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+if (o.hasOutput()) {
+for (MessagePartInfo mpi : o.getOutput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+}
 Class[] paramTypes = method.getParameterTypes();
 Type[] genericTypes = method.getGenericParameterTypes();
 for (int i = 0; i < paramTypes.length; i++) {
@@ -764,12 +774,16 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 return false;
 }
 }
+setIndexes(o.getInput());
 sendEvent(Event.OPERATIONINFO_IN_MESSAGE_SET, origOp, method, 
origOp.getInput());
 // Initialize return type
 if (o.hasOutput()
 && !initializeParameter(o, method, -1, method.getReturnType(), 
method.getGenericReturnType())) {
 return false;
 }
+if (o.hasOutput()) {
+setIndexes(o.getOutput());
+}
 if (origOp.hasOutput()) {
 sendEvent(Event.OPERATIONINFO_OUT_MESSAGE_SET, origOp, method, 
origOp.getOutput());
 }
@@ -777,6 +791,20 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 setFaultClassInfo(o, method);
 return true;
 }
+private void setIndexes(MessageInfo m) {
+int max = -1;
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() > max && mpi.getIndex() != Integer.MAX_VALUE) {
+max = mpi.getIndex();
+}
+}
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() == Integer.MAX_VALUE) {
+max++;
+mpi.setIndex(max);
+}
+}
+}
 private boolean initializeParameter(OperationInfo o, Method method, int i,
  Class paramType, Type genericType) {
 boolean isIn = isInParam(method, i);
@@ -799,26 +827,33 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 if (part == null && isHeader && o.isUnwrapped()) {
 part = 
((UnwrappedOperationInfo)o).getWrappedOperation().getInput().getMessagePart(name);
+boolean add = true;
 if (part == null) {
 QName name2 = this.getInParameterName(o, method, i);
 part = o.getInput().getMessagePart(name2);
 if (part != null) {
+add = false;
  

cxf git commit: [CXF-7298] Add jackson-module-jaxb-annotations

[cschneider]

Repository: cxf
Updated Branches:
  refs/heads/master a3fecd220 -> 4d493d461


[CXF-7298] Add jackson-module-jaxb-annotations


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

Branch: refs/heads/master
Commit: 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
Parents: a3fecd2
Author: Christian Schneider 
Authored: Fri Mar 24 17:02:55 2017 +0100
Committer: Christian Schneider 
Committed: Fri Mar 24 17:02:55 2017 +0100

--
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d493d46/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 5edd676..a882392 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -276,6 +276,7 @@
 mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}
+mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${cxf.jackson.version}
 
 
 wrap

[1/4] cxf git commit: [CXF-6907] Cache the EPR for performance

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5da6275ac -> 9abefd26b


[CXF-6907] Cache the EPR for performance


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

Branch: refs/heads/3.0.x-fixes
Commit: acf9e1ae247f34cb4f7a8cd4608fd688993a2223
Parents: 5da6275
Author: Daniel Kulp 
Authored: Thu Mar 23 14:10:54 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:50:15 2017 -0400

--
 .../java/org/apache/cxf/wsn/AbstractEndpoint.java| 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/acf9e1ae/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
--
diff --git 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
index 1cc869c..d886874 100644
--- 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
+++ 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
@@ -35,6 +35,8 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 protected EndpointManager manager;
 
 protected Endpoint endpoint;
+
+protected W3CEndpointReference endpointEpr;
 
 public AbstractEndpoint(String name) {
 this.name = name;
@@ -59,19 +61,24 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 public final URL getWSDLLocation() {
 return 
CreatePullPoint.class.getClassLoader().getResource("org/apache/cxf/wsn/wsdl/wsn.wsdl");
 
 }
-public void register() throws EndpointRegistrationException {
+public synchronized void register() throws EndpointRegistrationException {
 endpoint = manager.register(getAddress(), this, getWSDLLocation());
+endpointEpr = null;
 }
 
-public void unregister() throws EndpointRegistrationException {
+public synchronized void unregister() throws EndpointRegistrationException 
{
 if (endpoint != null) {
 manager.unregister(endpoint, this);
+endpointEpr = null;
 }
 }
 
-public W3CEndpointReference getEpr() {
+public synchronized W3CEndpointReference getEpr() {
 if (endpoint != null) {
-return manager.getEpr(endpoint);
+if (endpointEpr == null) {
+endpointEpr = manager.getEpr(endpoint);
+}
+return endpointEpr;
 }
 return null;
 }

[2/4] cxf git commit: [CXF-6672] Catch trhowable instead of exception to grab errors as well

[dkulp]

[CXF-6672] Catch trhowable instead of exception to grab errors as well

# Conflicts:
#   
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java


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

Branch: refs/heads/3.0.x-fixes
Commit: c0b598360c9bc192f0b9e6a38f6a5846a3c71614
Parents: acf9e1a
Author: Daniel Kulp 
Authored: Thu Mar 23 14:12:29 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:51:06 2017 -0400

--
 .../transport/jms/util/PollingMessageListenerContainer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c0b59836/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 8c68338..c087f25 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -69,12 +69,12 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.commit();
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
 safeRollBack(session, e);
 }
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
 } finally {
 ResourceCloser.close(consumer);
@@ -89,7 +89,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.rollback();
 }
-} catch (Exception e1) {
+} catch (Throwable e1) {
 LOG.log(Level.WARNING, "Rollback of Local transaction failed", 
e1);
 }
 }

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

[dkulp]

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

Branch: refs/heads/3.0.x-fixes
Commit: 9abefd26b6d1b51b1fac7a5b026fff7cf97feece
Parents: 28c213f
Author: Daniel Kulp 
Authored: Fri Mar 24 10:51:18 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:51:18 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/9abefd26/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a28ed43..3764167 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -891,6 +891,7 @@ B 8cfbd97e0e394dca4f67b4d9bef92380f839f23b
 B 8d80096c51d86e7896faa6ad96091df1ba2efd3c
 B 8e028a617f026fca2499f850bb680ada0692d681
 B 8e8703d676cd19f238f9b4ba78ffde41fa316422
+B 8e90865f6bea6a764193367c57a4a42c2276cc41
 B 8e930bcfc6e68775db59957df8ee38d73499a6f4
 B 8e9c9571f256ddbe06514ccc0c2f232218f905d6
 B 8eaa631c578e195fe1e452da17d9367459619490
@@ -1288,6 +1289,7 @@ B c9e4ddd3940e330498512846db747cb2acf95f07
 B c9ec28df42e815b0771964fdae96b7ecb2e2281b
 B ca0b59607b5c401b94fa918abb7b866184a9e1bd
 B ca1f38bcbcc5097af7e537173cacb24806b4b490
+B ca87eda64904abcd7892785763cf7127e8d6a4a5
 B ca9d6e1e89ea8007a86dde63c3da21f584ccbb46
 B caae5fb26da8cb211bf2a84fb0116d22400826e0
 B cab2ad9c5027ae9574de002ddc70908156e6f722

cxf-fediz git commit: This closes #14

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3c0a4c56d -> 6376a2c73


This closes #14


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

Branch: refs/heads/master
Commit: 6376a2c731f81ab261bb670c6d832b9b51b35432
Parents: 3c0a4c5
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 15:25:49 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 15:25:49 2017 +

--

--

cxf-fediz git commit: FEDIZ-195: propagate URI fragment on auth

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 4fee9ae12 -> 3c0a4c56d


FEDIZ-195: propagate URI fragment on auth

Updated OIDC and IDP JSP pages to propagate
URI fragment on form POST.

Signed-off-by: Colm O hEigeartaigh 


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

Branch: refs/heads/master
Commit: 3c0a4c56dd92d92e9cc76a5e7e896097db1c8f84
Parents: 4fee9ae
Author: gonzalad 
Authored: Thu Mar 23 18:58:39 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 15:10:47 2017 +

--
 .../WEB-INF/views/samlsigninresponseform.jsp| 41 ++
 .../main/webapp/WEB-INF/views/signinform.jsp| 31 +-
 .../webapp/WEB-INF/views/signinresponseform.jsp | 45 +++-
 .../WEB-INF/views/oAuthAuthorizationData.jsp| 24 ++-
 4 files changed, 120 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp 
b/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
index 3e7dc36..fdb4eec 100644
--- a/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
@@ -6,15 +6,40 @@
 
 IDP SignIn Response Form
 
-
-   
+
+
 
 
-   
-   Script is disabled. Click Submit to continue.
-   
-   
-   
-   window.setTimeout('document.forms[0].submit()',0);
+  
+Script is disabled. Click Submit to continue.
+
+ 
+
+
+/**
+ * Prepares the form for submission by appending any URI
+ * fragment (hash) to the form action in order to propagate it
+ * through the re-direct
+ * @param form The login form object.
+ * @returns the form.
+ */
+function propagateUriFragment(form) {
+// Extract the fragment from the browser's current location.
+var hash = decodeURIComponent(self.document.location.hash);
+
+// The fragment value may not contain a leading # symbol
+if (hash && hash.indexOf("#") === -1) {
+hash = "#" + hash;
+}
+
+// Append the fragment to the current action so that it persists 
to the redirected URL.
+form.action = form.action + hash;
+return form;
+}
+function documentLoaded() {
+propagateUriFragment(document.forms[0]);
+window.setTimeout('document.forms[0].submit()',0);
+}
+
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c0a4c56/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp
--
diff --git a/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp 
b/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp
index bcd7916..37785e0 100644
--- a/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/views/signinform.jsp
@@ -43,7 +43,7 @@
}


-   
+   



@@ -56,7 +56,7 @@

Fediz IDP Login

-   
+   

UserId

@@ -69,4 +69,31 @@



+   
+   function documentLoaded() {
+   var form = document.signinform;
+   form.username.focus();
+   propagateUriFragment(form);
+   }
+   /**
+ * Prepares the form for submission by appending any URI
+ * fragment (hash) to the form action in order to propagate it
+ * through the re-direct
+ * @param form The login form object.
+ * @returns the form.
+ */
+function propagateUriFragment(form) {
+// Extract the fragment from the browser's current location.
+var hash = decodeURIComponent(self.document.location.hash);
+
+// The fragment value may not contain a leading # symbol
+if (hash && hash.indexOf("#") === -1) {
+hash = "#" + hash;
+}
+
+// Append the fragment to the current action so that it persis

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

[dkulp]

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

Branch: refs/heads/3.1.x-fixes
Commit: ca87eda64904abcd7892785763cf7127e8d6a4a5
Parents: 469f604
Author: Daniel Kulp 
Authored: Fri Mar 24 10:49:39 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:49:39 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca87eda6/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 79b7432..c92b23f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -143,6 +143,7 @@ B 69c7b4c1ce4a9d131802c9a198706581eb4a3e91
 B 6c324421a358919b4ecb3cfdd8a2e0e16ff81724
 B 6d82b75eb982f13f5f071178aeef66e55b0e3fd4
 B 6df5deab24016d07e4099712b07535688d164d94
+B 6e01fcffa1e64f38b69a7cae9b2a7236d7ec330d
 B 6e7b79f6a8b6523b2248937275d92918e5682aa2
 B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6
 B 702389744199001e6c35e602ffb197ebaaf84838
@@ -228,6 +229,7 @@ B bd24e7efd7f8f4258e8fde99eb63e007378048f0
 B bd8aff6652eef048513571b96c703f4333f24dfb
 B bd95151baf5368295db6bf9798d106d89f2f8a60
 B be6190da7b0a05c505c99668270c993cd94a0eb2
+B bee6f221450179d4e680bc8abc1e7dd39347bea7
 B befeb0484cb195cbcd6163f65c54a94ba26d8335
 B bfa7a22c95af1f7c33f218d0cf5b10f17fce308c
 B bff51a63aa05df40f92c80bb940fb43af78653f2
@@ -401,6 +403,7 @@ M 7c3a8b02a62db3bcc5c3a1895e9f30bc4fa3821a
 M 7dbb31aed4bfa28bd170d6170d76ba4d7f43e7de
 M 7e952df66b6ede5c8084aa3387f82224ef04e1ea
 M 7fa67da1925e0a526730e6f83415a0826c72b1d4
+M 8049b4c2df7690b493462997c37168622a11324c
 M 804a957eb4225a1eaf65399881cdcd8552c00f52
 M 80ca2370616c28b036c54c95af84ca62f1725a30
 M 8118c5a301f22dea16c9d235ad378584a0ae2466

[2/4] cxf git commit: [CXF-6672] Catch trhowable instead of exception to grab errors as well

[dkulp]

[CXF-6672] Catch trhowable instead of exception to grab errors as well

# Conflicts:
#   
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 41db6153feec7f81190de235d4797cc18fb4bf6d
Parents: 89e2e1b
Author: Daniel Kulp 
Authored: Thu Mar 23 14:12:29 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:49:35 2017 -0400

--
 .../transport/jms/util/PollingMessageListenerContainer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/41db6153/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index f79ab09..8b904e2 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -71,12 +71,12 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.commit();
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
 safeRollBack(session, e);
 }
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Unexpected exception. Restarting 
session and consumer", e);
 } finally {
 ResourceCloser.close(consumer);
@@ -91,7 +91,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.rollback();
 }
-} catch (Exception e1) {
+} catch (Throwable e1) {
 LOG.log(Level.WARNING, "Rollback of Local transaction failed", 
e1);
 }
 }

[3/4] cxf git commit: [CXF-6598] Fix problem of inout headers when unwrapped causing IndexOutOfBoundsException

[dkulp]

[CXF-6598] Fix problem of inout headers when unwrapped causing 
IndexOutOfBoundsException


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

Branch: refs/heads/3.1.x-fixes
Commit: 469f604d2121f3f6696db599e0bc1dbc295a9200
Parents: 41db615
Author: Daniel Kulp 
Authored: Fri Mar 24 10:02:24 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:49:39 2017 -0400

--
 .../factory/ReflectionServiceFactoryBean.java   | 54 
 1 file changed, 43 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/469f604d/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
--
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index c55b832..2ba3338 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -126,6 +126,7 @@ import org.apache.ws.commons.schema.utils.NamespaceMap;
  * will be filled in from the service class. If no WSDL URL is specified, the
  * Service will be constructed directly from the class structure.
  */
+//CHECKSTYLE:OFF:NCSS-   This class is just huge and complex
 public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory.AbstractServiceFactoryBean {
 
 public static final String ENDPOINT_CLASS = "endpoint.class";
@@ -752,6 +753,15 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 o.setProperty(METHOD_PARAM_ANNOTATIONS, 
method.getParameterAnnotations());
 o.setProperty(METHOD_ANNOTATIONS, method.getAnnotations());
+//Set all out of band indexes to MAX_VALUE, anything left at MAX_VALUE 
after this is unmapped
+for (MessagePartInfo mpi : o.getInput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+if (o.hasOutput()) {
+for (MessagePartInfo mpi : o.getOutput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+}
 Class[] paramTypes = method.getParameterTypes();
 Type[] genericTypes = method.getGenericParameterTypes();
 for (int i = 0; i < paramTypes.length; i++) {
@@ -764,12 +774,16 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 return false;
 }
 }
+setIndexes(o.getInput());
 sendEvent(Event.OPERATIONINFO_IN_MESSAGE_SET, origOp, method, 
origOp.getInput());
 // Initialize return type
 if (o.hasOutput()
 && !initializeParameter(o, method, -1, method.getReturnType(), 
method.getGenericReturnType())) {
 return false;
 }
+if (o.hasOutput()) {
+setIndexes(o.getOutput());
+}
 if (origOp.hasOutput()) {
 sendEvent(Event.OPERATIONINFO_OUT_MESSAGE_SET, origOp, method, 
origOp.getOutput());
 }
@@ -777,6 +791,20 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 setFaultClassInfo(o, method);
 return true;
 }
+private void setIndexes(MessageInfo m) {
+int max = -1;
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() > max && mpi.getIndex() != Integer.MAX_VALUE) {
+max = mpi.getIndex();
+}
+}
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() == Integer.MAX_VALUE) {
+max++;
+mpi.setIndex(max);
+}
+}
+}
 private boolean initializeParameter(OperationInfo o, Method method, int i,
  Class paramType, Type genericType) {
 boolean isIn = isInParam(method, i);
@@ -799,26 +827,33 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 if (part == null && isHeader && o.isUnwrapped()) {
 part = 
((UnwrappedOperationInfo)o).getWrappedOperation().getInput().getMessagePart(name);
+boolean add = true;
 if (part == null) {
 QName name2 = this.getInParameterName(o, method, i);
 part = o.getInput().getMessagePart(name2);
 if (part != null) {
+add = false;
  

[1/4] cxf git commit: [CXF-6907] Cache the EPR for performance

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e1c2ff8bf -> ca87eda64


[CXF-6907] Cache the EPR for performance


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

Branch: refs/heads/3.1.x-fixes
Commit: 89e2e1bab7fecc155bed1d7f8c7f4258ee6550cf
Parents: e1c2ff8
Author: Daniel Kulp 
Authored: Thu Mar 23 14:10:54 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:48:36 2017 -0400

--
 .../java/org/apache/cxf/wsn/AbstractEndpoint.java| 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/89e2e1ba/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
--
diff --git 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
index 1cc869c..d886874 100644
--- 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
+++ 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
@@ -35,6 +35,8 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 protected EndpointManager manager;
 
 protected Endpoint endpoint;
+
+protected W3CEndpointReference endpointEpr;
 
 public AbstractEndpoint(String name) {
 this.name = name;
@@ -59,19 +61,24 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 public final URL getWSDLLocation() {
 return 
CreatePullPoint.class.getClassLoader().getResource("org/apache/cxf/wsn/wsdl/wsn.wsdl");
 
 }
-public void register() throws EndpointRegistrationException {
+public synchronized void register() throws EndpointRegistrationException {
 endpoint = manager.register(getAddress(), this, getWSDLLocation());
+endpointEpr = null;
 }
 
-public void unregister() throws EndpointRegistrationException {
+public synchronized void unregister() throws EndpointRegistrationException 
{
 if (endpoint != null) {
 manager.unregister(endpoint, this);
+endpointEpr = null;
 }
 }
 
-public W3CEndpointReference getEpr() {
+public synchronized W3CEndpointReference getEpr() {
 if (endpoint != null) {
-return manager.getEpr(endpoint);
+if (endpointEpr == null) {
+endpointEpr = manager.getEpr(endpoint);
+}
+return endpointEpr;
 }
 return null;
 }

[4/5] cxf git commit: [CXF-6672] Catch trhowable instead of exception to grab errors as well

[dkulp]

[CXF-6672] Catch trhowable instead of exception to grab errors as well


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

Branch: refs/heads/master
Commit: 8049b4c2df7690b493462997c37168622a11324c
Parents: 307cc3d
Author: Daniel Kulp 
Authored: Thu Mar 23 14:12:29 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:03:08 2017 -0400

--
 .../transport/jms/util/PollingMessageListenerContainer.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8049b4c2/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
--
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 8096eb3..c4276eb 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -65,12 +65,12 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session.getTransacted()) {
 session.commit();
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 LOG.log(Level.WARNING, "Exception while processing 
jms message in cxf. Rolling back", e);
 safeRollBack(session);
 }
 }
-} catch (Exception e) {
+} catch (Throwable e) {
 catchUnexpectedExceptionDuringPolling(null, e);
 }
 }
@@ -83,7 +83,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 if (session != null && session.getTransacted()) {
 session.rollback();
 }
-} catch (Exception e1) {
+} catch (Throwable e1) {
 LOG.log(Level.WARNING, "Rollback of Local transaction failed", 
e1);
 }
 }

[1/5] cxf git commit: [CXF-6598] Fix problem of inout headers when unwrapped causing IndexOutOfBoundsException

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master a42362e39 -> a3fecd220


[CXF-6598] Fix problem of inout headers when unwrapped causing 
IndexOutOfBoundsException


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

Branch: refs/heads/master
Commit: a3fecd22039dc4773b43227dd9f2cebfee7ac533
Parents: 8049b4c
Author: Daniel Kulp 
Authored: Fri Mar 24 10:02:24 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:03:08 2017 -0400

--
 .../factory/ReflectionServiceFactoryBean.java   | 54 
 1 file changed, 43 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a3fecd22/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
--
diff --git 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index e1d8660..398477d 100644
--- 
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ 
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -126,6 +126,7 @@ import org.apache.ws.commons.schema.utils.NamespaceMap;
  * will be filled in from the service class. If no WSDL URL is specified, the
  * Service will be constructed directly from the class structure.
  */
+//CHECKSTYLE:OFF:NCSS-   This class is just huge and complex
 public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory.AbstractServiceFactoryBean {
 
 public static final String ENDPOINT_CLASS = "endpoint.class";
@@ -752,6 +753,15 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 o.setProperty(METHOD_PARAM_ANNOTATIONS, 
method.getParameterAnnotations());
 o.setProperty(METHOD_ANNOTATIONS, method.getAnnotations());
+//Set all out of band indexes to MAX_VALUE, anything left at MAX_VALUE 
after this is unmapped
+for (MessagePartInfo mpi : o.getInput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+if (o.hasOutput()) {
+for (MessagePartInfo mpi : o.getOutput().getOutOfBandParts()) {
+mpi.setIndex(Integer.MAX_VALUE);
+}
+}
 Class[] paramTypes = method.getParameterTypes();
 Type[] genericTypes = method.getGenericParameterTypes();
 for (int i = 0; i < paramTypes.length; i++) {
@@ -764,12 +774,16 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 return false;
 }
 }
+setIndexes(o.getInput());
 sendEvent(Event.OPERATIONINFO_IN_MESSAGE_SET, origOp, method, 
origOp.getInput());
 // Initialize return type
 if (o.hasOutput()
 && !initializeParameter(o, method, -1, method.getReturnType(), 
method.getGenericReturnType())) {
 return false;
 }
+if (o.hasOutput()) {
+setIndexes(o.getOutput());
+}
 if (origOp.hasOutput()) {
 sendEvent(Event.OPERATIONINFO_OUT_MESSAGE_SET, origOp, method, 
origOp.getOutput());
 }
@@ -777,6 +791,20 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 setFaultClassInfo(o, method);
 return true;
 }
+private void setIndexes(MessageInfo m) {
+int max = -1;
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() > max && mpi.getIndex() != Integer.MAX_VALUE) {
+max = mpi.getIndex();
+}
+}
+for (MessagePartInfo mpi : m.getMessageParts()) {
+if (mpi.getIndex() == Integer.MAX_VALUE) {
+max++;
+mpi.setIndex(max);
+}
+}
+}
 private boolean initializeParameter(OperationInfo o, Method method, int i,
  Class paramType, Type genericType) {
 boolean isIn = isInParam(method, i);
@@ -799,26 +827,33 @@ public class ReflectionServiceFactoryBean extends 
org.apache.cxf.service.factory
 }
 if (part == null && isHeader && o.isUnwrapped()) {
 part = 
((UnwrappedOperationInfo)o).getWrappedOperation().getInput().getMessagePart(name);
+boolean add = true;
 if (part == null) {
 QName name2 = this.getInParameterName(o, method, i);
 part = o.getInput().getMessagePart(name2);
   

[3/5] cxf git commit: [CXF-5770] If vlidation-event-handler is a string, load it as a class

[dkulp]

[CXF-5770] If vlidation-event-handler is a string, load it as a class


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

Branch: refs/heads/master
Commit: bee6f221450179d4e680bc8abc1e7dd39347bea7
Parents: a42362e
Author: Daniel Kulp 
Authored: Thu Mar 23 13:43:53 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:03:08 2017 -0400

--
 .../java/org/apache/cxf/jaxb/JAXBDataBase.java  | 35 
 .../org/apache/cxf/jaxb/io/DataReaderImpl.java  |  7 +---
 .../org/apache/cxf/jaxb/io/DataWriterImpl.java  |  8 +
 3 files changed, 37 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bee6f221/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index 2501ea4..404fe15 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -23,8 +23,11 @@ import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.ValidationEventHandler;
 import javax.xml.bind.annotation.XmlAttachmentRef;
 import javax.xml.bind.annotation.XmlList;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,9 +35,12 @@ import javax.xml.bind.attachment.AttachmentMarshaller;
 import javax.xml.bind.attachment.AttachmentUnmarshaller;
 import javax.xml.validation.Schema;
 
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jaxb.attachment.JAXBAttachmentMarshaller;
 import org.apache.cxf.jaxb.attachment.JAXBAttachmentUnmarshaller;
 import org.apache.cxf.message.Attachment;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.AbstractMessageContainer;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
@@ -44,6 +50,7 @@ import org.apache.cxf.service.model.OperationInfo;
  *
  */
 public abstract class JAXBDataBase {
+static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBase.class);
 
 protected JAXBContext context;
 protected Schema schema;
@@ -152,6 +159,34 @@ public abstract class JAXBDataBase {
 Boolean b = (Boolean)part.getProperty("honor.jaxb.annotations");
 return b == null ? false : b;
 }
+
+protected ValidationEventHandler getValidationEventHandler(String cn) {
+try {
+return (ValidationEventHandler)ClassLoaderUtils.loadClass(cn, 
getClass()).newInstance();
+} catch (InstantiationException | IllegalAccessException | 
ClassNotFoundException e) {
+LOG.log(Level.INFO, "Could not create validation event handler", 
e);
+}
+return null;
+}
+
+protected ValidationEventHandler getValidationEventHandler(Message m, 
String property) {
+Object value = m.getContextualProperty(property);
+ValidationEventHandler veventHandler = null;
+if (value instanceof String) {
+veventHandler = getValidationEventHandler((String)value);
+} else {
+veventHandler = (ValidationEventHandler)value;
+}
+if (veventHandler == null) {
+value = 
m.getContextualProperty(JAXBDataBinding.VALIDATION_EVENT_HANDLER);
+if (value instanceof String) {
+veventHandler = getValidationEventHandler((String)value);
+} else {
+veventHandler = (ValidationEventHandler)value;
+}
+}
+return veventHandler;
+}
 
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bee6f221/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
index 10da669..38e9174 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
@@ -91,12 +91,7 @@ public class DataReaderImpl extends JAXBDataBase 
implements DataReader {
 unwrapJAXBElement = Boolean.TRUE.equals(value);
  

[5/5] cxf git commit: Update moxy version

[dkulp]

Update moxy version


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

Branch: refs/heads/master
Commit: 6e01fcffa1e64f38b69a7cae9b2a7236d7ec330d
Parents: bee6f22
Author: Daniel Kulp 
Authored: Thu Mar 23 14:00:07 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:03:08 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6e01fcff/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 98fc58d..e9c3eb7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2056,7 +2056,7 @@
 
 org.eclipse.persistence
 org.eclipse.persistence.moxy
-2.5.2
+2.6.4
 provided
 true
 

[2/5] cxf git commit: [CXF-6907] Cache the EPR for performance

[dkulp]

[CXF-6907] Cache the EPR for performance


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

Branch: refs/heads/master
Commit: 307cc3d77312a832cad963ffa7079388b21bd859
Parents: 6e01fcf
Author: Daniel Kulp 
Authored: Thu Mar 23 14:10:54 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 24 10:03:08 2017 -0400

--
 .../java/org/apache/cxf/wsn/AbstractEndpoint.java| 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/307cc3d7/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
--
diff --git 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
index a613355..beb3a7f 100644
--- 
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
+++ 
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractEndpoint.java
@@ -35,6 +35,8 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 protected EndpointManager manager;
 
 protected Endpoint endpoint;
+
+protected W3CEndpointReference endpointEpr;
 
 public AbstractEndpoint(String name) {
 this.name = name;
@@ -59,19 +61,24 @@ public abstract class AbstractEndpoint implements 
EndpointMBean {
 public final URL getWSDLLocation() {
 return 
CreatePullPoint.class.getClassLoader().getResource("org/apache/cxf/wsn/wsdl/wsn.wsdl");
 }
-public void register() throws EndpointRegistrationException {
+public synchronized void register() throws EndpointRegistrationException {
 endpoint = manager.register(getAddress(), this, getWSDLLocation());
+endpointEpr = null;
 }
 
-public void unregister() throws EndpointRegistrationException {
+public synchronized void unregister() throws EndpointRegistrationException 
{
 if (endpoint != null) {
 manager.unregister(endpoint, this);
+endpointEpr = null;
 }
 }
 
-public W3CEndpointReference getEpr() {
+public synchronized W3CEndpointReference getEpr() {
 if (endpoint != null) {
-return manager.getEpr(endpoint);
+if (endpointEpr == null) {
+endpointEpr = manager.getEpr(endpoint);
+}
+return endpointEpr;
 }
 return null;
 }

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes de7fa1f10 -> 5da6275ac


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

Branch: refs/heads/3.0.x-fixes
Commit: 5da6275ac4cfc8103d6223d4ef08e0ce1396f4ed
Parents: de7fa1f
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 12:29:26 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 12:29:26 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5da6275a/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a5a9853..a28ed43 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -82,6 +82,7 @@ B 0ddd071dd1e7c475d8a0463564a991d62c96e3b0
 B 0de0309f28e1543660c763c158f4353d6d2189be
 B 0e42bf2d533537be67d041da21b977124c98b23c
 B 0e639399027b2b43ece5b21f73effa6381a5bf0c
+B 0e95f2a4d9a5473cc4a96fa310fe57fd9c8e6cf0
 B 0ea13a8e17b88fd4cdf7273b55115c1e48908bfc
 B 0f1b0079fb0b21e2555c1c3d91a20275c9318fcd
 B 0f3ed09830186184d9cc4d32fffbc9e5cfe052a8
@@ -652,6 +653,7 @@ B 662b14a6e267808e71e786ff873ee27945122a20
 B 665eb259fced741f65de061bb026c3ab65a8d99c
 B 6669f84431bc34f2664d3a7f0e7b7cc972ab0971
 B 66a554f0c36bd5034edb4f20a1e85bb0c1e09cb3
+B 66b8d91fbda66959bfc41d59878e248ff23239fc
 B 66b9f877271669b0fb5bc3328effaf2013b93667
 B 66bb668ccf9f94bcf3ca4e51a0bbfa4342448e57
 B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c
@@ -1418,6 +1420,7 @@ B e0dd6d9741e21f5f1cf494b106d7ffdfa9ddbe93
 B e0f8164c747d2120b882e565782aab0097290209
 B e1246b3d0c00c9fe9489c0aacb683bf1de15d66b
 B e13ee941dd21570069230c61c828583e4f5ba40b
+B e1c2ff8bf93c05263584f34cde83ad9599a94cb2
 B e1d841c6ba4b0cad5b90a584cb3eefac3f0cb9a9
 B e1e3b2c7ab2f808fdd7849ba7f3622e945296d02
 B e1f392af26cd466970665cd822538751787b365f

[3/3] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: e1c2ff8bf93c05263584f34cde83ad9599a94cb2
Parents: 0e95f2a
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 12:29:00 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 12:29:00 2017 +

--
 .../cxf/systest/sts/issueunit/IssueUnitTest.java   | 13 -
 1 file changed, 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e1c2ff8b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 49963d6..7a6ff22 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -387,12 +387,7 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
 bus.shutdown(true);
 }
-<<< HEAD
-
-  //CHECKSTYLE:OFF
-===
 
->>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 @org.junit.Test
 public void testSAMLinWSSecToOtherRealm() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -480,12 +475,8 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 ) throws Exception {
 return requestSecurityToken(tokenType, keyType, null, bus, 
endpointAddress, context, null, null, null);
 }
-<<< HEAD
-
-===
 
 // CHECKSTYLE:OFF
->>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 private SecurityToken requestSecurityToken(
 String tokenType, 
 String keyType,
@@ -542,12 +533,8 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
 return stsClient.requestSecurityToken(endpointAddress);
 }
-<<< HEAD
-
-===
 // CHECKSTYLE:ON
 
->>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 private Properties getEncryptionProperties() {
 Properties properties = new Properties();
 properties.put(

[2/3] cxf git commit: CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException

[coheigea]

CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException

# Conflicts:
#   
services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 66b8d91fbda66959bfc41d59878e248ff23239fc
Parents: b951579
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 12:04:33 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 12:08:15 2017 +

--
 .../cxf/systest/sts/common/CustomIdentityMapper.java  |  4 ++--
 .../cxf/systest/sts/issueunit/IssueUnitTest.java  | 14 ++
 .../apache/cxf/systest/sts/deployment/sts/realms.xml  |  9 +++--
 3 files changed, 23 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
index 59c8c31..5a94433 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
@@ -20,13 +20,13 @@ package org.apache.cxf.systest.sts.common;
 
 import java.security.Principal;
 
-import org.apache.cxf.sts.IdentityMapper;
+import org.apache.cxf.sts.cache.MemoryIdentityCache;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 /**
  * A test implementation of IdentityMapper.
  */
-public class CustomIdentityMapper implements IdentityMapper {
+public class CustomIdentityMapper extends MemoryIdentityCache {
 
 /**
  * Map a principal in the source realm to the target realm

http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index b8de1fb..49963d6 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -387,8 +387,12 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
 bus.shutdown(true);
 }
+<<< HEAD
 
   //CHECKSTYLE:OFF
+===
+
+>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 @org.junit.Test
 public void testSAMLinWSSecToOtherRealm() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -476,7 +480,12 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 ) throws Exception {
 return requestSecurityToken(tokenType, keyType, null, bus, 
endpointAddress, context, null, null, null);
 }
+<<< HEAD
 
+===
+
+// CHECKSTYLE:OFF
+>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 private SecurityToken requestSecurityToken(
 String tokenType, 
 String keyType,
@@ -533,7 +542,12 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
 return stsClient.requestSecurityToken(endpointAddress);
 }
+<<< HEAD
 
+===
+// CHECKSTYLE:ON
+
+>>> a42362e... CXF-6549 - JMX MBean for IdentityCache throws 
RuntimeOperationsException
 private Properties getEncryptionProperties() {
 Properties properties = new Properties();
 properties.put(

http://git-wip-us.apache.org/repos/asf/cxf/blob/66b8d91f/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
index d42be3b..cc1c26f 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/a

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b951579b1 -> e1c2ff8bf


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

Branch: refs/heads/3.1.x-fixes
Commit: 0e95f2a4d9a5473cc4a96fa310fe57fd9c8e6cf0
Parents: 66b8d91
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 12:08:15 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 12:08:15 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/0e95f2a4/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ec741be..79b7432 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -435,6 +435,7 @@ M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
 M a2efc18eff09700eded186478a7c2ae8fa543eef
+M a42362e397b84d335015f7f9aa07b4f0bfb49260
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
 M a719adccae8500f2d7e7140a9f4cd26e20775818
 M a7d5d525c05cf10a6ae12c25645c248d92dfac1c

cxf git commit: CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master a719adcca -> a42362e39


CXF-6549 - JMX MBean for IdentityCache throws RuntimeOperationsException


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

Branch: refs/heads/master
Commit: a42362e397b84d335015f7f9aa07b4f0bfb49260
Parents: a719adc
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 12:04:33 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 12:04:33 2017 +

--
 .../apache/cxf/systest/sts/common/CustomIdentityMapper.java | 4 ++--
 .../org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java | 3 ++-
 .../org/apache/cxf/systest/sts/deployment/sts/realms.xml| 9 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a42362e3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
index 59c8c31..5a94433 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CustomIdentityMapper.java
@@ -20,13 +20,13 @@ package org.apache.cxf.systest.sts.common;
 
 import java.security.Principal;
 
-import org.apache.cxf.sts.IdentityMapper;
+import org.apache.cxf.sts.cache.MemoryIdentityCache;
 import org.apache.wss4j.common.principal.CustomTokenPrincipal;
 
 /**
  * A test implementation of IdentityMapper.
  */
-public class CustomIdentityMapper implements IdentityMapper {
+public class CustomIdentityMapper extends MemoryIdentityCache {
 
 /**
  * Map a principal in the source realm to the target realm

http://git-wip-us.apache.org/repos/asf/cxf/blob/a42362e3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index c72c898..630bb43 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -388,7 +388,6 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
-  //CHECKSTYLE:OFF
 @org.junit.Test
 public void testSAMLinWSSecToOtherRealm() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -477,6 +476,7 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 return requestSecurityToken(tokenType, keyType, null, bus, 
endpointAddress, context, null, null, null);
 }
 
+// CHECKSTYLE:OFF
 private SecurityToken requestSecurityToken(
 String tokenType,
 String keyType,
@@ -533,6 +533,7 @@ public class IssueUnitTest extends 
AbstractBusClientServerTestBase {
 
 return stsClient.requestSecurityToken(endpointAddress);
 }
+// CHECKSTYLE:ON
 
 private Properties getEncryptionProperties() {
 Properties properties = new Properties();

http://git-wip-us.apache.org/repos/asf/cxf/blob/a42362e3/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
index 7ba66d2..7de1aaf 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/realms.xml
@@ -36,13 +36,18 @@
 
 
 
-
+
+
+
+
+
+
 
 
 
 
 
-
+
 
 
 

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 248576aea -> de7fa1f10


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

Branch: refs/heads/3.0.x-fixes
Commit: de7fa1f108e8ce7e462d26012eec0e62ad91726b
Parents: 248576a
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 11:10:44 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 11:10:44 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/de7fa1f1/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d58506b..a5a9853 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1178,6 +1178,7 @@ B b86fcc444a31e9b203822a9639a1ac2fd18ac27e
 B b8fe59b5d696e31b607efca1dc32f2521e99884a
 B b91bd2354ec2195bfea0309b24949ee2b04a7ade
 B b9431024bcc3e244a220489e7f101adde6380a86
+B b951579b1c5c1e1ae06fdeebe96bdc20f830a5c0
 B ba00202288bce9ba80692f151c2d73b101400c50
 B ba17570e53cec4386f7c6fd40f075c6fbc1c3981
 B ba293c6e7456e80a5fe92f25a4893d3e45380bf0
@@ -1381,6 +1382,7 @@ B daf19cc33f77e2b4ddd2e2b583926be189b84abb
 B db18a965fb238b8515ab74eb63d13c863c279476
 B db51e1a99ab886f179c677579ba798b450069287
 B db8fca38f64cae8cdfc846774db6625cec5d387c
+B dbbf17abd26750ea129fb42cae7704ca1004c170
 B dbc867f9882575625032e8e29321ad28f1d039b1
 B dbe659d16f536944afaee85d76715558761936c6
 B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa
@@ -1418,6 +1420,7 @@ B e1246b3d0c00c9fe9489c0aacb683bf1de15d66b
 B e13ee941dd21570069230c61c828583e4f5ba40b
 B e1d841c6ba4b0cad5b90a584cb3eefac3f0cb9a9
 B e1e3b2c7ab2f808fdd7849ba7f3622e945296d02
+B e1f392af26cd466970665cd822538751787b365f
 B e231ad5e62e91eaf02a46587de9a683c1809a71f
 B e242307ad8bbe53788f3e03e9e2f0ca977d01340
 B e27ccedf71d44ca5b20296e8401eef302311ebff

[2/3] cxf git commit: CXF-6044 - Obsolet Testing Method in LDAPClaimsTest

[coheigea]

CXF-6044 - Obsolet Testing Method in LDAPClaimsTest

# Conflicts:
#   
systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java


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

Branch: refs/heads/3.1.x-fixes
Commit: e1f392af26cd466970665cd822538751787b365f
Parents: c5a654b
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 10:51:24 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 10:52:04 2017 +

--
 .../systest/kerberos/ldap/LDAPClaimsTest.java   | 73 +++-
 1 file changed, 72 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e1f392af/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 785bae7..2751787 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -30,6 +30,7 @@ import java.nio.file.Path;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -38,6 +39,7 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.rt.security.claims.Claim;
 import org.apache.cxf.rt.security.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimTypes;
+import org.apache.cxf.sts.claims.ClaimsManager;
 import org.apache.cxf.sts.claims.ClaimsParameters;
 import org.apache.cxf.sts.claims.LdapClaimsHandler;
 import org.apache.cxf.sts.claims.LdapGroupClaimsHandler;
@@ -130,6 +132,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testRetrieveClaims() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandler");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 String user = props.getProperty("claimUser");
 Assert.notNull(user, "Property 'claimUser' not configured");
@@ -143,8 +147,13 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {

 ClaimsParameters params = new ClaimsParameters();
 params.setPrincipal(new CustomTokenPrincipal(user));
+<<< HEAD
 ProcessedClaimCollection retrievedClaims = 
 claimsHandler.retrieveClaimValues(requestedClaims, params);
+===
+ProcessedClaimCollection retrievedClaims =
+claimsManager.retrieveClaimValues(requestedClaims, params);
+>>> a719adc... CXF-6044 - Obsolet Testing Method in LDAPClaimsTest
 
 Assert.isTrue(
   retrievedClaims.size() == expectedClaims.size(), 
@@ -164,6 +173,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testRetrieveClaimsUsingLDAPLookup() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandler");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 ClaimCollection requestedClaims = createRequestClaimCollection();
 
@@ -174,8 +185,13 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {

 ClaimsParameters params = new ClaimsParameters();
 params.setPrincipal(new 
CustomTokenPrincipal("cn=alice,ou=users,dc=example,dc=com"));
+<<< HEAD
 ProcessedClaimCollection retrievedClaims = 
 claimsHandler.retrieveClaimValues(requestedClaims, params);
+===
+ProcessedClaimCollection retrievedClaims =
+claimsManager.retrieveClaimValues(requestedClaims, params);
+>>> a719adc... CXF-6044 - Obsolet Testing Method in LDAPClaimsTest
 
 Assert.isTrue(
   retrievedClaims.size() == expectedClaims.size(), 
@@ -195,6 +211,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testMultiUserBaseDNs() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandlerMultipleUserBaseDNs");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManage

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c5a654b65 -> b951579b1


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

Branch: refs/heads/3.1.x-fixes
Commit: dbbf17abd26750ea129fb42cae7704ca1004c170
Parents: e1f392a
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 10:52:04 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 10:52:04 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/dbbf17ab/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index eca12af..ec741be 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -436,6 +436,7 @@ M a1710bdd783afcd667d9e72ccb031480d3806850
 M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
 M a2efc18eff09700eded186478a7c2ae8fa543eef
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
+M a719adccae8500f2d7e7140a9f4cd26e20775818
 M a7d5d525c05cf10a6ae12c25645c248d92dfac1c
 M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
 M a93f0d9ad891865cc635a961cb890c2031177e5b

[3/3] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: b951579b1c5c1e1ae06fdeebe96bdc20f830a5c0
Parents: dbbf17a
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 11:01:27 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 11:01:27 2017 +

--
 .../systest/kerberos/ldap/LDAPClaimsTest.java   | 177 ++-
 1 file changed, 56 insertions(+), 121 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b951579b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 2751787..5008bde 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.rt.security.claims.Claim;
 import org.apache.cxf.rt.security.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimTypes;
+import org.apache.cxf.sts.claims.ClaimsHandler;
 import org.apache.cxf.sts.claims.ClaimsManager;
 import org.apache.cxf.sts.claims.ClaimsParameters;
 import org.apache.cxf.sts.claims.LdapClaimsHandler;
@@ -93,9 +94,9 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 
 private static Properties props;
 private static boolean portUpdated;
-
+
 private ClassPathXmlApplicationContext appContext;
-
+
 @BeforeClass
 public static void startServers() throws Exception {
 props = new Properties();
@@ -114,18 +115,18 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 if (basedir == null) {
 basedir = new File(".").getCanonicalPath();
 }
-
+
 // Read in ldap.xml and substitute in the correct port
 Path path = FileSystems.getDefault().getPath(basedir, 
"/src/test/resources/ldap.xml");
 String content = new String(Files.readAllBytes(path), 
StandardCharsets.UTF_8);
 content = content.replaceAll("portno", "" + 
super.getLdapServer().getPort());
-
+
 Path path2 = FileSystems.getDefault().getPath(basedir, 
"/target/test-classes/ldapport.xml");
 Files.write(path2, content.getBytes());
-
+
 portUpdated = true;
 }
-
+
 appContext = new ClassPathXmlApplicationContext("ldapport.xml");
 }
 
@@ -133,7 +134,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 public void testRetrieveClaims() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandler");
 ClaimsManager claimsManager = new ClaimsManager();
-
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 String user = props.getProperty("claimUser");
 Assert.notNull(user, "Property 'claimUser' not configured");
@@ -144,20 +145,15 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 expectedClaims.add(ClaimTypes.FIRSTNAME);
 expectedClaims.add(ClaimTypes.LASTNAME);
 expectedClaims.add(ClaimTypes.EMAILADDRESS);
-   
+
 ClaimsParameters params = new ClaimsParameters();
 params.setPrincipal(new CustomTokenPrincipal(user));
-<<< HEAD
-ProcessedClaimCollection retrievedClaims = 
-claimsHandler.retrieveClaimValues(requestedClaims, params);
-===
 ProcessedClaimCollection retrievedClaims =
 claimsManager.retrieveClaimValues(requestedClaims, params);
->>> a719adc... CXF-6044 - Obsolet Testing Method in LDAPClaimsTest
 
 Assert.isTrue(
-  retrievedClaims.size() == expectedClaims.size(), 
-  "Retrieved number of claims [" + retrievedClaims.size() 
+  retrievedClaims.size() == expectedClaims.size(),
+  "Retrieved number of claims [" + retrievedClaims.size()
   + "] doesn't match with expected [" + 
expectedClaims.size() + "]"
 );
 
@@ -169,12 +165,12 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 }
 }
 }
-
+
 @org.junit.Test
 public void testRetrieveClaimsUsingLDAPLook

cxf git commit: CXF-6044 - Obsolet Testing Method in LDAPClaimsTest

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 4824bfe59 -> a719adcca


CXF-6044 - Obsolet Testing Method in LDAPClaimsTest


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

Branch: refs/heads/master
Commit: a719adccae8500f2d7e7140a9f4cd26e20775818
Parents: 4824bfe
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 10:51:24 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 10:51:24 2017 +

--
 .../systest/kerberos/ldap/LDAPClaimsTest.java   | 61 +++-
 1 file changed, 33 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a719adcc/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 254da3c..0c0a37e 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -30,6 +30,7 @@ import java.nio.file.Path;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -38,6 +39,7 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.rt.security.claims.Claim;
 import org.apache.cxf.rt.security.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimTypes;
+import org.apache.cxf.sts.claims.ClaimsManager;
 import org.apache.cxf.sts.claims.ClaimsParameters;
 import org.apache.cxf.sts.claims.LdapClaimsHandler;
 import org.apache.cxf.sts.claims.LdapGroupClaimsHandler;
@@ -131,6 +133,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testRetrieveClaims() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandler");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 String user = props.getProperty("claimUser");
 Assert.assertNotNull(user, "Property 'claimUser' not configured");
@@ -145,7 +149,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 ClaimsParameters params = new ClaimsParameters();
 params.setPrincipal(new CustomTokenPrincipal(user));
 ProcessedClaimCollection retrievedClaims =
-claimsHandler.retrieveClaimValues(requestedClaims, params);
+claimsManager.retrieveClaimValues(requestedClaims, params);
 
 Assert.assertTrue(
   "Retrieved number of claims [" + retrievedClaims.size()
@@ -165,6 +169,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testRetrieveClaimsUsingLDAPLookup() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandler");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 ClaimCollection requestedClaims = createRequestClaimCollection();
 
@@ -176,7 +182,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 ClaimsParameters params = new ClaimsParameters();
 params.setPrincipal(new 
CustomTokenPrincipal("cn=alice,ou=users,dc=example,dc=com"));
 ProcessedClaimCollection retrievedClaims =
-claimsHandler.retrieveClaimValues(requestedClaims, params);
+claimsManager.retrieveClaimValues(requestedClaims, params);
 
 Assert.assertTrue(
   "Retrieved number of claims [" + retrievedClaims.size()
@@ -196,6 +202,8 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 @org.junit.Test
 public void testMultiUserBaseDNs() throws Exception {
 LdapClaimsHandler claimsHandler = 
(LdapClaimsHandler)appContext.getBean("testClaimsHandlerMultipleUserBaseDNs");
+ClaimsManager claimsManager = new ClaimsManager();
+
claimsManager.setClaimHandlers(Collections.singletonList(claimsHandler));
 
 String user = props.getProperty("claimUser");
 Assert.assertNotNull(user, "Property 'claimUser' not configured");
@@ -213,7 +221,7 @@ public class LDAPClaimsTest extends AbstractLdapTestUnit {
 ClaimsParameters params = new ClaimsParamet

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e11f66a3a -> 248576aea


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

Branch: refs/heads/3.0.x-fixes
Commit: 248576aead1c08780c0f1ed967bacb0c64422f5e
Parents: e11f66a
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 10:05:44 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 10:05:44 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/248576ae/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 412f7aa..d58506b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -860,6 +860,7 @@ B 88adfaf2ad97b4968b0dc47194b29c717b138d7a
 B 88cde36520fac1e90af9854d02a40577ba1266b7
 B 88d513e3a47cc52335e9419da00319cf147eb66c
 B 88fe618069a5d4f6fe328a76b3fd3e164c7fc564
+B 8945d914dcf9592c5d30be4a04db30682a0bbd71
 B 894eef1d106f702f19485a8c6b0147d8d2484677
 B 895f9b0ff0b43f775309bfc5d064ca22ec7b2df4
 B 8967ec568c03e6b14a27b63698747135b82f80fc
@@ -1254,6 +1255,7 @@ B c4c969042edcbcd439faa0fc95c1f5130cf06c71
 B c4ce1dd672146fa49f7d6b0aabc563843828fe93
 B c5069325bd0492aba57a7a3fdbc663fa867964c7
 B c5609a479c87ea75e016b61daeafe0021f693332
+B c5a654b65bf0e327ac39935a09c4960a094a83cd
 B c5a787f45fc5b139a318f0e3fb9c23cb6ebb2ff1
 B c5ad99ec8045110063dbec77873782eb5451a6c4
 B c5c21d5b61fbd57e79f0bf39fa56ef9814c417fd
@@ -1395,6 +1397,7 @@ B dd8025a1695ac207e8b28e3cff38bb7df6369361
 B dd9de09aa2dce0610e542ce6b2cf3cad4cd129f0
 B de3464abe2f6e0a9de6532c3831f558907e6a193
 B de5782fcb1ef5a58477bed74d28ded0ac5474ff2
+B de7c92cdec5111942add3be39d841507ad4220fb
 B de88ed19bd937440fa891a852582a2d9ea971e3b
 B de9b7936156d622c284df7f055acac80b920b7d0
 B deea740143ef9b2d85c5dc2139f6918ae10ca548

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a5cd9d3ec -> c5a654b65


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

Branch: refs/heads/3.1.x-fixes
Commit: de7c92cdec5111942add3be39d841507ad4220fb
Parents: 8945d91
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:56:51 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:56:51 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/de7c92cd/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d65475a..eca12af 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -373,6 +373,7 @@ M 45d54d558625236b84752b0d7976f0cf85518c16
 M 4719a033d54fd9fcd173be273e6c320d8353b631
 M 47691ae5c2c6528d95795a51e98e02b54a033c88
 M 4799fef822a96f5d1b2827d5cc42ab886fd4e673
+M 4824bfe59878dd9dbbd2a067e8772b1971897cfc
 M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
 M 4f4ce80ba2de80219e13943cbd6edbf47234

[3/3] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: c5a654b65bf0e327ac39935a09c4960a094a83cd
Parents: de7c92c
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 10:04:11 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 10:04:11 2017 +

--
 .../org/apache/cxf/sts/operation/TokenCancelOperation.java | 6 --
 .../java/org/apache/cxf/sts/operation/TokenRenewOperation.java | 5 -
 .../org/apache/cxf/sts/operation/TokenValidateOperation.java   | 5 -
 3 files changed, 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a654b6/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 974c7b0..1c8b990 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -150,13 +150,7 @@ public class TokenCancelOperation extends 
AbstractOperation implements CancelOpe
 }
 }
 
-<<< HEAD
-
-private RequestSecurityTokenResponseType createResponse(
-===
-
 protected RequestSecurityTokenResponseType createResponse(
->>> 4824bfe... CXF-4692 - Allow customization of Request Security Token 
Response
 TokenRequirements tokenRequirements
 ) throws WSSecurityException {
 RequestSecurityTokenResponseType response = 

http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a654b6/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index 7011e61..a21a1f0 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -199,13 +199,8 @@ public class TokenRenewOperation extends AbstractOperation 
implements RenewOpera
 throw ex;
 }
 }
-<<< HEAD
-   
-private RequestSecurityTokenResponseType createResponse(
-===
 
 protected RequestSecurityTokenResponseType createResponse(
->>> 4824bfe... CXF-4692 - Allow customization of Request Security Token 
Response
 EncryptionProperties encryptionProperties,
 TokenRenewerResponse tokenRenewerResponse, 
 TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a654b6/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index 0d09a73..4976356 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -183,13 +183,8 @@ public class TokenValidateOperation extends 
AbstractOperation implements Validat
 throw ex;
 }
 }
-<<< HEAD
-
-private RequestSecurityTokenResponseType createResponse(
-===
 
 protected RequestSecurityTokenResponseType createResponse(
->>> 4824bfe... CXF-4692 - Allow customization of Request Security Token 
Response
 TokenValidatorResponse tokenResponse,
 TokenProviderResponse tokenProviderResponse,
 TokenRequirements tokenRequirements

[2/3] cxf git commit: CXF-4692 - Allow customization of Request Security Token Response

[coheigea]

CXF-4692 - Allow customization of Request Security Token Response

# Conflicts:
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 8945d914dcf9592c5d30be4a04db30682a0bbd71
Parents: a5cd9d3
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:56:11 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:56:51 2017 +

--
 .../java/org/apache/cxf/sts/operation/TokenCancelOperation.java | 5 +
 .../java/org/apache/cxf/sts/operation/TokenIssueOperation.java  | 2 +-
 .../java/org/apache/cxf/sts/operation/TokenRenewOperation.java  | 5 +
 .../org/apache/cxf/sts/operation/TokenValidateOperation.java| 5 +
 4 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 8db75c3..974c7b0 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -150,8 +150,13 @@ public class TokenCancelOperation extends 
AbstractOperation implements CancelOpe
 }
 }
 
+<<< HEAD
 
 private RequestSecurityTokenResponseType createResponse(
+===
+
+protected RequestSecurityTokenResponseType createResponse(
+>>> 4824bfe... CXF-4692 - Allow customization of Request Security Token 
Response
 TokenRequirements tokenRequirements
 ) throws WSSecurityException {
 RequestSecurityTokenResponseType response = 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index 455a9ae..cffd284 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -253,7 +253,7 @@ public class TokenIssueOperation extends AbstractOperation 
implements IssueOpera
   validateTarget, tokenPrincipal, tokenRoles);
 }
 
-private RequestSecurityTokenResponseType createResponse(
+protected RequestSecurityTokenResponseType createResponse(
 EncryptionProperties encryptionProperties,
 TokenProviderResponse tokenResponse, 
 TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index b73c108..7011e61 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -199,8 +199,13 @@ public class TokenRenewOperation extends AbstractOperation 
implements RenewOpera
 throw ex;
 }
 }
+<<< HEAD

 private RequestSecurityTokenResponseType createResponse(
+===
+
+protected RequestSecurityTokenResponseType createResponse(
+>>> 4824bfe... CXF-4692 - Allow customization of Request Security Token 
Response
 EncryptionProperties encryptionProperties,
 TokenRenewerResponse tokenRenewerResponse, 
 TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/8945d914/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java

cxf git commit: CXF-4692 - Allow customization of Request Security Token Response

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 4f98bea0d -> 4824bfe59


CXF-4692 - Allow customization of Request Security Token Response


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

Branch: refs/heads/master
Commit: 4824bfe59878dd9dbbd2a067e8772b1971897cfc
Parents: 4f98bea
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:56:11 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:56:11 2017 +

--
 .../java/org/apache/cxf/sts/operation/TokenCancelOperation.java| 2 +-
 .../java/org/apache/cxf/sts/operation/TokenIssueOperation.java | 2 +-
 .../java/org/apache/cxf/sts/operation/TokenRenewOperation.java | 2 +-
 .../java/org/apache/cxf/sts/operation/TokenValidateOperation.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4824bfe5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
index 3dea28a..c9ea448 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java
@@ -151,7 +151,7 @@ public class TokenCancelOperation extends AbstractOperation 
implements CancelOpe
 }
 
 
-private RequestSecurityTokenResponseType createResponse(
+protected RequestSecurityTokenResponseType createResponse(
 TokenRequirements tokenRequirements
 ) throws WSSecurityException {
 RequestSecurityTokenResponseType response =

http://git-wip-us.apache.org/repos/asf/cxf/blob/4824bfe5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index d38eecf..5e98bef 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -253,7 +253,7 @@ public class TokenIssueOperation extends AbstractOperation 
implements IssueOpera
   validateTarget, tokenPrincipal, tokenRoles);
 }
 
-private RequestSecurityTokenResponseType createResponse(
+protected RequestSecurityTokenResponseType createResponse(
 EncryptionProperties encryptionProperties,
 TokenProviderResponse tokenResponse,
 TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/4824bfe5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
index 472e94d..4c1e92b 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java
@@ -200,7 +200,7 @@ public class TokenRenewOperation extends AbstractOperation 
implements RenewOpera
 }
 }
 
-private RequestSecurityTokenResponseType createResponse(
+protected RequestSecurityTokenResponseType createResponse(
 EncryptionProperties encryptionProperties,
 TokenRenewerResponse tokenRenewerResponse,
 TokenRequirements tokenRequirements,

http://git-wip-us.apache.org/repos/asf/cxf/blob/4824bfe5/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
index b0b9e19..045772b 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenValidateOperation.java
@@ -184,7 +184,7 @@ public clas

cxf git commit: Minor fix to support UsernameTokenNoPassword

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9a989f58c -> e11f66a3a


Minor fix to support UsernameTokenNoPassword


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

Branch: refs/heads/3.0.x-fixes
Commit: e11f66a3ad434f464adf4f0d78ae140a0b1694f9
Parents: 9a989f5
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:32:32 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:35:53 2017 +

--
 .../java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e11f66a3/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index a6bacf0..be70e18 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -222,6 +222,7 @@ public class WSS4JOutInterceptor extends 
AbstractWSS4JInterceptor {
 for (HandlerAction handlerAction : actions) {
 if ((handlerAction.getAction() == WSConstants.SIGN
 || handlerAction.getAction() == WSConstants.UT
+|| handlerAction.getAction() == 
WSConstants.UT_NOPASSWORD
 || handlerAction.getAction() == WSConstants.UT_SIGN)
 && (handlerAction.getActionToken() == null
 || handlerAction.getActionToken().getUser() == 
null)) {

cxf git commit: Minor fix to support UsernameTokenNoPassword

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 12c921680 -> a5cd9d3ec


Minor fix to support UsernameTokenNoPassword


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

Branch: refs/heads/3.1.x-fixes
Commit: a5cd9d3ece2a35347aa62e6ed3ac13f2bf39bb74
Parents: 12c9216
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:32:32 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:33:50 2017 +

--
 .../java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a5cd9d3e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index c25822e..3ec5fd3 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -218,6 +218,7 @@ public class WSS4JOutInterceptor extends 
AbstractWSS4JInterceptor {
 for (HandlerAction handlerAction : actions) {
 if ((handlerAction.getAction() == WSConstants.SIGN
 || handlerAction.getAction() == WSConstants.UT
+|| handlerAction.getAction() == 
WSConstants.UT_NOPASSWORD
 || handlerAction.getAction() == WSConstants.UT_SIGN)
 && (handlerAction.getActionToken() == null
 || handlerAction.getActionToken().getUser() == 
null)) {

cxf git commit: Minor fix to support UsernameTokenNoPassword

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 753730777 -> 4f98bea0d


Minor fix to support UsernameTokenNoPassword


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

Branch: refs/heads/master
Commit: 4f98bea0dcd6a132a3ef7e8d58eb94b62b482571
Parents: 7537307
Author: Colm O hEigeartaigh 
Authored: Fri Mar 24 09:32:32 2017 +
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 24 09:32:32 2017 +

--
 .../java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4f98bea0/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index c092906..6856e37 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -220,6 +220,7 @@ public class WSS4JOutInterceptor extends 
AbstractWSS4JInterceptor {
 for (HandlerAction handlerAction : actions) {
 if ((handlerAction.getAction() == WSConstants.SIGN
 || handlerAction.getAction() == WSConstants.UT
+|| handlerAction.getAction() == 
WSConstants.UT_NOPASSWORD
 || handlerAction.getAction() == WSConstants.UT_SIGN)
 && (handlerAction.getActionToken() == null
 || handlerAction.getActionToken().getUser() == 
null)) {