[2/3] cxf git commit: [CXF-6894] prevent NPE if request uses anonymous types

[dkulp]

[CXF-6894] prevent NPE if request uses anonymous types


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

Branch: refs/heads/3.0.x-fixes
Commit: 57ccc2b552e0a780f82618ec270bc8d25d7b73ad
Parents: 8783d92
Author: Daniel Kulp 
Authored: Thu Mar 30 16:40:34 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:15:05 2017 -0400

--
 .../jaxws/validator/WrapperStyleNameCollisionValidator.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/57ccc2b5/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index aaecf44..4ddec6b 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -170,9 +170,11 @@ public class WrapperStyleNameCollisionValidator extends 
ServiceValidator {
 String mappedName = mapElementName(operation,

operation.getUnwrappedOperation().getOutput(),
element);
+
+QName mn = names.get(mappedName);
 if (names.containsKey(mappedName)
-&&  !(names.get(mappedName) == 
element.getSchemaTypeName()
-|| 
names.get(mappedName).equals(element.getSchemaTypeName( {
+&&  !(mn == element.getSchemaTypeName()
+|| (mn != null && 
mn.equals(element.getSchemaTypeName() {
 handleErrors(names.get(mappedName), element);
 return false;
 } else {

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

Branch: refs/heads/3.0.x-fixes
Commit: c140c236d453ee3fd73bedfd1bf8974b2a3fb09c
Parents: 57ccc2b
Author: Daniel Kulp 
Authored: Thu Mar 30 18:15:05 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:15:05 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c140c236/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3d7788d..7bbf381 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -566,6 +566,7 @@ B 54723262aa1cc6f33a9b158e92694c454c3904d6
 B 547f8af0519e6fd973e9cf379034fa6940eb7ceb
 B 549a10c78ec602ce19ae965aee504a1d91fd3f93
 B 54ae153226739bbe4d3166291e137e600158373c
+B 551f30a4f26629c8ce7ab3f40a0764a06f4bce56
 B 553be8f2afd1c54158f1fa2eec20c8b8571f8aef
 B 55431b527baa162793a9dd5bc16e4328802fa7b8
 B 557538025eecaf6a46ae03713ac053f3934a244f
@@ -1273,6 +1274,7 @@ B c15592b4a48a14f29c899ac4590273606f7ba0e3
 B c1c9562bb13eeacdd9dae5a46c513e9e03625698
 B c1dd0748cd2af888e3e03c8a6f46b9550b281f64
 B c1f60084b09e4b38e738c32048c638154919fab9
+B c22db8ef5b7fcb5cf2402ac5bdc52a2edffcb5c3
 B c27dc582c203d01fa8f63f500def10f0ae57d1e4
 B c2b70fd462955b714f0211ff52e1f99399666d44
 B c2ecb40c8fcc1010ba74af5d562cdd3bd50df5ad

[1/3] cxf git commit: [CXF-7025] Fix problem detecting boundary with streams that return a single byte at a time

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c8b2403b1 -> c140c236d


[CXF-7025] Fix problem detecting boundary with streams that return a single 
byte at a time

# Conflicts:
#   core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 8783d922b983754b201c8e8eaf43de0dbf772dd4
Parents: c8b2403
Author: Daniel Kulp 
Authored: Thu Mar 30 15:40:41 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:14:59 2017 -0400

--
 .../apache/cxf/attachment/AttachmentDeserializer.java  | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8783d922/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 245bf6a..afc3bc5 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -157,9 +157,16 @@ public class AttachmentDeserializer {
 PushbackInputStream in = new PushbackInputStream(is, 4096);
 byte buf[] = new byte[2048];
 int i = in.read(buf);
-String msg = IOUtils.newStringFromBytes(buf, 0, i);
-in.unread(buf, 0, i);
-
+int len = i;
+while (i > 0 && len < buf.length) {
+i = in.read(buf, len, buf.length - len);
+if (i > 0) {
+len += i;
+}
+}
+String msg = IOUtils.newStringFromBytes(buf, 0, len);
+in.unread(buf, 0, len);
+
 // Reset the input stream since we'll need it again later
 message.setContent(InputStream.class, in);
 

[3/4] cxf git commit: [CXF-6894] prevent NPE if request uses anonymous types

[dkulp]

[CXF-6894] prevent NPE if request uses anonymous types


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

Branch: refs/heads/3.1.x-fixes
Commit: 6f77d2f5480a9c8b7f94f016467d12ea70d754c9
Parents: c22db8e
Author: Daniel Kulp 
Authored: Thu Mar 30 16:40:34 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:14:35 2017 -0400

--
 .../jaxws/validator/WrapperStyleNameCollisionValidator.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6f77d2f5/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index 5d3b700..dfe1a85 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -167,9 +167,11 @@ public class WrapperStyleNameCollisionValidator extends 
ServiceValidator {
 String mappedName = mapElementName(operation,

operation.getUnwrappedOperation().getOutput(),
element);
+
+QName mn = names.get(mappedName);
 if (names.containsKey(mappedName)
-&&  !(names.get(mappedName) == 
element.getSchemaTypeName()
-|| 
names.get(mappedName).equals(element.getSchemaTypeName( {
+&&  !(mn == element.getSchemaTypeName()
+|| (mn != null && 
mn.equals(element.getSchemaTypeName() {
 handleErrors(names.get(mappedName), element);
 return false;
 } else {

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

Branch: refs/heads/3.1.x-fixes
Commit: 551f30a4f26629c8ce7ab3f40a0764a06f4bce56
Parents: 6f77d2f
Author: Daniel Kulp 
Authored: Thu Mar 30 18:14:35 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:14:35 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/551f30a4/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index af6315c..65bcc65 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -382,6 +382,7 @@ M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
 M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
 M 3e30d8892a723adcf04268efd7d407e164607065
+M 408fe3384925122c4e68b7d020de5ff9d1376096
 M 417fb946eec38f403d915e90f405594675a7f7e0
 M 428f7700de80d4d6ea09158f42d057e9f24abe48
 M 437c7daa3345c8482deab4a4da9b164e68fd417a
@@ -503,6 +504,7 @@ M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
 M e70c78ead201362c1a2f0937c23d9c50e3ca9542
 M e92e57c1f14de911cd2315a907443c79e91a94de
+M ea97f3dd62a3a271faf7f363aca618d921c14abb
 M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
 M ed9298066428c0dfc4590a556876d696a4ba13c0
 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160

[1/4] cxf git commit: [CXF-7025] Fix problem detecting boundary with streams that return a single byte at a time

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9ada62abb -> 551f30a4f


[CXF-7025] Fix problem detecting boundary with streams that return a single 
byte at a time

# Conflicts:
#   core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java


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

Branch: refs/heads/3.1.x-fixes
Commit: a61266990ad8b5659bd4cdea41bfd2565c15c2f8
Parents: 9ada62a
Author: Daniel Kulp 
Authored: Thu Mar 30 15:40:41 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:14:29 2017 -0400

--
 .../apache/cxf/attachment/AttachmentDeserializer.java  | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a6126699/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 05a5598..e526bb9 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -157,9 +157,16 @@ public class AttachmentDeserializer {
 PushbackInputStream in = new PushbackInputStream(is, 4096);
 byte buf[] = new byte[2048];
 int i = in.read(buf);
-String msg = IOUtils.newStringFromBytes(buf, 0, i);
-in.unread(buf, 0, i);
-
+int len = i;
+while (i > 0 && len < buf.length) {
+i = in.read(buf, len, buf.length - len);
+if (i > 0) {
+len += i;
+}
+}
+String msg = IOUtils.newStringFromBytes(buf, 0, len);
+in.unread(buf, 0, len);
+
 // Reset the input stream since we'll need it again later
 message.setContent(InputStream.class, in);
 

[2/4] cxf git commit: Fix samples compile failure with latest maven

[dkulp]

Fix samples compile failure with latest maven


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

Branch: refs/heads/3.1.x-fixes
Commit: c22db8ef5b7fcb5cf2402ac5bdc52a2edffcb5c3
Parents: a612669
Author: Daniel Kulp 
Authored: Thu Mar 30 16:12:09 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 18:14:32 2017 -0400

--
 .../src/main/release/samples/js_browser_client_simple/pom.xml| 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c22db8ef/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml 
b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index 4e12008..080ba90 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -128,9 +128,5 @@
 cxf-rt-transports-http-jetty
 3.1.11-SNAPSHOT
 
-
-org.springframework
-spring-context
-
 
 

[2/3] cxf git commit: Fix samples compile failure with latest maven

[dkulp]

Fix samples compile failure with latest maven


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

Branch: refs/heads/master
Commit: 408fe3384925122c4e68b7d020de5ff9d1376096
Parents: ea97f3d
Author: Daniel Kulp 
Authored: Thu Mar 30 16:12:09 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 16:22:55 2017 -0400

--
 distribution/src/main/release/samples/jaxws_spring_boot/pom.xml  | 4 
 .../src/main/release/samples/js_browser_client_simple/pom.xml| 4 
 2 files changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/408fe338/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml 
b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 88feb93..000f336 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -25,10 +25,6 @@
 
 
 
-org.slf4j
-slf4j-jdk14
-
-
 org.apache.cxf
 cxf-spring-boot-starter-jaxws
 ${project.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/408fe338/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml 
b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
index e2c24f1..b6f091b 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
+++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
@@ -128,9 +128,5 @@
 cxf-rt-transports-http-jetty
 3.2.0-SNAPSHOT
 
-
-org.springframework
-spring-context
-
 
 

[3/3] cxf git commit: [CXF-6894] prevent NPE if request uses anonymous types

[dkulp]

[CXF-6894] prevent NPE if request uses anonymous types


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

Branch: refs/heads/master
Commit: 6fd76780cc60f477ca0ccbad2b2298051657ef2c
Parents: 408fe33
Author: Daniel Kulp 
Authored: Thu Mar 30 16:40:34 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 16:40:34 2017 -0400

--
 .../jaxws/validator/WrapperStyleNameCollisionValidator.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6fd76780/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index 40e4fe0..b23b48c 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -167,9 +167,11 @@ public class WrapperStyleNameCollisionValidator extends 
ServiceValidator {
 String mappedName = mapElementName(operation,

operation.getUnwrappedOperation().getOutput(),
element);
+
+QName mn = names.get(mappedName);
 if (names.containsKey(mappedName)
-&&  !(names.get(mappedName) == 
element.getSchemaTypeName()
-|| 
names.get(mappedName).equals(element.getSchemaTypeName( {
+&&  !(mn == element.getSchemaTypeName()
+|| (mn != null && 
mn.equals(element.getSchemaTypeName() {
 handleErrors(names.get(mappedName), element);
 return false;
 } else {

[1/3] cxf git commit: [CXF-7025] Fix problem detecting boundary with streams that return a single byte at a time

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 28a092319 -> 6fd76780c


[CXF-7025] Fix problem detecting boundary with streams that return a single 
byte at a time


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

Branch: refs/heads/master
Commit: ea97f3dd62a3a271faf7f363aca618d921c14abb
Parents: 28a0923
Author: Daniel Kulp 
Authored: Thu Mar 30 15:40:41 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 15:40:41 2017 -0400

--
 .../apache/cxf/attachment/AttachmentDeserializer.java| 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ea97f3dd/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 3a82dc5..9b40a8a 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -157,8 +157,15 @@ public class AttachmentDeserializer {
 PushbackInputStream in = new PushbackInputStream(is, 4096);
 byte buf[] = new byte[2048];
 int i = in.read(buf);
-String msg = IOUtils.newStringFromBytes(buf, 0, i);
-in.unread(buf, 0, i);
+int len = i;
+while (i > 0 && len < buf.length) {
+i = in.read(buf, len, buf.length - len);
+if (i > 0) {
+len += i;
+}
+}
+String msg = IOUtils.newStringFromBytes(buf, 0, len);
+in.unread(buf, 0, len);
 
 // Reset the input stream since we'll need it again later
 message.setContent(InputStream.class, in);

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

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 64786b8ec -> c8b2403b1


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

Branch: refs/heads/3.0.x-fixes
Commit: c8b2403b1e52a36a28c18a2d3d18eaf430711b70
Parents: 14a3b55
Author: Daniel Kulp 
Authored: Thu Mar 30 14:48:06 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 14:48:06 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c8b2403b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6cbc989..3d7788d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -201,6 +201,7 @@ B 1f824d8039c7a42a4aa46f844e6c800e1143c7e7
 B 2004b1021ce0d0975eb49cae36416863bd8c59bb
 B 20071b418009bed2e1af6b9aec067dc4aab71fcc
 B 20076a8c3ee335121dcb580640d8d98f5f48a6d7
+B 200b2b004b28dd69b7e20bc775e5ec4edb285b42
 B 20467ecea3cb0778bd02e60029d4d4ec7a8a2483
 B 204fac343576d897ae5fda233395426e31266d64
 B 20539c0278472689722204f0c08e68a86597aae1

[2/2] cxf git commit: [CXF-6717] Fix problem with schemaLocation not getting properly updated to resolvable schema

[dkulp]

[CXF-6717] Fix problem with schemaLocation not getting properly updated to 
resolvable schema


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

Branch: refs/heads/3.0.x-fixes
Commit: 14a3b5561ce21873755480190d918b8d8cfc7506
Parents: 64786b8
Author: Daniel Kulp 
Authored: Thu Mar 30 14:46:38 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 14:48:06 2017 -0400

--
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 44 +---
 1 file changed, 39 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/14a3b556/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 3202bab..d264c15 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -164,7 +164,8 @@ public class WSDLGetUtils {
 return doc;
 }
 
-protected String mapUri(Bus bus, String base, Map 
smp, String loc, String xsd)
+protected String mapUri(Bus bus, String base, Map 
smp, 
+String loc, String xsd, String resolvedXsd)
 throws UnsupportedEncodingException {
 String key = loc;
 try {
@@ -173,7 +174,8 @@ public class WSDLGetUtils {
 // resolve requested location with relative import path
 key = new URI(xsd).resolve(loc).toString();
 
-if (!smp.containsKey(URLDecoder.decode(key, "utf-8"))) {
+SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
 if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
@@ -188,6 +190,34 @@ public class WSDLGetUtils {
//ignore
 }
 SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null && resolvedXsd != null) {
+try {
+String key2 = new URI(resolvedXsd).resolve(loc).toString();
+SchemaReference ref2 = smp.get(URLDecoder.decode(key2, 
"utf-8"));
+if (ref2 == null) {
+// if the result is not known, check if we can resolve it 
into something known
+String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key2, base);
+if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
+// if it is resolvable, we can use it
+ref = smp.get(URLDecoder.decode(resolved, "utf-8"));
+}
+} else {
+ref = smp.get(URLDecoder.decode(key2, "utf-8"));
+}
+} catch (URISyntaxException e) {
+//ignore, ref can remain null
+}
+if (ref != null) {
+// we are able to map this, but for some reason the default 
key passed in cannot
+// be used for a direct lookup, we need to create a unique 
import key
+int count = 1;
+while (smp.containsKey("_import" + count + ".xsd")) {
+count++;
+}
+key = "_import" + count + ".xsd";
+smp.put(key, ref);
+}
+}
 if (ref != null) {
 return base + "?xsd=" + key.replace(" ", "%20");
 }
@@ -219,7 +249,7 @@ public class WSDLGetUtils {
   
"http://www.w3.org/2001/XMLSchema;, "import");
 for (Element el : elementList) {
 String sl = el.getAttribute("schemaLocation");
-sl = mapUri(bus, base, smp, sl, xsdWsdlPar);
+sl = mapUri(bus, base, smp, sl, xsdWsdlPar, 
doc.getDocumentURI());
 if (sl != null) {
 el.setAttribute("schemaLocation", sl);
 }
@@ -230,7 +260,7 @@ public class WSDLGetUtils {
   "include");
 for (Element el : elementList) {
   

cxf git commit: [CXF-6717] Fix problem with schemaLocation not getting properly updated to resolvable schema

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 200b2b004 -> 9ada62abb


[CXF-6717] Fix problem with schemaLocation not getting properly updated to 
resolvable schema


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

Branch: refs/heads/3.1.x-fixes
Commit: 9ada62abbe91e4432ed608286c20c84127516f62
Parents: 200b2b0
Author: Daniel Kulp 
Authored: Thu Mar 30 14:46:38 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 14:47:51 2017 -0400

--
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 44 +---
 1 file changed, 39 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9ada62ab/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index c7ffc71..fe1fa5b 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -163,7 +163,8 @@ public class WSDLGetUtils {
 return doc;
 }
 
-protected String mapUri(Bus bus, String base, Map 
smp, String loc, String xsd)
+protected String mapUri(Bus bus, String base, Map 
smp, 
+String loc, String xsd, String resolvedXsd)
 throws UnsupportedEncodingException {
 String key = loc;
 try {
@@ -172,7 +173,8 @@ public class WSDLGetUtils {
 // resolve requested location with relative import path
 key = new URI(xsd).resolve(loc).toString();
 
-if (!smp.containsKey(URLDecoder.decode(key, "utf-8"))) {
+SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
 if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
@@ -187,6 +189,34 @@ public class WSDLGetUtils {
//ignore
 }
 SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null && resolvedXsd != null) {
+try {
+String key2 = new URI(resolvedXsd).resolve(loc).toString();
+SchemaReference ref2 = smp.get(URLDecoder.decode(key2, 
"utf-8"));
+if (ref2 == null) {
+// if the result is not known, check if we can resolve it 
into something known
+String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key2, base);
+if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
+// if it is resolvable, we can use it
+ref = smp.get(URLDecoder.decode(resolved, "utf-8"));
+}
+} else {
+ref = smp.get(URLDecoder.decode(key2, "utf-8"));
+}
+} catch (URISyntaxException e) {
+//ignore, ref can remain null
+}
+if (ref != null) {
+// we are able to map this, but for some reason the default 
key passed in cannot
+// be used for a direct lookup, we need to create a unique 
import key
+int count = 1;
+while (smp.containsKey("_import" + count + ".xsd")) {
+count++;
+}
+key = "_import" + count + ".xsd";
+smp.put(key, ref);
+}
+}
 if (ref != null) {
 return base + "?xsd=" + key.replace(" ", "%20");
 }
@@ -218,7 +248,7 @@ public class WSDLGetUtils {
   
"http://www.w3.org/2001/XMLSchema;, "import");
 for (Element el : elementList) {
 String sl = el.getAttribute("schemaLocation");
-sl = mapUri(bus, base, smp, sl, xsdWsdlPar);
+sl = mapUri(bus, base, smp, sl, xsdWsdlPar, 
doc.getDocumentURI());
 if (sl != null) {
 el.setAttribute("schemaLocation", sl);
 }
@@ -229,7 +259,7 @@ public class WSDLGetUtils {

cxf git commit: [CXF-6717] Fix problem with schemaLocation not getting properly updated to resolvable schema

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 1cf17867a -> 28a092319


[CXF-6717] Fix problem with schemaLocation not getting properly updated to 
resolvable schema


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

Branch: refs/heads/master
Commit: 28a092319a9223d93bcbd94abd3e9c0a8a54ac09
Parents: 1cf1786
Author: Daniel Kulp 
Authored: Thu Mar 30 14:46:38 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 14:46:38 2017 -0400

--
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 44 +---
 1 file changed, 39 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/28a09231/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index bf0ee17..ff1b254 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -163,7 +163,8 @@ public class WSDLGetUtils {
 return doc;
 }
 
-protected String mapUri(Bus bus, String base, Map 
smp, String loc, String xsd)
+protected String mapUri(Bus bus, String base, Map 
smp, 
+String loc, String xsd, String resolvedXsd)
 throws UnsupportedEncodingException {
 String key = loc;
 try {
@@ -172,7 +173,8 @@ public class WSDLGetUtils {
 // resolve requested location with relative import path
 key = new URI(xsd).resolve(loc).toString();
 
-if (!smp.containsKey(URLDecoder.decode(key, "utf-8"))) {
+SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
 if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
@@ -187,6 +189,34 @@ public class WSDLGetUtils {
//ignore
 }
 SchemaReference ref = smp.get(URLDecoder.decode(key, "utf-8"));
+if (ref == null && resolvedXsd != null) {
+try {
+String key2 = new URI(resolvedXsd).resolve(loc).toString();
+SchemaReference ref2 = smp.get(URLDecoder.decode(key2, 
"utf-8"));
+if (ref2 == null) {
+// if the result is not known, check if we can resolve it 
into something known
+String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key2, base);
+if (resolved != null  && 
smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
+// if it is resolvable, we can use it
+ref = smp.get(URLDecoder.decode(resolved, "utf-8"));
+}
+} else {
+ref = smp.get(URLDecoder.decode(key2, "utf-8"));
+}
+} catch (URISyntaxException e) {
+//ignore, ref can remain null
+}
+if (ref != null) {
+// we are able to map this, but for some reason the default 
key passed in cannot
+// be used for a direct lookup, we need to create a unique 
import key
+int count = 1;
+while (smp.containsKey("_import" + count + ".xsd")) {
+count++;
+}
+key = "_import" + count + ".xsd";
+smp.put(key, ref);
+}
+}
 if (ref != null) {
 return base + "?xsd=" + key.replace(" ", "%20");
 }
@@ -218,7 +248,7 @@ public class WSDLGetUtils {
   
"http://www.w3.org/2001/XMLSchema;, "import");
 for (Element el : elementList) {
 String sl = el.getAttribute("schemaLocation");
-sl = mapUri(bus, base, smp, sl, xsdWsdlPar);
+sl = mapUri(bus, base, smp, sl, xsdWsdlPar, 
doc.getDocumentURI());
 if (sl != null) {
 el.setAttribute("schemaLocation", sl);
 }
@@ -229,7 +259,7 @@ public class WSDLGetUtils {
  

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6110435d7 -> 200b2b004


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

Branch: refs/heads/3.1.x-fixes
Commit: 200b2b004b28dd69b7e20bc775e5ec4edb285b42
Parents: 6110435
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 17:55:02 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 17:55:02 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/200b2b00/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2cb678a..af6315c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -41,6 +41,7 @@ B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
 B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
 B 1b8064f475b09323c5c11d9e8a4e1440879cae26
 B 1c3085ea94a902e6bf4a49b50c121e778efd28c2
+B 1cf17867a2e8a30ad061a038895e0b801331d028
 B 1d2f3999073b8d46ebe3e1e9f7a532d4b07434b4
 B 1d2ff721ef4d63b86035238516afdf1a82855bd9
 B 1d4c40d0f87ccaa09b22d0b0da2db2801f69a00b

cxf git commit: Using spring-hazelcast to configure explicit ports for the Hazelcast instances + avoid multicast

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master aa0de494b -> 1cf17867a


Using spring-hazelcast to configure explicit ports for the Hazelcast instances 
+ avoid multicast


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

Branch: refs/heads/master
Commit: 1cf17867a2e8a30ad061a038895e0b801331d028
Parents: aa0de49
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 17:48:38 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 17:50:18 2017 +0100

--
 services/sts/systests/advanced/pom.xml |  5 +
 .../DistributedCachingTest.java|  2 ++
 .../systest/sts/distributed_caching/cxf-sts-1.xml  | 17 -
 .../systest/sts/distributed_caching/cxf-sts-2.xml  | 17 -
 4 files changed, 39 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1cf17867/services/sts/systests/advanced/pom.xml
--
diff --git a/services/sts/systests/advanced/pom.xml 
b/services/sts/systests/advanced/pom.xml
index 0cade9f..e2bb566 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -133,6 +133,11 @@
 hazelcast
 ${cxf.hazelcast.version}
 
+
+com.hazelcast
+hazelcast-spring
+${cxf.hazelcast.version}
+
 
 
 ${basedir}/src/test/java

http://git-wip-us.apache.org/repos/asf/cxf/blob/1cf17867/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
--
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
index f26e98c..d76ae46 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
@@ -43,6 +43,8 @@ public class DistributedCachingTest extends 
AbstractBusClientServerTestBase {
 
 static final String STSPORT = allocatePort(STSServer.class);
 static final String STSPORT2 = allocatePort(STSServer.class, 2);
+static final String HZ_CAST_PORT1 = allocatePort(STSServer.class, 3);
+static final String HZ_CAST_PORT2 = allocatePort(STSServer.class, 4);
 
 private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt;;
 private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");

http://git-wip-us.apache.org/repos/asf/cxf/blob/1cf17867/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
index 8907141..55b5b8d 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
@@ -17,7 +17,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-http://www.springframework.org/schema/beans; 
xmlns:cxf="http://cxf.apache.org/core; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:sec="http://cxf.apache.org/configuration/security; 
xmlns:http="http://cxf.apache.org/transports/http/configuration; 
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration; 
xmlns:jaxws="http://cxf.apache.org/jaxws; 
xmlns:util="http://www.springframework.org/schema/util; xsi:schemaLocation="
 http://cxf.apache.org/core 
http://cxf.apache.org/schemas/core.xsd 
http://cxf.apache.org/configuration/security 
http://cxf.apache.org/schemas/configuration/security.xsd 
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd 
http://cxf.apache.org/transports/http/configuration 
http://cxf.apache.org/schemas/configuration/http-conf.xsd 
http://cxf.apache.org/transports/http-jetty/configuration

[1/3] cxf git commit: CXF-7305: replaced prerequisites as this is only intended for maven-plugin projects but not for non maven-plugin projects. see also MNG-6092 This closes #250

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c83919aa2 -> 64786b8ec


CXF-7305: replaced prerequisites as this is only intended for maven-plugin 
projects but not for non maven-plugin projects. see also MNG-6092
This closes #250

# Conflicts:
#   pom.xml

# Conflicts:
#   pom.xml


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

Branch: refs/heads/3.0.x-fixes
Commit: 8ac5ba54e3c4829a09f2918a043f6cb1f4b138f7
Parents: c83919a
Author: Dennis Kieselhorst 
Authored: Thu Mar 30 09:18:14 2017 +0200
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:04:42 2017 -0400

--
 pom.xml | 60 +---
 1 file changed, 57 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8ac5ba54/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 10f825f..b365e1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
 jira
 https://issues.apache.org/jira/browse/CXF
 
-
-3.0
-
 
 false
 3.0.0
@@ -640,8 +637,65 @@
 
 
 
+
+
+org.eclipse.m2e
+lifecycle-mapping
+1.0.0
+
+
+
+
+
+
+org.apache.maven.plugins
+
+
+maven-plugin-plugin
+
+
+[3.4,)
+
+
+descriptor
+
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
 
 
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+enforce-versions
+
+enforce
+
+
+
+
+3.1
+
+
+
+
+
+
+
 
 
 

[2/3] cxf git commit: Allow netbeans to recognize files generated by cxf-xjc-plugin This closes #138

[dkulp]

Allow netbeans to recognize files generated by cxf-xjc-plugin
This closes #138


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

Branch: refs/heads/3.0.x-fixes
Commit: 9def9748e24ee821bfa7da9c7ccf8777ed2ab08c
Parents: 8ac5ba5
Author: Ciprian Ciubotariu 
Authored: Tue May 24 23:46:20 2016 +0300
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:04:52 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/9def9748/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 9a204cc..e4ebb2e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -258,7 +258,7 @@
 
org.apache.cxf.xjcplugins:cxf-xjc-javadoc:${cxf.xjc-utils.version}
 
org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}
 
-
${basedir}/target/generated/src/main/java
+
${basedir}/target/generated-sources/cxf-xjc-plugin
 
 
 
${basedir}/src/main/resources/schemas/wsdl/http.xsd

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

Branch: refs/heads/3.0.x-fixes
Commit: 64786b8ec22491568d363498a9065654350e1de4
Parents: 9def974
Author: Daniel Kulp 
Authored: Thu Mar 30 12:04:52 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:04:52 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/64786b8e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 149c56e..6cbc989 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -65,6 +65,7 @@ B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63
 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589
 B 0ba04d859c6df8b9d31163e7c65aa1addbb2
 B 0ba19453f17be19aa2e46848b1908f776a6abb64
+B 0bc42f47f79f2e301a6c8fe0c92acd945e43273b
 B 0bcc77743fad212fb54d119db3719858addcbabc
 B 0befccd8a70d7896d9210f554e19375e5d8cc168
 B 0c0555f4ac850ec8e38302d73207170affe4376a
@@ -643,6 +644,7 @@ B 609fcadef1b418c05f3cf9d29dac87f458281156
 B 60cf6aa4f8a6323130133c4271691edd6f39d0b1
 B 60f95e5c0d928fd0b518bac1b89e20b9a12e09b3
 B 610057e6f2bdc7491e2e2266ec7ac41513fcd5f0
+B 6110435d74e8f268edf1516a667ab2deefcd0345
 B 6168d90fab71f2a8811640bfbbf88bfd1eed1848
 B 6187ae4e155acad436ae2ef53e5cc606c64c703f
 B 6192919b2afd6039f09fece7bc80d252c398c97e
@@ -1457,6 +1459,7 @@ B e1d841c6ba4b0cad5b90a584cb3eefac3f0cb9a9
 B e1e3b2c7ab2f808fdd7849ba7f3622e945296d02
 B e1f392af26cd466970665cd822538751787b365f
 B e231ad5e62e91eaf02a46587de9a683c1809a71f
+B e24153bd656e056a11fabe84569466df1663c8b6
 B e242307ad8bbe53788f3e03e9e2f0ca977d01340
 B e27ccedf71d44ca5b20296e8401eef302311ebff
 B e28d258049dc8501f6d2bc4d33ef21914d5a38bb
@@ -1640,6 +1643,7 @@ B fe9f455840f085568637f3c0e4af413299a85eb1
 B feaececcc19cf13b42d2c20d8f8a6e5c465cda93
 B fec88085f5f97eb5b6b0bb3d5ceee7af1509876a
 B fecf633ce099ed1cfe3bc32fe39c239d6903a550
+B fedfefea62fb5d852e2310f7ca6594a7e6e3b41a
 B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b
 B ff693a62de7674464fe28265c48ca07dcdb64026
 B ff742436a3e177dc61106edf08f2509e727362dd
@@ -1713,6 +1717,7 @@ M 2ccfaa3811525f21cab7dac3a900b91932395197
 M 2cfcbbc2ce20118e06ca3ef11f08f6f106181055
 M 2d3ac551c8614516cbbf288195d2a99cadb79659
 M 2e701bcd1cabcc7ae4cb69346eacb8ab278e2827
+M 2f22341b6d3372bd0f98e3894db917d55eef7e06
 M 2fc62cf0f53912b53a93409802f43418d067faf1
 M 318cfdaeb15b8d230829d120f894bec6f15bc836
 M 3228637a5070a25f625fb18fc21a7dd54ce16dfd
@@ -1958,6 +1963,7 @@ M c55664128b1223667dedacc2011ccd5945d9c8b9
 M c5dbb84ac4e5bf73555e85ae1e65a5065393c602
 M c66b1a18100ac752e8a2fff712c01e6c682ffcd7
 M c72cac8cbd73d92a9e0264c816176c2a33dcbcf2
+M c89b56c22cb1f5bbb442abdcce13aef6c4c8fcaf
 M ca0a435219e82734269f2c8330f0989576f019d2
 M cc2a8d6e58dc2030f21633395fa0476e562393b1
 M cda58270486b4d394b98a1a1a1d5bfcb366af2c1

[2/4] cxf git commit: change evt cast type IdleStateHandler triggered IdleStateEvent, not IdleState This closes #252

[dkulp]

change evt cast type
IdleStateHandler triggered IdleStateEvent, not IdleState
This closes #252


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

Branch: refs/heads/3.1.x-fixes
Commit: fedfefea62fb5d852e2310f7ca6594a7e6e3b41a
Parents: 2f22341
Author: msamoylych 
Authored: Thu Mar 30 16:16:28 2017 +0300
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:02:55 2017 -0400

--
 .../http/netty/server/NettyHttpServletHandler.java  | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fedfefea/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
--
diff --git 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
index 3c241be..33422f5 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
+++ 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
@@ -50,6 +50,7 @@ import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.util.CharsetUtil;
 
 public class NettyHttpServletHandler extends ChannelInboundHandlerAdapter {
@@ -87,10 +88,10 @@ public class NettyHttpServletHandler extends 
ChannelInboundHandlerAdapter {

 @Override
 public void userEventTriggered(ChannelHandlerContext ctx, Object evt) 
throws Exception {
-if (evt instanceof IdleState) {
-IdleState e = (IdleState) evt;
-if (e == IdleState.READER_IDLE || e == IdleState.WRITER_IDLE) {
-LOG.log(Level.FINE, "Closing idle channel: {}", e);
+if (evt instanceof IdleStateEvent) {
+IdleStateEvent e = (IdleStateEvent) evt;
+if (e.state() == IdleState.READER_IDLE || e.state() == 
IdleState.WRITER_IDLE) {
+LOG.log(Level.FINE, "Closing idle channel: {}", e.state());
 ctx.close();
 } 
 }

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

Branch: refs/heads/3.1.x-fixes
Commit: 6110435d74e8f268edf1516a667ab2deefcd0345
Parents: c5f42a1
Author: Daniel Kulp 
Authored: Thu Mar 30 12:03:00 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:03:00 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6110435d/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0d0fdfa..2cb678a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -31,6 +31,7 @@ B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808
 B 137485de37b3bf81e305e616a5af81741620f547
 B 140ad80be96ea11d360cd7a1d8e791ca91a2220d
 B 1552f881183ba35b3706dc3c8061d7c6d85c7238
+B 16672c10cf0a7bcfeeb946fd352e50fb72bda991
 B 16931d7ae0cbb38e987923bf604cd403c1caee7f
 B 180d0fcc5e0d061f339e1a3cb32ec53a3ab32b97
 B 183a2a4022b912a6c32c1d3e268982b2f78f7631
@@ -180,6 +181,7 @@ B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
 B 9063184ba1280e6d2492ec47d6ebfbb7a19c25ab
 B 90a74fc75af41898ee50359c13f298eb483a3d01
 B 91ef0687ed14842dc9efd5a09a59164b5328649a
+B 9263c72e29ce5169af9f9393bc1e391f0e8d2f64
 B 9323b68565ef79717e9d3e60744dd1bf63c1a5d8
 B 938217b05928747f7ef0d2a8899cbc297926a4e6
 B 94b837228a1d9c706aa235bfe23b827eb04da63c
@@ -494,6 +496,7 @@ M db1e5146e6312a4be35b0ca2644a691cb1d41a0f
 M dba09f00804cc05d943fd95d34882d6368c28edb
 M ded06c40ba057981e003903faa93beb94cbe11fa
 M df3854cefae5d2da71f8d222a86218e81df7bd05
+M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53
 M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
 M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
@@ -512,4 +515,6 @@ M fa973bd7ab43099151f83beea351b80c7140eaab
 M fade9b81dabe27f864ca38e7b40f28fb44d6f165
 M faf461150f178f7f7ae89a3b7c345671e53b8b04
 M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
+M fe55813cc934667664863117921ff8ea08b9ff24
 M fe89bf0fb8379428667f66312e6942e906142d6f
+M ff9e62a46c4491d6c5fc8d07b2813fa0224e61c3

[3/4] cxf git commit: Allow netbeans to recognize files generated by cxf-xjc-plugin This closes #138

[dkulp]

Allow netbeans to recognize files generated by cxf-xjc-plugin
This closes #138


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

Branch: refs/heads/3.1.x-fixes
Commit: c5f42a1df5ed4663c2ad8351327db3885ae3335b
Parents: fedfefe
Author: Ciprian Ciubotariu 
Authored: Tue May 24 23:46:20 2016 +0300
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:03:00 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c5f42a1d/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 5e1d49e..91d07d6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -277,7 +277,7 @@
 
org.apache.cxf.xjcplugins:cxf-xjc-javadoc:${cxf.xjc-utils.version}
 
org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}
 
-
${basedir}/target/generated/src/main/java
+
${basedir}/target/generated-sources/cxf-xjc-plugin
 
 
 
${basedir}/src/main/resources/schemas/wsdl/http.xsd

[1/4] cxf git commit: CXF-7305: replaced prerequisites as this is only intended for maven-plugin projects but not for non maven-plugin projects. see also MNG-6092 This closes #250

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c89b56c22 -> 6110435d7


CXF-7305: replaced prerequisites as this is only intended for maven-plugin 
projects but not for non maven-plugin projects. see also MNG-6092
This closes #250

# Conflicts:
#   pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f22341b6d3372bd0f98e3894db917d55eef7e06
Parents: c89b56c
Author: Dennis Kieselhorst 
Authored: Thu Mar 30 09:18:14 2017 +0200
Committer: Daniel Kulp 
Committed: Thu Mar 30 12:02:48 2017 -0400

--
 pom.xml | 29 ++---
 1 file changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f22341b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index db7824e..5778e0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
 jira
 https://issues.apache.org/jira/browse/CXF
 
-
-3.0
-
 
 false
 3.2.1
@@ -650,8 +647,34 @@
 
 
 
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
 
 
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+enforce-versions
+
+enforce
+
+
+
+
+3.1
+
+
+
+
+
+
+
 
 
 

[2/4] cxf git commit: change evt cast type IdleStateHandler triggered IdleStateEvent, not IdleState This closes #252

[dkulp]

change evt cast type
IdleStateHandler triggered IdleStateEvent, not IdleState
This closes #252


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

Branch: refs/heads/master
Commit: b5787370fd49148f8655df5be76c103a98bf5638
Parents: ff9e62a
Author: msamoylych 
Authored: Thu Mar 30 16:16:28 2017 +0300
Committer: Daniel Kulp 
Committed: Thu Mar 30 09:33:56 2017 -0400

--
 .../http/netty/server/NettyHttpServletHandler.java  | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b5787370/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
--
diff --git 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
index 9d55b5c..88fad7e 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
+++ 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
@@ -50,6 +50,7 @@ import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.util.CharsetUtil;
 
 public class NettyHttpServletHandler extends ChannelInboundHandlerAdapter {
@@ -87,10 +88,10 @@ public class NettyHttpServletHandler extends 
ChannelInboundHandlerAdapter {
 
 @Override
 public void userEventTriggered(ChannelHandlerContext ctx, Object evt) 
throws Exception {
-if (evt instanceof IdleState) {
-IdleState e = (IdleState) evt;
-if (e == IdleState.READER_IDLE || e == IdleState.WRITER_IDLE) {
-LOG.log(Level.FINE, "Closing idle channel: {}", e);
+if (evt instanceof IdleStateEvent) {
+IdleStateEvent e = (IdleStateEvent) evt;
+if (e.state() == IdleState.READER_IDLE || e.state() == 
IdleState.WRITER_IDLE) {
+LOG.log(Level.FINE, "Closing idle channel: {}", e.state());
 ctx.close();
 }
 }

[1/4] cxf git commit: CXF-7305: replaced prerequisites as this is only intended for maven-plugin projects but not for non maven-plugin projects. see also MNG-6092 This closes #250

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master fe55813cc -> aa0de494b


CXF-7305: replaced prerequisites as this is only intended for maven-plugin 
projects but not for non maven-plugin projects. see also MNG-6092
This closes #250


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

Branch: refs/heads/master
Commit: ff9e62a46c4491d6c5fc8d07b2813fa0224e61c3
Parents: fe55813
Author: Dennis Kieselhorst 
Authored: Thu Mar 30 09:18:14 2017 +0200
Committer: Daniel Kulp 
Committed: Thu Mar 30 09:33:49 2017 -0400

--
 pom.xml | 29 ++---
 1 file changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ff9e62a4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 63218c9..0bb74d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
 jira
 https://issues.apache.org/jira/browse/CXF
 
-
-3.1
-
 
 false
 3.2.2-SNAPSHOT
@@ -651,8 +648,34 @@
 
 
 
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
 
 
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+enforce-versions
+
+enforce
+
+
+
+
+3.1
+
+
+
+
+
+
+
 
 
 

[3/4] cxf git commit: [CXF-7186][CXF-7188] Aegis DataBinding ignores certain JAXB annotations Patch from SanjinTulac applied (only to 3.2 branch due to behavior change) This closes #216

[dkulp]

[CXF-7186][CXF-7188] Aegis DataBinding ignores certain JAXB annotations
Patch from SanjinTulac applied (only to 3.2 branch due to behavior change)
This closes #216


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

Branch: refs/heads/master
Commit: 9263c72e29ce5169af9f9393bc1e391f0e8d2f64
Parents: b578737
Author: Daniel Kulp 
Authored: Thu Mar 30 09:56:15 2017 -0400
Committer: Daniel Kulp 
Committed: Thu Mar 30 10:27:13 2017 -0400

--
 .../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 44 +++-
 .../cxf/aegis/type/java5/AnnotationReader.java  | 19 -
 .../apache/cxf/aegis/type/java5/EnumType.java   | 37 +---
 .../cxf/aegis/type/java5/EnumTypeTest.java  | 33 +++
 .../apache/cxf/aegis/type/java5/JaxbBean1.java  | 10 +
 .../cxf/aegis/type/java5/JaxbTestEnum.java  |  7 +++-
 .../cxf/aegis/type/java5/JaxbTypeTest.java  | 28 -
 7 files changed, 165 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9263c72e/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
--
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
index 0a4532f..a978bee 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
@@ -19,6 +19,7 @@
 package org.apache.cxf.aegis.type.java5;
 
 import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import javax.xml.namespace.QName;
@@ -93,14 +94,46 @@ public class AnnotatedTypeInfo extends BeanTypeInfo {
 }
 
 protected QName createQName(PropertyDescriptor desc) {
+String name = getName(desc);
+String namespace = getNamespace(desc);
+return new QName(namespace, name);
+}
+
+/**
+ * XML Name of a field is derived from the following sources in this order 
of priorities:
+ * 
+ *getter method annotation
+ *field annotation
+ *field name
+ * 
+ */
+private String getName(PropertyDescriptor desc) {
 String name = annotationReader.getName(desc.getReadMethod());
 if (name == null) {
+name = annotationReader.getName(getField(desc));
+}
+if (name == null) {
 name = desc.getName();
 }
+return name;
+}
 
-// namespace: method, class, package, generated
+/**
+ * XML Namespace of a field is derived from the following sources in this 
order of priorities:
+ * 
+ *   getter method annotation
+ *   field annotation
+ *   class annotation
+ *   package annotation
+ *   fully qualified package name
+ * 
+ */
+private String getNamespace(PropertyDescriptor desc) {
 String namespace = annotationReader.getNamespace(desc.getReadMethod());
 if (namespace == null) {
+namespace = annotationReader.getNamespace(getField(desc));
+}
+if (namespace == null) {
 namespace = annotationReader.getNamespace(getTypeClass());
 }
 if (namespace == null) {
@@ -109,8 +142,15 @@ public class AnnotatedTypeInfo extends BeanTypeInfo {
 if (namespace == null) {
 namespace = 
NamespaceHelper.makeNamespaceFromClassName(getTypeClass().getName(), "http");
 }
+return namespace;
+}
 
-return new QName(namespace, name);
+private Field getField(PropertyDescriptor desc) {
+try {
+return getTypeClass().getDeclaredField(desc.getName());
+} catch (NoSuchFieldException e) {
+return null;
+}
 }
 
 public boolean isNillable(QName name) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/9263c72e/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
--
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index d4fcb5a..33f1b4f 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ 

svn commit: r1009381 - in /websites/production/cxf/content: cache/docs.pageCache docs/failoverfeature.html

[buildbot]

Author: buildbot
Date: Thu Mar 30 13:47:38 2017
New Revision: 1009381

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/failoverfeature.html

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

Modified: websites/production/cxf/content/docs/failoverfeature.html
==
--- websites/production/cxf/content/docs/failoverfeature.html (original)
+++ websites/production/cxf/content/docs/failoverfeature.html Thu Mar 30 
13:47:38 2017
@@ -117,11 +117,11 @@ Apache CXF -- FailoverFeature


 Failover and Load 
Distributor Feature/**/
+/*]]>*/
 Failover and Load 
Distributor FeatureFailoverCircuit Breakers 
FailoverLoad DistributionConfiguring 
JAX-RS clients
 FailoverThe CXF Failover 
feature allows to configure CXF frontend clients to retry a call when the 
target endpoint becomes unavailable. A number of retry 
strategies available: a client can iterate sequentially over the alternative 
addresses or chose them randomly.  Every strategy can be 
configured to do a delay between selecting the addresses.
 beans 
xmlns="http://www.springframework.org/schema/beans;
@@ -155,7 +155,7 @@ http://www.springframework.org/schema/ut
 /property
 /bean
 
-!-- other jaxws:client attributes and elements are omitted for brewity 
--
+!-- other jaxws:client attributes and elements are omitted for brevity 
--
 
 jaxws:client id="clientWithSeqFailoverSupport" 
address="http://localhost:8080/services";
jaxws:features
@@ -167,7 +167,7 @@ http://www.springframework.org/schema/ut
/jaxws:features
 /jaxws:client
 
-!-- other jaxws:client attributes and elements are omitted for brewity 
--
+!-- other jaxws:client attributes and elements are omitted for brevity 
--
 
 jaxws:client id="clientWithRandomFailoverSupport" 
address="http://localhost:8080/initialAddress";
jaxws:features
@@ -213,19 +213,19 @@ http://www.springframework.org/schema/ut
 /property
 /bean
 
-!-- other jaxws:client attributes and elements are omitted for brewity 
--
+!-- other jaxws:client attributes and elements are omitted for brevity 
--
 
 jaxws:client id="clientWithSeqFailoverSupport" 
address="http://localhost:8080/services";
jaxws:features
-   clustering:failover
-clustering:circuit-breaker-failover threshold="1" 
timeout="6"
-ref bean="SequentialAddresses"/
-/clustering:strategy
+   clustering:circuit-breaker-failover threshold="1" 
timeout="6"
+   clustering:strategy   
+   ref bean="SequentialAddresses"/
+   /clustering:strategy
 /clustering:circuit-breaker-failover
/jaxws:features
 /jaxws:client
 
-!-- other jaxws:client attributes and elements are omitted for brewity 
--
+!-- other jaxws:client attributes and elements are omitted for brevity 
--
 
 jaxws:client id="clientWithRandomFailoverSupport" 
address="http://localhost:8080/initialAddress";
jaxws:features
@@ -262,7 +262,7 @@ http://www.springframework.org/schema/ut
 /property
 /bean
 
-!-- other jaxws:client attributes and elements are omitted for brewity 
--
+!-- other jaxws:client attributes and elements are omitted for brevity 
--
 
 jaxws:client id="clientWithLoadDistributor" 
address="http://localhost:8080/services";
jaxws:features

cxf git commit: [CXF-7071] Supporting reading of form params from HttpServletRequest and FormParams at the same time

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f10ba987b -> c83919aa2


[CXF-7071] Supporting reading of form params from HttpServletRequest and 
FormParams at the same time


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

Branch: refs/heads/3.0.x-fixes
Commit: c83919aa2fe939520208e0f4e222fdfb889bde6b
Parents: f10ba98
Author: Sergey Beryozkin 
Authored: Thu Mar 30 10:54:07 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Mar 30 11:07:28 2017 +0100

--
 .../cxf/jaxrs/impl/HttpServletRequestFilter.java   | 17 +++--
 .../apache/cxf/systest/jaxrs/BookStoreSpring.java  | 13 +
 .../jaxrs/JAXRSClientServerSpringBookTest.java |  7 +++
 3 files changed, 31 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c83919aa/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index 97fe796..6c968d3 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -111,14 +111,19 @@ public class HttpServletRequestFilter extends 
HttpServletRequestWrapper {
 
 };
 }
-
+
+@SuppressWarnings("unchecked")
 private void readFromParamsIfNeeded() {
 if (formParams == null) {
-formParams = new MetadataMap();
-MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
-String enc = HttpUtils.getEncoding(mt, "UTF-8");
-String body = FormUtils.readBody(m.getContent(InputStream.class), 
enc);
-FormUtils.populateMapFromString(formParams, m, body, enc, true);
+if (m.containsKey(FormUtils.FORM_PARAM_MAP)) {
+formParams = (MultivaluedMap)m.get(FormUtils.FORM_PARAM_MAP);
+} else {
+formParams = new MetadataMap();
+MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
+String enc = HttpUtils.getEncoding(mt, "UTF-8");
+String body = 
FormUtils.readBody(m.getContent(InputStream.class), enc);
+FormUtils.populateMapFromString(formParams, m, body, enc, 
true);
+}
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/c83919aa/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
index caa97c3..bfc33ae 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
@@ -33,6 +33,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.MatrixParam;
@@ -121,6 +122,18 @@ public class BookStoreSpring {
 return new Book(name, id);
 }
 @POST
+@Path("/bookform5")
+@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+@Produces("application/xml")
+public Book echoBookForm5(@Context HttpServletRequest req, 
@FormParam("id") Long formId) {
+String name = req.getParameter("name");
+long id = Long.valueOf(req.getParameter("id"));
+if (id != formId) {
+throw new WebApplicationException();
+}
+return new Book(name, id);
+}
+@POST
 @Path("/bookform")
 @Consumes("application/xml")
 @Produces("application/xml")

http://git-wip-us.apache.org/repos/asf/cxf/blob/c83919aa/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 

cxf git commit: [CXF-7071] Supporting reading of form params from HttpServletRequest and FormParams at the same time

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 398a4988b -> c89b56c22


[CXF-7071] Supporting reading of form params from HttpServletRequest and 
FormParams at the same time


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

Branch: refs/heads/3.1.x-fixes
Commit: c89b56c22cb1f5bbb442abdcce13aef6c4c8fcaf
Parents: 398a498
Author: Sergey Beryozkin 
Authored: Thu Mar 30 10:54:07 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Mar 30 11:02:11 2017 +0100

--
 .../cxf/jaxrs/impl/HttpServletRequestFilter.java   | 17 +++--
 .../apache/cxf/systest/jaxrs/BookStoreSpring.java  | 13 +
 .../jaxrs/JAXRSClientServerSpringBookTest.java |  7 +++
 3 files changed, 31 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c89b56c2/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index e5a1b28..a0a19f7 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -112,14 +112,19 @@ public class HttpServletRequestFilter extends 
HttpServletRequestWrapper {
 
 };
 }
-
+
+@SuppressWarnings("unchecked")
 private void readFromParamsIfNeeded() {
 if (formParams == null) {
-formParams = new MetadataMap();
-MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
-String enc = HttpUtils.getEncoding(mt, 
StandardCharsets.UTF_8.name());
-String body = FormUtils.readBody(m.getContent(InputStream.class), 
enc);
-FormUtils.populateMapFromString(formParams, m, body, enc, true);
+if (m.containsKey(FormUtils.FORM_PARAM_MAP)) {
+formParams = (MultivaluedMap)m.get(FormUtils.FORM_PARAM_MAP);
+} else {
+formParams = new MetadataMap();
+MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
+String enc = HttpUtils.getEncoding(mt, 
StandardCharsets.UTF_8.name());
+String body = 
FormUtils.readBody(m.getContent(InputStream.class), enc);
+FormUtils.populateMapFromString(formParams, m, body, enc, 
true);
+}
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/c89b56c2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
index caa97c3..bfc33ae 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
@@ -33,6 +33,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.MatrixParam;
@@ -121,6 +122,18 @@ public class BookStoreSpring {
 return new Book(name, id);
 }
 @POST
+@Path("/bookform5")
+@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+@Produces("application/xml")
+public Book echoBookForm5(@Context HttpServletRequest req, 
@FormParam("id") Long formId) {
+String name = req.getParameter("name");
+long id = Long.valueOf(req.getParameter("id"));
+if (id != formId) {
+throw new WebApplicationException();
+}
+return new Book(name, id);
+}
+@POST
 @Path("/bookform")
 @Consumes("application/xml")
 @Produces("application/xml")

http://git-wip-us.apache.org/repos/asf/cxf/blob/c89b56c2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 

cxf git commit: [CXF-7071] Supporting reading of form params from HttpServletRequest and FormParams at the same time

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 16163d804 -> fe55813cc


[CXF-7071] Supporting reading of form params from HttpServletRequest and 
FormParams at the same time


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

Branch: refs/heads/master
Commit: fe55813cc934667664863117921ff8ea08b9ff24
Parents: 16163d8
Author: Sergey Beryozkin 
Authored: Thu Mar 30 10:54:07 2017 +0100
Committer: Sergey Beryozkin 
Committed: Thu Mar 30 10:54:07 2017 +0100

--
 .../cxf/jaxrs/impl/HttpServletRequestFilter.java | 15 ++-
 .../apache/cxf/systest/jaxrs/BookStoreSpring.java| 13 +
 .../jaxrs/JAXRSClientServerSpringBookTest.java   |  7 +++
 3 files changed, 30 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe55813c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index 750c2f5..4e4b52a 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -113,13 +113,18 @@ public class HttpServletRequestFilter extends 
HttpServletRequestWrapper {
 };
 }
 
+@SuppressWarnings("unchecked")
 private void readFromParamsIfNeeded() {
 if (formParams == null) {
-formParams = new MetadataMap();
-MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
-String enc = HttpUtils.getEncoding(mt, 
StandardCharsets.UTF_8.name());
-String body = FormUtils.readBody(m.getContent(InputStream.class), 
enc);
-FormUtils.populateMapFromString(formParams, m, body, enc, true);
+if (m.containsKey(FormUtils.FORM_PARAM_MAP)) {
+formParams = (MultivaluedMap)m.get(FormUtils.FORM_PARAM_MAP);
+} else {
+formParams = new MetadataMap();
+MediaType mt = 
JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
+String enc = HttpUtils.getEncoding(mt, 
StandardCharsets.UTF_8.name());
+String body = 
FormUtils.readBody(m.getContent(InputStream.class), enc);
+FormUtils.populateMapFromString(formParams, m, body, enc, 
true);
+}
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/fe55813c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
index 90255ef..1c21c15 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
@@ -33,6 +33,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.MatrixParam;
@@ -121,6 +122,18 @@ public class BookStoreSpring {
 return new Book(name, id);
 }
 @POST
+@Path("/bookform5")
+@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+@Produces("application/xml")
+public Book echoBookForm5(@Context HttpServletRequest req, 
@FormParam("id") Long formId) {
+String name = req.getParameter("name");
+long id = Long.valueOf(req.getParameter("id"));
+if (id != formId) {
+throw new WebApplicationException();
+}
+return new Book(name, id);
+}
+@POST
 @Path("/bookform")
 @Consumes("application/xml")
 @Produces("application/xml")

http://git-wip-us.apache.org/repos/asf/cxf/blob/fe55813c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 84ae1490a -> f10ba987b


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

Branch: refs/heads/3.0.x-fixes
Commit: f10ba987b92227c45639f4d3d67d3e0411b88594
Parents: 84ae149
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 10:22:44 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 10:22:44 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f10ba987/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1079e6d..149c56e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -309,6 +309,7 @@ B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
 B 2ee2e3fad61942c3058e729a9520c4bfb541cb0b
 B 2f0b3e38212674883d610cfcfbd76b901bd3d997
 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
+B 2f219d0c7258b33cb72d49d19bfd991a2ef3264a
 B 2f3ba6e5c524e764cef966c185b437380a1d624d
 B 2f56d25eccef5e18222b9bd96083a98871e76af9
 B 2f5f034b8e8361aed103de5bd7fa7526847ac690
@@ -385,6 +386,7 @@ B 3912113d9f0d45505987d36b95395a833bcbe4f4
 B 3913cbf504bb863e48ed5fcff25edc06e25f52c0
 B 393cffc9c5ab323ef81eeaebe4137126e3403ff2
 B 3948f2f0b08f40bdffc8c829429bf33b52ac26e5
+B 398a4988ba004fc484c54376758122f7eec4d980
 B 399249b7f872942b8ce23efc5fc91183ba8b9b0e
 B 39ac2b4eb848be0142d4f3e3da2bb6eb00ea55e5
 B 39ade19fb44770c6bc2c3377e6f0cacbf35e31d6
@@ -750,6 +752,7 @@ B 71488c6fa7635c88285214a0479379aafef9ed3c
 B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
 B 7169e95ca484f7ee20c511bc5f645019541ef502
 B 71811014ff69c2d7a9d7b884a6eb360723b189d8
+B 71b22ea2202d19e388fe58800621286c15ba0454
 B 71ced4709dedf62264a4bb630aaf4780cb94ce48
 B 71dfb1f0e9636b7685482cd9aafb9ef6283d28ba
 B 71e9ada9b119ad8d960b9be15bc5689d718273ef

[1/3] cxf git commit: Adding Jetty programmatic tests

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e24153bd6 -> 398a4988b


Adding Jetty programmatic tests

# Conflicts:
#   
systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f219d0c7258b33cb72d49d19bfd991a2ef3264a
Parents: e24153b
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 10:03:17 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 10:04:41 2017 +0100

--
 .../systest/https/trust/TrustManagerTest.java   | 116 +++
 .../https/trust/TrustServerNoSpring.java|  84 ++
 2 files changed, 200 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f219d0c/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
--
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
index 6264f44..89e6b89 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
@@ -43,7 +43,13 @@ import org.junit.BeforeClass;
  */
 public class TrustManagerTest extends AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(TrustServer.class);
+<<< HEAD
 
+===
+static final String PORT2 = allocatePort(TrustServer.class, 2);
+static final String PORT3 = allocatePort(TrustServer.class, 3);
+
+>>> 16163d8... Adding Jetty programmatic tests
 @BeforeClass
 public static void startServers() throws Exception {
 assertTrue(
@@ -52,6 +58,12 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 // set this to false to fork
 launchServer(TrustServer.class, true)
 );
+assertTrue(
+ "Server failed to launch",
+ // run the server in the same process
+ // set this to false to fork
+ launchServer(TrustServerNoSpring.class, true)
+);
 }
 
 @AfterClass
@@ -131,7 +143,50 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 ((java.io.Closeable)port).close();
 bus.shutdown(true);
 }
+<<< HEAD
 
+===
+
+// Here the Trust Manager checks the server cert. this time we are 
invoking on the
+// service that is configured in code (not by spring)
+@org.junit.Test
+public void testValidServerCertX509TrustManager2() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL url = SOAPService.WSDL_LOCATION;
+SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+assertNotNull("Service is null", service);
+final Greeter port = service.getHttpsPort();
+assertNotNull("Port is null", port);
+
+updateAddressPort(port, PORT3);
+
+String validPrincipalName = 
"CN=Bethal,OU=Bethal,O=ApacheTest,L=Syracuse,C=US";
+
+TLSClientParameters tlsParams = new TLSClientParameters();
+X509TrustManager trustManager =
+new ServerCertX509TrustManager(validPrincipalName);
+TrustManager[] trustManagers = new TrustManager[1];
+trustManagers[0] = trustManager;
+tlsParams.setTrustManagers(trustManagers);
+tlsParams.setDisableCNCheck(true);
+
+Client client = ClientProxy.getClient(port);
+HTTPConduit http = (HTTPConduit) client.getConduit();
+http.setTlsClientParameters(tlsParams);
+
+assertEquals(port.greetMe("Kitty"), "Hello Kitty");
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
+>>> 16163d8... Adding Jetty programmatic tests
 @org.junit.Test
 public void testInvalidServerCertX509TrustManager() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -169,7 +224,68 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 } catch (Exception ex) {
 // expected
 }
+<<< HEAD
 
+===
+
+((java.io.Closeable)port).close();
+

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

Branch: refs/heads/3.1.x-fixes
Commit: 398a4988ba004fc484c54376758122f7eec4d980
Parents: 71b22ea
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 10:21:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 10:21:35 2017 +0100

--
 .../systest/https/trust/TrustManagerTest.java   | 70 
 1 file changed, 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/398a4988/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
--
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
index 89e6b89..b89b1f5 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
@@ -43,13 +43,8 @@ import org.junit.BeforeClass;
  */
 public class TrustManagerTest extends AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(TrustServer.class);
-<<< HEAD
-
-===
-static final String PORT2 = allocatePort(TrustServer.class, 2);
 static final String PORT3 = allocatePort(TrustServer.class, 3);
 
->>> 16163d8... Adding Jetty programmatic tests
 @BeforeClass
 public static void startServers() throws Exception {
 assertTrue(
@@ -143,9 +138,6 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 ((java.io.Closeable)port).close();
 bus.shutdown(true);
 }
-<<< HEAD
-
-===
 
 // Here the Trust Manager checks the server cert. this time we are 
invoking on the
 // service that is configured in code (not by spring)
@@ -186,7 +178,6 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
->>> 16163d8... Adding Jetty programmatic tests
 @org.junit.Test
 public void testInvalidServerCertX509TrustManager() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -224,72 +215,11 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 } catch (Exception ex) {
 // expected
 }
-<<< HEAD
-
-===
 
 ((java.io.Closeable)port).close();
 bus.shutdown(true);
 }
 
-@org.junit.Test
-public void testOSCPOverride() throws Exception {
-SpringBusFactory bf = new SpringBusFactory();
-URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
-
-Bus bus = bf.createBus(busFile.toString());
-SpringBusFactory.setDefaultBus(bus);
-SpringBusFactory.setThreadDefaultBus(bus);
-
-URL url = SOAPService.WSDL_LOCATION;
-SOAPService service = new SOAPService(url, SOAPService.SERVICE);
-assertNotNull("Service is null", service);
-final Greeter port = service.getHttpsPort();
-assertNotNull("Port is null", port);
-
-updateAddressPort(port, PORT2);
-
-// Read truststore
-KeyStore ts = KeyStore.getInstance("JKS");
-try (InputStream trustStore =
-ClassLoaderUtils.getResourceAsStream("keys/cxfca.jks", 
TrustManagerTest.class)) {
-ts.load(trustStore, "password".toCharArray());
-}
-
-try {
-Security.setProperty("ocsp.enable", "true");
-
-PKIXBuilderParameters param = new PKIXBuilderParameters(ts, new 
X509CertSelector());
-param.setRevocationEnabled(true);
-
-TrustManagerFactory tmf  =
-
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-tmf.init(new CertPathTrustManagerParameters(param));
-
-TLSClientParameters tlsParams = new TLSClientParameters();
-tlsParams.setTrustManagers(tmf.getTrustManagers());
-tlsParams.setDisableCNCheck(true);
-
-Client client = ClientProxy.getClient(port);
-HTTPConduit http = (HTTPConduit) client.getConduit();
-http.setTlsClientParameters(tlsParams);
-
-try {
-port.greetMe("Kitty");
-fail("Failure expected on an invalid OCSP responder URL");
-} catch (Exception ex) {
-// expected
-}
-
-} finally {
-Security.setProperty("ocsp.enable", "false");
-}

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

Branch: refs/heads/3.1.x-fixes
Commit: 71b22ea2202d19e388fe58800621286c15ba0454
Parents: 2f219d0
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 10:04:42 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 10:04:42 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/71b22ea2/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 15bfc89..0d0fdfa 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -348,6 +348,7 @@ M 127acfcf24207eef314efe9ffd72e5a032e02ee1
 M 13d33c9ed261e06e44706cffa1671d67d31096a7
 M 146b00d1947058705c873dffe2ba78ad35c8b03c
 M 156b166b093aa92c1fc400e0f1f7440ded701169
+M 16163d8044be801683d1fb2d2d44507f43be2d6a
 M 1622823593e1a9a836e0e354ad37ea1cc56c3fb8
 M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
 M 19a4d72a32f1e18bec621af403ecdf21d97453af

cxf git commit: Adding Jetty programmatic tests

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 1d1b318e5 -> 16163d804


Adding Jetty programmatic tests


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

Branch: refs/heads/master
Commit: 16163d8044be801683d1fb2d2d44507f43be2d6a
Parents: 1d1b318
Author: Colm O hEigeartaigh 
Authored: Thu Mar 30 10:03:17 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Mar 30 10:03:17 2017 +0100

--
 .../systest/https/trust/TrustManagerTest.java   | 64 ---
 .../https/trust/TrustServerNoSpring.java| 84 
 2 files changed, 139 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/16163d80/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
--
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
index a2b9fa6..cc5ba7d 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
@@ -52,6 +52,7 @@ import org.junit.BeforeClass;
 public class TrustManagerTest extends AbstractBusClientServerTestBase {
 static final String PORT = allocatePort(TrustServer.class);
 static final String PORT2 = allocatePort(TrustServer.class, 2);
+static final String PORT3 = allocatePort(TrustServer.class, 3);
 
 @BeforeClass
 public static void startServers() throws Exception {
@@ -61,6 +62,12 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 // set this to false to fork
 launchServer(TrustServer.class, true)
 );
+assertTrue(
+ "Server failed to launch",
+ // run the server in the same process
+ // set this to false to fork
+ launchServer(TrustServerNoSpring.class, true)
+);
 }
 
 @AfterClass
@@ -141,6 +148,45 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+// Here the Trust Manager checks the server cert. this time we are 
invoking on the
+// service that is configured in code (not by spring)
+@org.junit.Test
+public void testValidServerCertX509TrustManager2() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL url = SOAPService.WSDL_LOCATION;
+SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+assertNotNull("Service is null", service);
+final Greeter port = service.getHttpsPort();
+assertNotNull("Port is null", port);
+
+updateAddressPort(port, PORT3);
+
+String validPrincipalName = 
"CN=Bethal,OU=Bethal,O=ApacheTest,L=Syracuse,C=US";
+
+TLSClientParameters tlsParams = new TLSClientParameters();
+X509TrustManager trustManager =
+new ServerCertX509TrustManager(validPrincipalName);
+TrustManager[] trustManagers = new TrustManager[1];
+trustManagers[0] = trustManager;
+tlsParams.setTrustManagers(trustManagers);
+tlsParams.setDisableCNCheck(true);
+
+Client client = ClientProxy.getClient(port);
+HTTPConduit http = (HTTPConduit) client.getConduit();
+http.setTlsClientParameters(tlsParams);
+
+assertEquals(port.greetMe("Kitty"), "Hello Kitty");
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
 @org.junit.Test
 public void testInvalidServerCertX509TrustManager() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -182,7 +228,7 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 ((java.io.Closeable)port).close();
 bus.shutdown(true);
 }
-
+
 @org.junit.Test
 public void testOSCPOverride() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
@@ -206,36 +252,36 @@ public class TrustManagerTest extends 
AbstractBusClientServerTestBase {
 ClassLoaderUtils.getResourceAsStream("keys/cxfca.jks", 
TrustManagerTest.class)) {
 ts.load(trustStore, "password".toCharArray());
 }
-
+
 try {