cxf git commit: [CXF-6976] Duplicate fix for other maven plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 2a80a57ff -> 9a12fe80b


[CXF-6976] Duplicate fix for other maven plugins


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

Branch: refs/heads/3.0.x-fixes
Commit: 9a12fe80b01c6affb4bd1b051391f015b798b6d8
Parents: 2a80a57
Author: Daniel Kulp 
Authored: Mon Mar 27 21:12:27 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:14:44 2017 -0400

--
 .../cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java  | 1 +
 .../cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java  | 1 +
 .../java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 1 +
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java | 1 +
 .../java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 2 ++
 .../main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java   | 1 +
 6 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9a12fe80/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index b5d073f..dd6e172 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -49,6 +49,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
 
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 File outputDirFile = new File(outputDir);
 outputDirFile.mkdirs();
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a12fe80/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index cad3894..64035c9 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -71,6 +71,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
 boolean useCompileClasspath;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 if (outputDir == null) {
 throw new MojoExecutionException("The outputDir must be 
specified");
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a12fe80/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
--
diff --git 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index 81e231c..6384cda 100644
--- 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -221,6 +221,7 @@ public class Java2WADLMojo extends AbstractMojo {
 private ClassLoader resourceClassLoader;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 List resourceClasses = loadResourceClasses();
 initClassResourceInfoList(resourceClasses);
 WadlGenerator wadlGenerator = new WadlGenerator(getBus());

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a12fe80/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index 623592e..c02a77f 100644
--- 

cxf git commit: [CXF-6976] Duplicate fix for other maven plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 3b967cf6d -> f81032919


[CXF-6976] Duplicate fix for other maven plugins


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

Branch: refs/heads/master
Commit: f81032919f74552a21740545a337a458a20b2e1d
Parents: 3b967cf
Author: Daniel Kulp 
Authored: Mon Mar 27 21:12:27 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:12:27 2017 -0400

--
 .../cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java  | 1 +
 .../cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java  | 1 +
 .../java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 1 +
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java | 1 +
 .../java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 2 ++
 .../main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java   | 1 +
 6 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f8103291/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index e982c2f..079e236 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -49,6 +49,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
 
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 File outputDirFile = new File(outputDir);
 outputDirFile.mkdirs();
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f8103291/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index 2c6eed5..fa2edb4 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -70,6 +70,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
 boolean useCompileClasspath;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 if (outputDir == null) {
 throw new MojoExecutionException("The outputDir must be 
specified");
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f8103291/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
--
diff --git 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index 9aa858e..422aae5 100644
--- 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -228,6 +228,7 @@ public class Java2WADLMojo extends AbstractMojo {
 private ClassLoader resourceClassLoader;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 List resourceClasses = loadResourceClasses();
 initClassResourceInfoList(resourceClasses);
 WadlGenerator wadlGenerator = new WadlGenerator(getBus());

http://git-wip-us.apache.org/repos/asf/cxf/blob/f8103291/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index ae55774..1a65cc3 100644
--- 

cxf git commit: [CXF-6976] Duplicate fix for other maven plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 58bce070e -> 42eca6f9c


[CXF-6976] Duplicate fix for other maven plugins


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

Branch: refs/heads/3.1.x-fixes
Commit: 42eca6f9c23d9fb3b1f620b52c30a513cb90526b
Parents: 58bce07
Author: Daniel Kulp 
Authored: Mon Mar 27 21:12:27 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:14:23 2017 -0400

--
 .../cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java  | 1 +
 .../cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java  | 1 +
 .../java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 1 +
 .../src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java | 1 +
 .../java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 2 ++
 .../main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java   | 1 +
 6 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/42eca6f9/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index b5d073f..dd6e172 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -49,6 +49,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
 
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 File outputDirFile = new File(outputDir);
 outputDirFile.mkdirs();
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/42eca6f9/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
--
diff --git 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index efa047d..76c452f 100644
--- 
a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ 
b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -70,6 +70,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
 boolean useCompileClasspath;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 if (outputDir == null) {
 throw new MojoExecutionException("The outputDir must be 
specified");
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/42eca6f9/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
--
diff --git 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index 724e80c..786312e 100644
--- 
a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ 
b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -228,6 +228,7 @@ public class Java2WADLMojo extends AbstractMojo {
 private ClassLoader resourceClassLoader;
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
 List resourceClasses = loadResourceClasses();
 initClassResourceInfoList(resourceClasses);
 WadlGenerator wadlGenerator = new WadlGenerator(getBus());

http://git-wip-us.apache.org/repos/asf/cxf/blob/42eca6f9/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index b97c7d3..2df61da 100644
--- 

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

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ab38f6471 -> 2a80a57ff


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

Branch: refs/heads/3.0.x-fixes
Commit: 2a80a57fffc00c878d3d552fec8b92edc4ac3532
Parents: e046287
Author: Daniel Kulp 
Authored: Mon Mar 27 21:08:33 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:08:33 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2a80a57f/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 38caf76..90b8ebd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -204,6 +204,7 @@ B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd
 B 206738103f5d783d90695aa2e3e750736746d4c3
 B 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde
 B 20b7a7d610a00493b03c79c6f4767158ce495d45
+B 20d0fa3ec41c16c52b74dcc006f9d9ea212fa80f
 B 211a8fb4365714b26025f6964f7542e669931969
 B 214b741754b078e41d471889b7233a90aac017b5
 B 2164a191dfa9db0d9a2a8f38efcbfd953f5679d3
@@ -583,6 +584,7 @@ B 58592742163e7b7e28992304ed1ff2e7e8917f91
 B 587b85261f83306ccdbbc5e0e176436f7991a28b
 B 5891c0d23b776d41be02e74a3b98a3881970d08f
 B 589f6c7fc52b4b2fa906ee62b558b0aa6f3f84ff
+B 58bce070e55a52d4e67396dbcd5ef3deaf9636c6
 B 58d40a843e50f7c581a9cc2373b431bf4a3f9780
 B 58d5200bdc0f15e99f1c624c53299120518a
 B 5902802031e7cf156fe5f0c7a804ec1a53127c27
@@ -1824,6 +1826,7 @@ M 7b31a2afca1ec599100511ce1f7428160618f389
 M 7b4cb818cb6276dfd3a7432c796e67e98c8c941e
 M 7bf10fc3fb018d533409cc444c2d7b75144b9e23
 M 7ffa1d7e54c88e2ee11e90e866bb34b5481762d4
+M 80121de418c1bba8cdf61ff41a87830ee71c2372
 M 807be17959f36d64e4e6ec88ba0b8b1e58e04ec2
 M 80f2e9ffa7825e477f6fe1ea47898e896b03c79d
 M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6

[2/2] cxf git commit: [CXF-6976] Don't disable jar caches for tooling

[dkulp]

[CXF-6976] Don't disable jar caches for tooling


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

Branch: refs/heads/3.0.x-fixes
Commit: e046287f3b553023919d57f6a076175826b01a00
Parents: ab38f64
Author: Daniel Kulp 
Authored: Mon Mar 27 17:26:39 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:08:33 2017 -0400

--
 .../cxf/maven_plugin/AbstractCodegenMoho.java   | 30 +++-
 .../cxf/tools/common/CommandInterfaceUtils.java |  1 +
 .../cxf/tools/common/toolspec/ToolRunner.java   |  8 --
 .../org/apache/cxf/tools/java2js/JavaToJS.java  |  2 ++
 .../org/apache/cxf/tools/java2ws/JavaToWS.java  |  1 +
 .../org/apache/cxf/tools/wadlto/WADLToJava.java |  2 +-
 .../org/apache/cxf/tools/wsdlto/WSDLToJava.java |  3 +-
 7 files changed, 29 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e046287f/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 70fe528..d58b2ff 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -261,6 +261,8 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 }
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
+
 // add the generated source into compile source
 // do this step first to ensure the source folder will be added to the 
Eclipse classpath
 if (project != null && getGeneratedSourceRoot() != null) {
@@ -296,20 +298,20 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 String originalProxyUser = 
SystemPropertyAction.getProperty(HTTP_PROXY_USER);
 String originalProxyPassword = 
SystemPropertyAction.getProperty(HTTP_PROXY_PASSWORD);
 
-configureProxyServerSettings();
-
-List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
-
-if (effectiveWsdlOptions.size() == 0) {
-getLog().info("Nothing to generate");
-return;
-}
-
-ClassLoaderSwitcher classLoaderSwitcher = new 
ClassLoaderSwitcher(getLog());
-boolean result = true;
-
 Bus bus = null;
+ClassLoaderSwitcher classLoaderSwitcher = null;
 try {
+configureProxyServerSettings();
+
+List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
+
+if (effectiveWsdlOptions.size() == 0) {
+getLog().info("Nothing to generate");
+return;
+}
+classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
+boolean result = true;
+
 Set cp = classLoaderSwitcher.switchClassLoader(project, 
useCompileClasspath, classesDir);
 
 if ("once".equals(fork) || "true".equals(fork)) {
@@ -331,7 +333,9 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 if (bus != null) {
 bus.shutdown(true);
 }
-classLoaderSwitcher.restoreClassLoader();
+if (classLoaderSwitcher != null) {
+classLoaderSwitcher.restoreClassLoader();
+}
 restoreProxySetting(originalProxyHost, originalProxyPort, 
originalNonProxyHosts,
 originalProxyUser, originalProxyPassword);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e046287f/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
--
diff --git 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
index 8884b34..d970feb 100644
--- 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
+++ 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
@@ -37,6 +37,7 @@ public final class CommandInterfaceUtils {
 
 public static void commandCommonMain() {
 if (!testInProgress) {
+

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

Branch: refs/heads/3.1.x-fixes
Commit: 58bce070e55a52d4e67396dbcd5ef3deaf9636c6
Parents: 6c77f4a
Author: Daniel Kulp 
Authored: Mon Mar 27 21:05:47 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:06:16 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/58bce070/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 050268c..a184639 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -371,6 +371,7 @@ M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425
 M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
 M 3b7587395586f59d0fe9427038dd2d891fbe223d
+M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
 M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
 M 3e30d8892a723adcf04268efd7d407e164607065
@@ -492,12 +493,14 @@ M e92e57c1f14de911cd2315a907443c79e91a94de
 M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e
 M ed9298066428c0dfc4590a556876d696a4ba13c0
 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160
+M f133df0f691191fac9566726db06c9b4dc7b65a6
 M f462c797eab75e9b6c6c352b4baeb84429866068
 M f7f017f2187d59369a7b94bb053f1e297972dce7
 M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5
 M f91541bed7e44624556b394cfba9b1a43c9bbdca
 M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
 M fa973bd7ab43099151f83beea351b80c7140eaab
+M fade9b81dabe27f864ca38e7b40f28fb44d6f165
 M faf461150f178f7f7ae89a3b7c345671e53b8b04
 M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
 M fe89bf0fb8379428667f66312e6942e906142d6f

[1/2] cxf git commit: [CXF-6976] Don't disable jar caches for tooling

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 20d0fa3ec -> 58bce070e


[CXF-6976] Don't disable jar caches for tooling


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

Branch: refs/heads/3.1.x-fixes
Commit: 6c77f4aa901ce6ac648879ae2136648da4111c85
Parents: 20d0fa3
Author: Daniel Kulp 
Authored: Mon Mar 27 17:26:39 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 21:06:12 2017 -0400

--
 .../cxf/maven_plugin/AbstractCodegenMoho.java   | 30 +++-
 .../cxf/tools/common/CommandInterfaceUtils.java |  1 +
 .../cxf/tools/common/toolspec/ToolRunner.java   |  8 --
 .../org/apache/cxf/tools/java2js/JavaToJS.java  |  2 ++
 .../org/apache/cxf/tools/java2ws/JavaToWS.java  |  1 +
 .../org/apache/cxf/tools/wadlto/WADLToJava.java |  2 +-
 .../org/apache/cxf/tools/wsdlto/WSDLToJava.java |  3 +-
 7 files changed, 29 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index c6b28ec..72abb0b 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -202,6 +202,8 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 }
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
+
 // add the generated source into compile source
 // do this step first to ensure the source folder will be added to the 
Eclipse classpath
 if (project != null && getGeneratedSourceRoot() != null) {
@@ -237,20 +239,20 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 String originalProxyUser = 
SystemPropertyAction.getProperty(HTTP_PROXY_USER);
 String originalProxyPassword = 
SystemPropertyAction.getProperty(HTTP_PROXY_PASSWORD);
 
-configureProxyServerSettings();
-
-List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
-
-if (effectiveWsdlOptions.size() == 0) {
-getLog().info("Nothing to generate");
-return;
-}
-
-ClassLoaderSwitcher classLoaderSwitcher = new 
ClassLoaderSwitcher(getLog());
-boolean result = true;
-
 Bus bus = null;
+ClassLoaderSwitcher classLoaderSwitcher = null;
 try {
+configureProxyServerSettings();
+
+List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
+
+if (effectiveWsdlOptions.size() == 0) {
+getLog().info("Nothing to generate");
+return;
+}
+classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
+boolean result = true;
+
 Set cp = classLoaderSwitcher.switchClassLoader(project, 
useCompileClasspath, classesDir);
 
 if ("once".equals(fork) || "true".equals(fork)) {
@@ -272,7 +274,9 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 if (bus != null) {
 bus.shutdown(true);
 }
-classLoaderSwitcher.restoreClassLoader();
+if (classLoaderSwitcher != null) {
+classLoaderSwitcher.restoreClassLoader();
+}
 restoreProxySetting(originalProxyHost, originalProxyPort, 
originalNonProxyHosts,
 originalProxyUser, originalProxyPassword);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/6c77f4aa/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
--
diff --git 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
index 4e8a531..8110a50 100644
--- 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
+++ 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
@@ -37,6 +37,7 @@ public final class CommandInterfaceUtils {
 
 public static void commandCommonMain() {
 if 

cxf git commit: [CXF-6976] Don't disable jar caches for tooling

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master fade9b81d -> 3b967cf6d


[CXF-6976] Don't disable jar caches for tooling


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

Branch: refs/heads/master
Commit: 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
Parents: fade9b8
Author: Daniel Kulp 
Authored: Mon Mar 27 17:26:39 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 17:31:05 2017 -0400

--
 .../cxf/maven_plugin/AbstractCodegenMoho.java   | 31 
 .../cxf/tools/common/CommandInterfaceUtils.java |  1 +
 .../cxf/tools/common/toolspec/ToolRunner.java   |  8 +++--
 .../org/apache/cxf/tools/java2js/JavaToJS.java  |  2 ++
 .../org/apache/cxf/tools/java2ws/JavaToWS.java  |  1 +
 .../org/apache/cxf/tools/wadlto/WADLToJava.java |  2 +-
 .../org/apache/cxf/tools/wsdlto/WSDLToJava.java |  3 +-
 7 files changed, 30 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3b967cf6/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 9e4fc30..88a0b21 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -202,6 +202,8 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 }
 
 public void execute() throws MojoExecutionException {
+System.setProperty("org.apache.cxf.JDKBugHacks.defaultUsesCaches", 
"true");
+
 // add the generated source into compile source
 // do this step first to ensure the source folder will be added to the 
Eclipse classpath
 if (project != null && getGeneratedSourceRoot() != null) {
@@ -236,21 +238,22 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 String originalNonProxyHosts = 
SystemPropertyAction.getProperty(HTTP_NON_PROXY_HOSTS);
 String originalProxyUser = 
SystemPropertyAction.getProperty(HTTP_PROXY_USER);
 String originalProxyPassword = 
SystemPropertyAction.getProperty(HTTP_PROXY_PASSWORD);
-
-configureProxyServerSettings();
-
-List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
-
-if (effectiveWsdlOptions.size() == 0) {
-getLog().info("Nothing to generate");
-return;
-}
-
-ClassLoaderSwitcher classLoaderSwitcher = new 
ClassLoaderSwitcher(getLog());
-boolean result = true;
+
 
 Bus bus = null;
+ClassLoaderSwitcher classLoaderSwitcher = null;
 try {
+configureProxyServerSettings();
+
+List effectiveWsdlOptions = 
createWsdlOptionsFromScansAndExplicitWsdlOptions();
+
+if (effectiveWsdlOptions.size() == 0) {
+getLog().info("Nothing to generate");
+return;
+}
+classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
+boolean result = true;
+
 Set cp = classLoaderSwitcher.switchClassLoader(project, 
useCompileClasspath, classesDir);
 
 if ("once".equals(fork) || "true".equals(fork)) {
@@ -272,7 +275,9 @@ public abstract class AbstractCodegenMoho extends 
AbstractMojo {
 if (bus != null) {
 bus.shutdown(true);
 }
-classLoaderSwitcher.restoreClassLoader();
+if (classLoaderSwitcher != null) {
+classLoaderSwitcher.restoreClassLoader();
+}
 restoreProxySetting(originalProxyHost, originalProxyPort, 
originalNonProxyHosts,
 originalProxyUser, originalProxyPassword);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/3b967cf6/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
--
diff --git 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
index 4e8a531..8110a50 100644
--- 
a/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
+++ 
b/tools/common/src/main/java/org/apache/cxf/tools/common/CommandInterfaceUtils.java
@@ -37,6 +37,7 @@ public final class 

cxf git commit: Finalizing XmlSecInInterceptor updates

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e49ef9dbd -> 20d0fa3ec


Finalizing XmlSecInInterceptor updates

Conflicts:

rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 20d0fa3ec41c16c52b74dcc006f9d9ea212fa80f
Parents: e49ef9d
Author: Sergey Beryozkin 
Authored: Mon Mar 27 22:10:55 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 22:16:07 2017 +0100

--
 .../security/xml/ClientXmlSecInInterceptor.java | 46 --
 .../rs/security/xml/XmlSecInInterceptor.java| 51 ++--
 2 files changed, 35 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20d0fa3e/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
deleted file mode 100644
index cfbc508..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.ReaderInterceptor;
-import javax.ws.rs.ext.ReaderInterceptorContext;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.message.Message;
-
-public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ReaderInterceptor {
-
-@Override
-public Object aroundReadFrom(ReaderInterceptorContext ctx) throws 
IOException, WebApplicationException {
-Message message = JAXRSUtils.getCurrentMessage();
-handleMessage(message);
-Object object = ctx.proceed();
-new StaxActionInInterceptor(super.isRequireSignature(), 
-
super.isRequireEncryption()).handleMessage(message);
-return object;
-}
-
-@Override
-protected void registerStaxActionInInterceptor(Message inMsg) {
-// complete
-}
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/20d0fa3e/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
index aefecb3..3ce1047 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
@@ -34,7 +34,10 @@ import java.util.regex.PatternSyntaxException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
@@ -44,6 +47,7 @@ import org.apache.cxf.interceptor.StaxInInterceptor;
 import org.apache.cxf.jaxrs.utils.ExceptionUtils;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 

cxf git commit: Finalizing XmlSecInInterceptor updates

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master d3b88b5f4 -> fade9b81d


Finalizing XmlSecInInterceptor updates


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

Branch: refs/heads/master
Commit: fade9b81dabe27f864ca38e7b40f28fb44d6f165
Parents: d3b88b5
Author: Sergey Beryozkin 
Authored: Mon Mar 27 22:10:55 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 22:10:55 2017 +0100

--
 .../security/xml/ClientXmlSecInInterceptor.java | 46 ---
 .../rs/security/xml/XmlSecInInterceptor.java| 47 ++--
 2 files changed, 33 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fade9b81/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
deleted file mode 100644
index cfbc508..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.ReaderInterceptor;
-import javax.ws.rs.ext.ReaderInterceptorContext;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-import org.apache.cxf.message.Message;
-
-public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ReaderInterceptor {
-
-@Override
-public Object aroundReadFrom(ReaderInterceptorContext ctx) throws 
IOException, WebApplicationException {
-Message message = JAXRSUtils.getCurrentMessage();
-handleMessage(message);
-Object object = ctx.proceed();
-new StaxActionInInterceptor(super.isRequireSignature(), 
-
super.isRequireEncryption()).handleMessage(message);
-return object;
-}
-
-@Override
-protected void registerStaxActionInInterceptor(Message inMsg) {
-// complete
-}
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/fade9b81/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
index 48db383..2d4014e 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
@@ -34,7 +34,10 @@ import java.util.regex.PatternSyntaxException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
@@ -44,6 +47,7 @@ import org.apache.cxf.interceptor.StaxInInterceptor;
 import org.apache.cxf.jaxrs.utils.ExceptionUtils;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
 import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.rs.security.common.CryptoLoader;
@@ -72,7 +76,7 @@ import 

[1/2] cxf git commit: Update supported versions in generated build.xml

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9ec048d79 -> ab38f6471


Update supported versions in generated build.xml


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

Branch: refs/heads/3.0.x-fixes
Commit: 51879690b2a1e835b69a31cb3692c841f04d012b
Parents: 9ec048d
Author: Daniel Kulp 
Authored: Mon Mar 27 14:57:02 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 15:53:21 2017 -0400

--
 .../apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/51879690/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
index fbfaeed..e044188 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
@@ -38,15 +38,17 @@
 
 
 
-
+
 
   
   
+  
+  
 
 
 
 
+  unless="is.supported.java.version"/>
 
 

[2/2] cxf git commit: [CXF-6523] Fix issues if part names of out-of-band headers match the name of the wrapper part

[dkulp]

[CXF-6523] Fix issues if part names of out-of-band headers match the name of 
the wrapper part


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

Branch: refs/heads/3.0.x-fixes
Commit: ab38f6471405fbd34360b947d21a59e34cb7578d
Parents: 5187969
Author: Daniel Kulp 
Authored: Mon Mar 27 15:15:58 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 15:53:25 2017 -0400

--
 .../cxf/jaxws/interceptors/WrapperClassInInterceptor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ab38f647/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index 9e29115..f6a46ff 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -138,7 +138,12 @@ public class WrapperClassInInterceptor extends 
AbstractPhaseInterceptor
 int count = 0;
 for (MessagePartInfo part : messageInfo.getMessageParts()) {
 if 
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER))) {
-MessagePartInfo mpi = 
wrappedMessageInfo.getMessagePart(part.getName());
+MessagePartInfo mpi = null;
+for (MessagePartInfo mpi2 : 
wrappedMessageInfo.getMessageParts()) {
+if 
(mpi2.getConcreteName().equals(part.getConcreteName())) {
+mpi = mpi2;
+}
+}
 if (mpi != null && lst.hasValue(mpi)) {
 count++;
 newParams.put(part, lst.get(mpi));

[2/2] cxf git commit: [CXF-6523] Fix issues if part names of out-of-band headers match the name of the wrapper part

[dkulp]

[CXF-6523] Fix issues if part names of out-of-band headers match the name of 
the wrapper part


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

Branch: refs/heads/3.1.x-fixes
Commit: e49ef9dbdd0fed54ae62439638b25d49d51c5c5e
Parents: 80121de
Author: Daniel Kulp 
Authored: Mon Mar 27 15:15:58 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 15:52:23 2017 -0400

--
 .../cxf/jaxws/interceptors/WrapperClassInInterceptor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e49ef9db/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index 7291478..b3a4d25 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -133,7 +133,12 @@ public class WrapperClassInInterceptor extends 
AbstractPhaseInterceptor
 int count = 0;
 for (MessagePartInfo part : messageInfo.getMessageParts()) {
 if 
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER))) {
-MessagePartInfo mpi = 
wrappedMessageInfo.getMessagePart(part.getName());
+MessagePartInfo mpi = null;
+for (MessagePartInfo mpi2 : 
wrappedMessageInfo.getMessageParts()) {
+if 
(mpi2.getConcreteName().equals(part.getConcreteName())) {
+mpi = mpi2;
+}
+}
 if (mpi != null && lst.hasValue(mpi)) {
 count++;
 newParams.put(part, lst.get(mpi));

[1/2] cxf git commit: Update supported versions in generated build.xml

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 6b2066573 -> e49ef9dbd


Update supported versions in generated build.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: 80121de418c1bba8cdf61ff41a87830ee71c2372
Parents: 6b20665
Author: Daniel Kulp 
Authored: Mon Mar 27 14:57:02 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 15:52:12 2017 -0400

--
 .../cxf/tools/wsdlto/frontend/jaxws/template/build.vm   | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/80121de4/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
index fbfaeed..454b85d 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
@@ -38,15 +38,16 @@
 
 
 
-
+
 
-  
   
+  
+  
 
 
 
-
+
 
 

[1/2] cxf git commit: Update supported versions in generated build.xml

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 62f994427 -> d3b88b5f4


Update supported versions in generated build.xml


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

Branch: refs/heads/master
Commit: f133df0f691191fac9566726db06c9b4dc7b65a6
Parents: 62f9944
Author: Daniel Kulp 
Authored: Mon Mar 27 14:57:02 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:57:02 2017 -0400

--
 .../cxf/tools/wsdlto/frontend/jaxws/template/build.vm | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f133df0f/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
--
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
index fbfaeed..d31d2b7 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
@@ -38,15 +38,15 @@
 
 
 
-
+
 
-  
-  
+  
+  
 
 
 
-
+
 
 

[2/2] cxf git commit: [CXF-6523] Fix issues if part names of out-of-band headers match the name of the wrapper part

[dkulp]

[CXF-6523] Fix issues if part names of out-of-band headers match the name of 
the wrapper part


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

Branch: refs/heads/master
Commit: d3b88b5f4090b75273697d8ba7c79e281aba305e
Parents: f133df0
Author: Daniel Kulp 
Authored: Mon Mar 27 15:15:58 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 15:15:58 2017 -0400

--
 .../cxf/jaxws/interceptors/WrapperClassInInterceptor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3b88b5f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index d7b0225..702cc10 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -133,7 +133,12 @@ public class WrapperClassInInterceptor extends 
AbstractPhaseInterceptor
 int count = 0;
 for (MessagePartInfo part : messageInfo.getMessageParts()) {
 if 
(Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER))) {
-MessagePartInfo mpi = 
wrappedMessageInfo.getMessagePart(part.getName());
+MessagePartInfo mpi = null;
+for (MessagePartInfo mpi2 : 
wrappedMessageInfo.getMessageParts()) {
+if 
(mpi2.getConcreteName().equals(part.getConcreteName())) {
+mpi = mpi2;
+}
+}
 if (mpi != null && lst.hasValue(mpi)) {
 count++;
 newParams.put(part, lst.get(mpi));

svn commit: r1009168 - in /websites/production/cxf/content: cache/docs.pageCache docs/debugging-and-logging.html

[buildbot]

Author: buildbot
Date: Mon Mar 27 18:47:49 2017
New Revision: 1009168

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/debugging-and-logging.html

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

Modified: websites/production/cxf/content/docs/debugging-and-logging.html
==
--- websites/production/cxf/content/docs/debugging-and-logging.html (original)
+++ websites/production/cxf/content/docs/debugging-and-logging.html Mon Mar 27 
18:47:49 2017
@@ -116,7 +116,7 @@ Apache CXF -- Debugging and Logging
  


-General CXF LoggingMessage LoggingOld Message LoggingATOM LoggingDebugging ToolsEclipse IDESee this https://web-gmazza.rhcloud.com/blog/entry/eclipse-debug-web-services; 
rel="nofollow">blog entry for information on debugging web services using 
Eclipse. Note this is primarily for tracing/debugging source code; you will 
probably still want to use one of the tools below to capture network traffic, 
view SOAP requests and responses, etc.NetBeans IDENetBeans include a http://www.netbeans.org/features/java/debugger.html; 
rel="nofollow">debugger, http://www.netbeans.org/features/java/profiler.html; 
rel="nofollow">profiler and an HTTP monitor that can assist in 
troubleshooting SOA applications.tcpmon and tcptracehttp://tcpmon.dev.java.net; 
rel="nofollow">tcpmon allows you to easily view messages as they go back 
and forth on the wire. The companion utility http://www.tcptrace.org; 
rel="nofollow">tcptrace can be used for analysis of the dump.WSMonitorhttps://wsmonitor.dev.java.net/; 
rel="nofollow">WSMonitor in another option to Tcpmon with slightly more 
functionality.NetSnifferhttp://www.miray.de/products/sat.netsniffer.html; 
rel="nofollow">NetSniffer makes it possible to track the network traffic 
between arbitrary devices within a LAN segment.Wiresharkhttp://www.wireshark.org/; 
rel="nofollow">Wireshark, a network packet analyzer, is useful for 
following the routing of SOAP messages. It can also help when you are getting 
an HTML error message from the server that your CXF client cannot normally 
process, by allowing you to see the non-SOAP error message. See this http://www.jroller.com/gmazza/entry/soap_calls_over_wireshark; 
rel="nofollow">blog entry for more information.SOAP UIhttp://soapui.org; rel="nofollow">SOAP UI can 
also be used for debugging. In addition to viewing messages, it 
 allows you send messages and load test your services. It also has plugins for 
the http://soapui.org/IDE-Plugins/eclipse-plugin.html; rel="nofollow">Eclipse 
IDE, http://www.soapui.org/IDE-Plugins/netbean.html; rel="nofollow">NetBeans 
IDE and http://www.soapui.org/IDE-Plugins/intellij.html; rel="nofollow">IntelliJ 
IDEA.Other Helpful 
ToolsWSDL Viewerhttp://tomi.vanek.sk/index.php?page=wsdl-viewer; rel="nofollow">WSDL 
Viewer is a small tool to visualize web-services in a more intuitive 
way.SOAP Fault for 
debuggingThis feature is available since CXF 
2.3.4Stack t
 race in fault detailsCXF supports the ability to put server stack 
trace information into the fault message fault details, if you enable the 
option of 'faultStackTraceEnabled'. It is useful for debugging if the soap 
fault message is not defined in the WSDL operation.
+General CXF LoggingMessage LoggingOld Message LoggingATOM LoggingDebugging ToolsEclipse IDESee this https://web-gmazza.rhcloud.com/blog/entry/eclipse-debug-web-services; 
rel="nofollow">blog entry for information on debugging web services using 
Eclipse. Note this is primarily for tracing/debugging source code; you will 
probably still want to use one of the tools below to capture network traffic, 
view SOAP requests and responses, etc.NetBeans IDENetBeans include a http://www.netbeans.org/features/java/debugger.html; 
rel="nofollow">debugger,profiler, and an HTTP monitor that can assist 
in troubleshooting SOA applications.tcpmonplushttps://sourceforge.net/projects/tcpmonplus/; 
rel="nofollow">tcpmonplus allows you to easily view messages as they go 
back and forth on the wire.WSMonitorhttps://java.net/projects/wsmonitor/sources/svn/show/trunk/wsmonitor?rev=97;
 rel="nofollow">WSMonitor in another option to Tcpmon with slightly more 
functionality.NetSnifferhttp://www.miray.de/products/sat.netsniffer.html; 
rel="nofollow">NetSniffer makes it possible to track the network traffic 
between arbitrary devices within a LAN segment.Wiresharkhttp://www.wireshark.org/; 
rel="nofollow">Wireshark, a network packet analyzer, is useful for 
following the routing of SOAP messages. It can also help when you are getting 
an HTML error message from the server that your CXF client cannot normally 
process, by allowing you to see the non-SOAP error message.SOAP 

[2/3] cxf git commit: [CXF-5697] Some minor updates for WHICH_JAR

[dkulp]

[CXF-5697] Some minor updates for WHICH_JAR


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

Branch: refs/heads/3.0.x-fixes
Commit: c3ee6344f3cf035785582c044ac7c415307517e8
Parents: daf34f1
Author: Daniel Kulp 
Authored: Mon Mar 27 14:13:51 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:24:14 2017 -0400

--
 distribution/src/main/release/lib/WHICH_JARS | 29 ++-
 1 file changed, 12 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c3ee6344/distribution/src/main/release/lib/WHICH_JARS
--
diff --git a/distribution/src/main/release/lib/WHICH_JARS 
b/distribution/src/main/release/lib/WHICH_JARS
index 09f308e..edf27bf 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -41,6 +41,7 @@ For Java2WSDL and WSDL2Java:
 - commons-collections.jar
 - commons-lang.jar
 - cxf-rt-wsdl.jar
+- cxf-rt-tools*.jar
 - cxf-xjc*.jar (optional, these are xjc extensions for providing enhanced
 JAXB code generation)
 
@@ -78,13 +79,7 @@ For standalone HTTP support use Jetty:
 - sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
 - cxf-rt-transports-http-jetty.jar
 
-For standalone HTTP support use Netty:
-- geronimo-servlet.jar
-- netty-*.jar
-- cxf-rt-transports-http-netty.jar
- 
 For Aegis support:
-- jdom.jar (optional, if you want to map xsd:anyType to JDOM)
 - cxf-rt-databinding-aegis.jar
 
 For XmlBeans databinding support:
@@ -96,21 +91,19 @@ For WS-Security support:
 - xmlsec.jar
 - ehcache-core.jar
 - jasypt.jar
+- cxf-rt-security.jar
 - cxf-rt-ws-security.jar
+- bcprov-jdk15on.jar (optional)
 
 For SAML support in WS-Security
-- joda-time.jar 
-- opensaml.jar
-- openws.jar
-- xmltooling.jar
-- xalan.jar
+- joda-time.jar
+- cryptacular.jar
+- java-support.jar
+- opensaml*.jar
+- commons-code.jar
+- cxf-rt-security-saml.jar
 
 For JAX-RS support:
-- abdera*  (optional: for AtomPub support, but also needed for the 
-Management log browser console)
-- commons-codec.jar (Needed for Abdera)
-- jaxen.jar (Needed for Abdera)
-- axiom* (Needed for Abdera)
 - javax.ws.rs-api.jar
 - jettison.jar (Needed for JSON services only)
 - oauth*.jar (Needed for OAuth support)
@@ -137,12 +130,14 @@ For the Async HTTP client transport
 
 For CORBA support:
 - antlr.jar
+- cxf-rt-bindings-corba.jar
 
 For JavaScript functionality:
 - js.jar
+- cxf-rt-javascript
+- cxf-rt-frontend-js
 
 For schema validation with the Aegis data binding.
-
  - msv-core.jar
  - xsdlib.jar
  - isorelax.jar

[1/3] cxf git commit: [CXF-4821] Find the invoke method on the provider implementation class directly

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b1808da98 -> 9ec048d79


[CXF-4821] Find the invoke method on the provider implementation class directly


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

Branch: refs/heads/3.0.x-fixes
Commit: daf34f19493bccb174f896788914d54f00d1982f
Parents: b1808da
Author: Daniel Kulp 
Authored: Mon Mar 27 13:05:00 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:24:12 2017 -0400

--
 .../org/apache/cxf/common/util/ReflectionUtil.java | 17 +
 .../org/apache/cxf/jaxws/JAXWSMethodInvoker.java   |  2 +-
 .../cxf/jaxws/JAXWSProviderMethodDispatcher.java   | 14 +++---
 3 files changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/daf34f19/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 6b41895..3684d6b 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -164,6 +164,23 @@ public final class ReflectionUtil {
 }
 }
 }
+public static Method getMethod(final Class clazz, final String name,
+   final Class... parameterTypes) throws 
NoSuchMethodException {
+try {
+return AccessController.doPrivileged(new 
PrivilegedExceptionAction() {
+public Method run() throws Exception {
+return clazz.getMethod(name, parameterTypes);
+}
+});
+} catch (PrivilegedActionException pae) {
+Exception e = pae.getException();
+if (e instanceof NoSuchMethodException) {
+throw (NoSuchMethodException)e;
+} else {
+throw new SecurityException(e);
+}
+}
+}
 
 public static Field[] getDeclaredFields(final Class cls) {
 return AccessController.doPrivileged(new PrivilegedAction() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/daf34f19/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
index 4a7cddf..7142355 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
@@ -63,7 +63,7 @@ public class JAXWSMethodInvoker extends 
AbstractJAXWSMethodInvoker {
 final MessageContext oldCtx = 
WebServiceContextImpl.setMessageContext(ctx);
 List res = null;
 try {
-if ((params == null || params.isEmpty()) && 
m.getDeclaringClass().equals(Provider.class)) {
+if ((params == null || params.isEmpty()) && serviceObject 
instanceof Provider) {
 params = Collections.singletonList(null);
 }
 res = CastUtils.cast((List)super.invoke(exchange, 
serviceObject, m, params));

http://git-wip-us.apache.org/repos/asf/cxf/blob/daf34f19/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
index 841f82c..40be623 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
 
 import javax.xml.ws.Provider;
 
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -36,9 +37,16 @@ public class JAXWSProviderMethodDispatcher
 
 public JAXWSProviderMethodDispatcher(JaxWsImplementorInfo implInfo) {
 try {
-invoke = Provider.class.getMethod("invoke", new Class[] 
{Object.class});
-} catch (Exception e) {
-throw new 

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

Branch: refs/heads/3.0.x-fixes
Commit: 9ec048d7970cc8bb6a41d3a990158360a7b22189
Parents: c3ee634
Author: Daniel Kulp 
Authored: Mon Mar 27 14:24:14 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:24:14 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/9ec048d7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1cd54d8..38caf76 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -126,6 +126,7 @@ B 154d06822014f5cc0607cbf12706a31f88577191
 B 156ea7366ce5aa70fcacec8868b41c9c54de40a1
 B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af
 B 15aa0d6caf716d4de93f6ede2b3ae2c958ff1c06
+B 15c7bcde4ff8a741a79af1444e7d67442c48fd7a
 B 15ce3e7fb4db8eafca9a263349bc94f1e9516f7f
 B 15e4db9688617af6764f82c234e5a9582692a6e2
 B 15ebdfafcd3c54406bcb7ca3405f8aa4fe13ae35
@@ -318,6 +319,7 @@ B 30853113b4c4d47200bcf5305e5e88735f32cc8f
 B 30ad57d5590257960030161c2bd20ab4131d9c7b
 B 30c2ad01145045b01c68dff3a1e9bb5a79324407
 B 30c76de217fc5b874f949d1bd5d24a3ac2015e67
+B 30e2b03d1e7ed9990886c0f584c35800fea2fccc
 B 310b23956dee38cd4e80862f37010acc2b6adfd8
 B 3134609dcd0443d4007a7829df57c148fff947b3
 B 315e357e850407e9f3233259bab33ea765633271
@@ -436,6 +438,7 @@ B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
 B 4463a7be5363bc38d9088c154d7a80a399acf4fa
 B 448fdcf01e27006fef31de39c7672cc251e07dbc
 B 449a10ca63d5b3507861eb4da9f56c215eddccfb
+B 449e39521d11861c050ea53afe06d27690210e9e
 B 44a2a45027c51d005a725ad95ca8a57288e29e49
 B 44a3e37179ba999d7eddcc67cad9587ee9d959fb
 B 44abe9a07a81f83685a626de20c27b3c4b98a871
@@ -532,6 +535,7 @@ B 50c705a2c69589e2ecce6e93550aad687468ecff
 B 50daa4883dc8078a018ebc985e5c7bd58c6c5ff1
 B 51247539e60d3db67df2556674f810b936a972e2
 B 512e9e900f3c840e1b0ab4c2fb4c3950bffc84ad
+B 516f8cbe28b6fa73969bdcf96f447a675fafe023
 B 51f433d54a1d11eac25c32b0dd69f12fef62c060
 B 5250c5c85b8100236eb27734973ac0b496d59457
 B 52c3b6a90314086ece3b7f6df63465434879b2cd
@@ -686,6 +690,7 @@ B 6a960c28608058a2782aa92948a2b2ca47b2aef3
 B 6a9b6a5ebae8a1810374457eca74d09005a920cc
 B 6aa73265ae179bb4ebc3d826c1661ecab387067b
 B 6af09877545cb1fe34fce0057b5b39cb264b5f7c
+B 6b206657384568c5e8a85e0483234d1deffdf4fc
 B 6b7631060e263852af694c3bb307db19a3d68c19
 B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6c14b437f2fadd1ab273455c0d6779e45180f642
@@ -1849,6 +1854,7 @@ M 9245fcb3947411433c3c03ca7aff967365ec3fdd
 M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
 M 94d6eba32c31e686def306f20b48ccc60d383fad
 M 953d23f38ddfe044a4dff4783498ebe5d68d76c1
+M 95fb948cb8b008791028c5c36db700722ca2e0d1
 M 96f736726871ac7cb69d04a8527c806e887d7636
 M 97fc24b158d3deb18a388a49b01b3436e6c7b1b7
 M 982bdbc9dc2127906d0a1ca06ae181c87c38bbfa

[2/3] cxf git commit: [CXF-5697] Some minor updates for WHICH_JAR

[dkulp]

[CXF-5697] Some minor updates for WHICH_JAR


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

Branch: refs/heads/3.1.x-fixes
Commit: df6b6084c80a8e6b9fe493924d9f8e7153816d44
Parents: a6b87b4
Author: Daniel Kulp 
Authored: Mon Mar 27 14:13:51 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:22:59 2017 -0400

--
 distribution/src/main/release/lib/WHICH_JARS | 29 ++-
 1 file changed, 12 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/df6b6084/distribution/src/main/release/lib/WHICH_JARS
--
diff --git a/distribution/src/main/release/lib/WHICH_JARS 
b/distribution/src/main/release/lib/WHICH_JARS
index 2eea065..7255ba9 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -37,6 +37,7 @@ For Java2WSDL and WSDL2Java:
 - commons-collections.jar
 - commons-lang.jar
 - cxf-rt-wsdl.jar
+- cxf-rt-tools*.jar
 - cxf-xjc*.jar (optional, these are xjc extensions for providing enhanced
 JAXB code generation)
 
@@ -71,13 +72,7 @@ For standalone HTTP support use Jetty:
 - sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
 - cxf-rt-transports-http-jetty.jar
 
-For standalone HTTP support use Netty:
-- geronimo-servlet.jar
-- netty-*.jar
-- cxf-rt-transports-http-netty.jar
- 
 For Aegis support:
-- jdom.jar (optional, if you want to map xsd:anyType to JDOM)
 - cxf-rt-databinding-aegis.jar
 
 For XmlBeans databinding support:
@@ -89,21 +84,19 @@ For WS-Security support:
 - xmlsec.jar
 - ehcache-core.jar
 - jasypt.jar
+- cxf-rt-security.jar
 - cxf-rt-ws-security.jar
+- bcprov-jdk15on.jar (optional)
 
 For SAML support in WS-Security
-- joda-time.jar 
-- opensaml.jar
-- openws.jar
-- xmltooling.jar
-- xalan.jar
+- joda-time.jar
+- cryptacular.jar
+- java-support.jar
+- opensaml*.jar
+- commons-code.jar
+- cxf-rt-security-saml.jar
 
 For JAX-RS support:
-- abdera*  (optional: for AtomPub support, but also needed for the 
-Management log browser console)
-- commons-codec.jar (Needed for Abdera)
-- jaxen.jar (Needed for Abdera)
-- axiom* (Needed for Abdera)
 - javax.ws.rs-api.jar
 - jettison.jar (Needed for JSON services only)
 - oauth*.jar (Needed for OAuth support)
@@ -130,12 +123,14 @@ For the Async HTTP client transport
 
 For CORBA support:
 - antlr.jar
+- cxf-rt-bindings-corba.jar
 
 For JavaScript functionality:
 - js.jar
+- cxf-rt-javascript
+- cxf-rt-frontend-js
 
 For schema validation with the Aegis data binding.
-
  - msv-core.jar
  - xsdlib.jar
  - isorelax.jar

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

Branch: refs/heads/3.1.x-fixes
Commit: 6b206657384568c5e8a85e0483234d1deffdf4fc
Parents: df6b608
Author: Daniel Kulp 
Authored: Mon Mar 27 14:22:59 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:22:59 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6b206657/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e7ee421..050268c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -342,6 +342,7 @@ M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
 M 11637433df089a638e173d1ef57441e7456cf2ea
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 11e18bf5622cafdb10723cee895885d676b35a7b
+M 127acfcf24207eef314efe9ffd72e5a032e02ee1
 M 13d33c9ed261e06e44706cffa1671d67d31096a7
 M 146b00d1947058705c873dffe2ba78ad35c8b03c
 M 156b166b093aa92c1fc400e0f1f7440ded701169
@@ -373,6 +374,7 @@ M 3b7587395586f59d0fe9427038dd2d891fbe223d
 M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
 M 3e30d8892a723adcf04268efd7d407e164607065
+M 417fb946eec38f403d915e90f405594675a7f7e0
 M 437c7daa3345c8482deab4a4da9b164e68fd417a
 M 45d54d558625236b84752b0d7976f0cf85518c16
 M 4719a033d54fd9fcd173be273e6c320d8353b631
@@ -382,6 +384,7 @@ M 4824bfe59878dd9dbbd2a067e8772b1971897cfc
 M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
 M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
+M 4e5119b3d1d807fb6885ec67ce28180beb55c360
 M 4f4ce80ba2de80219e13943cbd6edbf47234
 M 5022be0c15d90800ee983fe94b07a10a54814991
 M 52d77470228a3560f464003c68b30ffe8f1e8b9c
@@ -391,6 +394,7 @@ M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
 M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
 M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
 M 6242c682dfce4a2ba4869978c28b14f1472484c1
+M 62f994427bdd12863dc987e348eec1e24e6ce849
 M 63a1088a9253da0452497440e900d35a5415c3c9
 M 65c1204abcef8720d4eb985d58e3f865e39a1da3
 M 6613e46662317ea151f72e26e5deb4f50148a148

[1/3] cxf git commit: [CXF-4821] Find the invoke method on the provider implementation class directly

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 449e39521 -> 6b2066573


[CXF-4821] Find the invoke method on the provider implementation class directly


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

Branch: refs/heads/3.1.x-fixes
Commit: a6b87b4d8b1c6a35493732611bc9e71fb7a052a0
Parents: 449e395
Author: Daniel Kulp 
Authored: Mon Mar 27 13:05:00 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:22:56 2017 -0400

--
 .../org/apache/cxf/common/util/ReflectionUtil.java | 17 +
 .../org/apache/cxf/jaxws/JAXWSMethodInvoker.java   |  2 +-
 .../cxf/jaxws/JAXWSProviderMethodDispatcher.java   | 14 +++---
 3 files changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 6b41895..3684d6b 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -164,6 +164,23 @@ public final class ReflectionUtil {
 }
 }
 }
+public static Method getMethod(final Class clazz, final String name,
+   final Class... parameterTypes) throws 
NoSuchMethodException {
+try {
+return AccessController.doPrivileged(new 
PrivilegedExceptionAction() {
+public Method run() throws Exception {
+return clazz.getMethod(name, parameterTypes);
+}
+});
+} catch (PrivilegedActionException pae) {
+Exception e = pae.getException();
+if (e instanceof NoSuchMethodException) {
+throw (NoSuchMethodException)e;
+} else {
+throw new SecurityException(e);
+}
+}
+}
 
 public static Field[] getDeclaredFields(final Class cls) {
 return AccessController.doPrivileged(new PrivilegedAction() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
index 8c56fbc..bc5cd59 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
@@ -79,7 +79,7 @@ public class JAXWSMethodInvoker extends 
AbstractJAXWSMethodInvoker {
 final MessageContext oldCtx = 
WebServiceContextImpl.setMessageContext(ctx);
 List res = null;
 try {
-if ((params == null || params.isEmpty()) && 
m.getDeclaringClass().equals(Provider.class)) {
+if ((params == null || params.isEmpty()) && serviceObject 
instanceof Provider) {
 params = Collections.singletonList(null);
 }
 res = CastUtils.cast((List)super.invoke(exchange, 
serviceObject, m, params));

http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
index 841f82c..40be623 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
 
 import javax.xml.ws.Provider;
 
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -36,9 +37,16 @@ public class JAXWSProviderMethodDispatcher
 
 public JAXWSProviderMethodDispatcher(JaxWsImplementorInfo implInfo) {
 try {
-invoke = Provider.class.getMethod("invoke", new Class[] 
{Object.class});
-} catch (Exception e) {
-throw new 

[2/2] cxf git commit: [CXF-4821] Find the invoke method on the provider implementation class directly

[dkulp]

[CXF-4821] Find the invoke method on the provider implementation class directly


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

Branch: refs/heads/master
Commit: 288e48af0142c43058f96725c50c809f505ffe3b
Parents: 4e5119b
Author: Daniel Kulp 
Authored: Mon Mar 27 13:05:00 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:22:08 2017 -0400

--
 .../org/apache/cxf/common/util/ReflectionUtil.java | 17 +
 .../org/apache/cxf/jaxws/JAXWSMethodInvoker.java   |  2 +-
 .../cxf/jaxws/JAXWSProviderMethodDispatcher.java   | 14 +++---
 3 files changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/288e48af/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 5e3bea4..d859fbf 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -164,6 +164,23 @@ public final class ReflectionUtil {
 }
 }
 }
+public static Method getMethod(final Class clazz, final String name,
+   final Class... parameterTypes) throws 
NoSuchMethodException {
+try {
+return AccessController.doPrivileged(new 
PrivilegedExceptionAction() {
+public Method run() throws Exception {
+return clazz.getMethod(name, parameterTypes);
+}
+});
+} catch (PrivilegedActionException pae) {
+Exception e = pae.getException();
+if (e instanceof NoSuchMethodException) {
+throw (NoSuchMethodException)e;
+} else {
+throw new SecurityException(e);
+}
+}
+}
 
 public static Field[] getDeclaredFields(final Class cls) {
 return AccessController.doPrivileged(new PrivilegedAction() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/288e48af/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
index ae75b36..81d7b97 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
@@ -79,7 +79,7 @@ public class JAXWSMethodInvoker extends 
AbstractJAXWSMethodInvoker {
 final MessageContext oldCtx = 
WebServiceContextImpl.setMessageContext(ctx);
 List res = null;
 try {
-if ((params == null || params.isEmpty()) && 
m.getDeclaringClass().equals(Provider.class)) {
+if ((params == null || params.isEmpty()) && serviceObject 
instanceof Provider) {
 params = Collections.singletonList(null);
 }
 res = CastUtils.cast((List)super.invoke(exchange, 
serviceObject, m, params));

http://git-wip-us.apache.org/repos/asf/cxf/blob/288e48af/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
index dfa323e..8b534e4 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
 
 import javax.xml.ws.Provider;
 
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -36,9 +37,16 @@ public class JAXWSProviderMethodDispatcher
 
 public JAXWSProviderMethodDispatcher(JaxWsImplementorInfo implInfo) {
 try {
-invoke = Provider.class.getMethod("invoke", new Class[] 
{Object.class});
-} catch (Exception e) {
-throw new ServiceConstructionException(e);
+invoke = ReflectionUtil.getMethod(implInfo.getImplementorClass(), 
"invoke", 

[1/2] cxf git commit: [CXF-5697] Some minor updates for WHICH_JAR

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 4e5119b3d -> 62f994427


[CXF-5697] Some minor updates for WHICH_JAR


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

Branch: refs/heads/master
Commit: 62f994427bdd12863dc987e348eec1e24e6ce849
Parents: 288e48a
Author: Daniel Kulp 
Authored: Mon Mar 27 14:13:51 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Mar 27 14:22:08 2017 -0400

--
 distribution/src/main/release/lib/WHICH_JARS | 29 ++-
 1 file changed, 12 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/62f99442/distribution/src/main/release/lib/WHICH_JARS
--
diff --git a/distribution/src/main/release/lib/WHICH_JARS 
b/distribution/src/main/release/lib/WHICH_JARS
index 997eaba..e7e87bc 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -37,6 +37,7 @@ For Java2WSDL and WSDL2Java:
 - commons-collections.jar
 - commons-lang.jar
 - cxf-rt-wsdl.jar
+- cxf-rt-tools*.jar
 - cxf-xjc*.jar (optional, these are xjc extensions for providing enhanced
 JAXB code generation)
 
@@ -71,13 +72,7 @@ For standalone HTTP support use Jetty:
 - sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
 - cxf-rt-transports-http-jetty.jar
 
-For standalone HTTP support use Netty:
-- geronimo-servlet.jar
-- netty-*.jar
-- cxf-rt-transports-http-netty.jar
- 
 For Aegis support:
-- jdom.jar (optional, if you want to map xsd:anyType to JDOM)
 - cxf-rt-databinding-aegis.jar
 
 For WS-Security support:
@@ -85,21 +80,19 @@ For WS-Security support:
 - xmlsec.jar
 - ehcache-core.jar
 - jasypt.jar
+- cxf-rt-security.jar
 - cxf-rt-ws-security.jar
+- bcprov-jdk15on.jar (optional)
 
 For SAML support in WS-Security
-- joda-time.jar 
-- opensaml.jar
-- openws.jar
-- xmltooling.jar
-- xalan.jar
+- joda-time.jar
+- cryptacular.jar
+- java-support.jar
+- opensaml*.jar
+- commons-code.jar
+- cxf-rt-security-saml.jar
 
 For JAX-RS support:
-- abdera*  (optional: for AtomPub support, but also needed for the 
-Management log browser console)
-- commons-codec.jar (Needed for Abdera)
-- jaxen.jar (Needed for Abdera)
-- axiom* (Needed for Abdera)
 - javax.ws.rs-api.jar
 - jettison.jar (Needed for JSON services only)
 - oauth*.jar (Needed for OAuth support)
@@ -126,12 +119,14 @@ For the Async HTTP client transport
 
 For CORBA support:
 - antlr.jar
+- cxf-rt-bindings-corba.jar
 
 For JavaScript functionality:
 - js.jar
+- cxf-rt-javascript
+- cxf-rt-frontend-js
 
 For schema validation with the Aegis data binding.
-
  - msv-core.jar
  - xsdlib.jar
  - isorelax.jar

cxf git commit: Updating ClineXmlSecInInterceptor, deleting the enc one which is not actually needed

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 30e2b03d1 -> 449e39521


Updating ClineXmlSecInInterceptor, deleting the enc one which is not actually 
needed


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

Branch: refs/heads/3.1.x-fixes
Commit: 449e39521d11861c050ea53afe06d27690210e9e
Parents: 30e2b03
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:47:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:51:58 2017 +0100

--
 .../security/xml/ClientXmlEncInInterceptor.java | 36 
 .../security/xml/ClientXmlSecInInterceptor.java | 22 
 .../rs/security/xml/XmlSecInInterceptor.java| 21 +++-
 3 files changed, 29 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/449e3952/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
deleted file mode 100644
index 42761f1..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-
-public class ClientXmlEncInInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
-
-@Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
-}
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/449e3952/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
index f270d1b..cfbc508 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
@@ -20,17 +20,27 @@ package org.apache.cxf.rs.security.xml;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
 
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
 
-public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ClientResponseFilter {
+public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ReaderInterceptor {
 
 @Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
+public Object aroundReadFrom(ReaderInterceptorContext ctx) throws 
IOException, WebApplicationException {
+Message message = JAXRSUtils.getCurrentMessage();
+handleMessage(message);
+Object object = ctx.proceed();
+new StaxActionInInterceptor(super.isRequireSignature(), 
+

cxf git commit: Updating ClineXmlSecInInterceptor, deleting the enc one which is not actually needed

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 30cc8717a -> 4e5119b3d


Updating ClineXmlSecInInterceptor, deleting the enc one which is not actually 
needed


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

Branch: refs/heads/master
Commit: 4e5119b3d1d807fb6885ec67ce28180beb55c360
Parents: 30cc871
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:47:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:47:16 2017 +0100

--
 .../security/xml/ClientXmlEncInInterceptor.java | 36 
 .../security/xml/ClientXmlSecInInterceptor.java | 22 
 .../rs/security/xml/XmlSecInInterceptor.java| 11 --
 3 files changed, 24 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4e5119b3/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
deleted file mode 100644
index 42761f1..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-
-public class ClientXmlEncInInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
-
-@Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
-}
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/4e5119b3/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
index f270d1b..cfbc508 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
@@ -20,17 +20,27 @@ package org.apache.cxf.rs.security.xml;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
 
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.message.Message;
 
-public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ClientResponseFilter {
+public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ReaderInterceptor {
 
 @Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
+public Object aroundReadFrom(ReaderInterceptorContext ctx) throws 
IOException, WebApplicationException {
+Message message = JAXRSUtils.getCurrentMessage();
+handleMessage(message);
+Object object = ctx.proceed();
+new StaxActionInInterceptor(super.isRequireSignature(), 
+

[2/2] cxf git commit: Updating the interceptor name

[sergeyb]

Updating the interceptor name


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

Branch: refs/heads/3.1.x-fixes
Commit: 30e2b03d1e7ed9990886c0f584c35800fea2fccc
Parents: 516f8cb
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:21:00 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:24:04 2017 +0100

--
 .../security/xml/ClientXmlEncInInterceptor.java | 36 
 .../security/xml/ClientXmlEncInterceptor.java   | 36 
 2 files changed, 36 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/30e2b03d/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
new file mode 100644
index 000..42761f1
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlEncInInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+handleMessage(JAXRSUtils.getCurrentMessage());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/30e2b03d/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
deleted file mode 100644
index 1cfa36e..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-
-public class ClientXmlEncInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
-
-@Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
-}
-
-}

[1/2] cxf git commit: Making it possible for to run XMLSec in interceptors as JAXRS client response filters

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 15c7bcde4 -> 30e2b03d1


Making it possible for to run XMLSec in interceptors as JAXRS client response 
filters


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

Branch: refs/heads/3.1.x-fixes
Commit: 516f8cbe28b6fa73969bdcf96f447a675fafe023
Parents: 15c7bcd
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:18:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:24:03 2017 +0100

--
 .../security/xml/ClientXmlEncInterceptor.java   | 36 
 .../security/xml/ClientXmlSecInInterceptor.java | 36 
 2 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/516f8cbe/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
new file mode 100644
index 000..1cfa36e
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlEncInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+handleMessage(JAXRSUtils.getCurrentMessage());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/516f8cbe/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
new file mode 100644
index 000..f270d1b
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+

cxf git commit: Updating the interceptor name

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 2fbedb176 -> 30cc8717a


Updating the interceptor name


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

Branch: refs/heads/master
Commit: 30cc8717a36ea268be253bd391702d4dd7dc54ad
Parents: 2fbedb1
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:21:00 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:21:00 2017 +0100

--
 .../security/xml/ClientXmlEncInInterceptor.java | 36 
 .../security/xml/ClientXmlEncInterceptor.java   | 36 
 2 files changed, 36 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/30cc8717/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
new file mode 100644
index 000..42761f1
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlEncInInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+handleMessage(JAXRSUtils.getCurrentMessage());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/30cc8717/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
deleted file mode 100644
index 1cfa36e..000
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.rs.security.xml;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
-
-public class ClientXmlEncInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
-
-@Override
-public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
-handleMessage(JAXRSUtils.getCurrentMessage());
-}
-
-}

cxf git commit: Making it possible for to run XMLSec in interceptors as JAXRS client response filters

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 127acfcf2 -> 2fbedb176


Making it possible for to run XMLSec in interceptors as JAXRS client response 
filters


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

Branch: refs/heads/master
Commit: 2fbedb1767ceb582bbae895baad98a649739d47b
Parents: 127acfc
Author: Sergey Beryozkin 
Authored: Mon Mar 27 17:18:16 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 17:18:16 2017 +0100

--
 .../security/xml/ClientXmlEncInterceptor.java   | 36 
 .../security/xml/ClientXmlSecInInterceptor.java | 36 
 2 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2fbedb17/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
new file mode 100644
index 000..1cfa36e
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlEncInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlEncInterceptor extends XmlEncInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+handleMessage(JAXRSUtils.getCurrentMessage());
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/2fbedb17/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
new file mode 100644
index 000..f270d1b
--- /dev/null
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/ClientXmlSecInInterceptor.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.rs.security.xml;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+
+public class ClientXmlSecInInterceptor extends XmlSecInInterceptor implements 
ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext reqCtx, ClientResponseContext 
respCtx) throws IOException {
+handleMessage(JAXRSUtils.getCurrentMessage());

cxf git commit: [CXF-7300] Treating BigIntergers as positive values due to RSA and JWA spec backing it up, with thanks to Andriy Mahats

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3a14d3852 -> 15c7bcde4


[CXF-7300] Treating BigIntergers as positive values due to RSA and JWA spec 
backing it up, with thanks to Andriy Mahats


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

Branch: refs/heads/3.1.x-fixes
Commit: 15c7bcde4ff8a741a79af1444e7d67442c48fd7a
Parents: 3a14d38
Author: Sergey Beryozkin 
Authored: Mon Mar 27 13:41:42 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 13:46:27 2017 +0100

--
 .../cxf/rs/security/jose/jwk/JwkUtilsTest.java  | 43 
 .../cxf/rt/security/crypto/CryptoUtils.java | 24 ---
 2 files changed, 62 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/15c7bcde/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
 
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
index 762f7f8..99a930b 100644
--- 
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
+++ 
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwk/JwkUtilsTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.rs.security.jose.jwk;
 
+import java.math.BigInteger;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
@@ -25,6 +26,7 @@ import org.apache.cxf.rs.security.jose.common.JoseException;
 import org.apache.cxf.rs.security.jose.common.JoseUtils;
 import org.apache.cxf.rs.security.jose.common.KeyManagementUtils;
 import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
+import org.apache.cxf.rt.security.crypto.CryptoUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -90,11 +92,52 @@ public class JwkUtilsTest extends Assert {
   null);
 JsonWebKey jwk1 = JwkUtils.fromRSAPrivateKey(privateKey1, 
KeyAlgorithm.RSA_OAEP_256.getJwaName());
 assertNotNull(jwk1.getProperty(JsonWebKey.RSA_PUBLIC_EXP));
+assertNotNull(jwk1.getProperty(JsonWebKey.RSA_PRIVATE_EXP));
 RSAPrivateKey privateKey2 = JwkUtils.toRSAPrivateKey(jwk1);
 assertEquals(privateKey2, privateKey1);
 
 }
 @Test
+public void testFromToPublicRsaKey() throws Exception {
+RSAPublicKey publicKey1 =
+
(RSAPublicKey)KeyManagementUtils.loadPublicKey("org/apache/cxf/rs/security/jose/jws/alice.jks",
+  "password",
+  "alice",
+  null);
+JsonWebKey jwk1 = JwkUtils.fromRSAPublicKey(publicKey1, 
KeyAlgorithm.RSA_OAEP_256.getJwaName());
+assertNotNull(jwk1.getProperty(JsonWebKey.RSA_PUBLIC_EXP));
+assertNull(jwk1.getProperty(JsonWebKey.RSA_PRIVATE_EXP));
+RSAPublicKey publicKey2 = JwkUtils.toRSAPublicKey(jwk1);
+assertEquals(publicKey2, publicKey1);
+
+}
+@Test
+public void testFromToPublicRsaKey2() throws Exception {
+BigInteger n = new BigInteger(
+
"525569531153621228164069013206963023039121751335221395180741421479892725873020691336158448746650762107595"
++ 
"8352148531548486906896903886764928450353366890712125983926472500064566992690642117517954169974907061547"
++ 
"3353190040609042090075291281955112293781438730376121249764205272939686534594208819023639183157456093565"
++ 
"4148815673814517535941780340023556224072529306118783149589148262622268860151306096159642808944513667279"
++ 
"4704664637866917427597486905443676772669967766269923280637049233876979061993814679654208850149406432368"
++ 
"2161337544093644200063709176660451323844399667162451308704624790051211834667782115390754507376506824717"
++ 
"9938484919159962066058375588059543574624283546151162925649987580839763809787286157381728046746195701379"
++ 
"090229385044256199577462893041808211586472833072310174368232384797709242627319756376556142528218939"
++ 
"7783875183123336240582938265783686836202210705597100765098627429017295706176890505466946207401105614189"
++ 
"2784165813507235148683348014201150784998715061575093867666453332433607035581378251824779499939486011300"
++ 

[1/2] cxf git commit: [CXF-7301] Trying to catch the in exceptions with the status less than 300 (the higher-value status will generate an exception)

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 7680385c3 -> b1808da98


[CXF-7301] Trying to catch the in exceptions with the status less than 300 (the 
higher-value status will generate an exception)


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

Branch: refs/heads/3.0.x-fixes
Commit: c5a9af5bac7b580658e164cde7cb417c3141428e
Parents: 0928b2f
Author: Sergey Beryozkin 
Authored: Mon Mar 27 12:26:34 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 12:44:15 2017 +0100

--
 .../org/apache/cxf/jaxrs/client/AbstractClient.java|  8 +---
 .../systest/jaxrs/security/xml/JAXRSXmlSecTest.java| 13 +++--
 2 files changed, 8 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a9af5b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 3053e41..f9d5cd1 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -566,8 +566,9 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-ex = message.getContent(Exception.class);
-
+if (ex == null) {
+ex = message.getContent(Exception.class);
+}
 if (ex != null
 || PropertyUtils.isTrue(exchange.get(SERVICE_NOT_AVAIL_PROPERTY))
 && 
PropertyUtils.isTrue(exchange.get(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY))) {
@@ -587,7 +588,8 @@ public abstract class AbstractClient implements Client {
 
 Exchange exchange = outMessage.getExchange();
 Integer responseCode = getResponseCode(exchange);
-if (responseCode == null 
+if (responseCode == null
+|| responseCode < 300 && !(actualEx instanceof IOException) 
 || actualEx instanceof IOException && 
exchange.get("client.redirect.exception") != null) {
 if (actualEx instanceof ProcessingException) {
 throw (RuntimeException)actualEx;

http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a9af5b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index 64e14ca..02b743d 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.systest.jaxrs.security.Book;
 import org.apache.cxf.systest.jaxrs.security.BookStore;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.xml.security.encryption.XMLCipher;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -270,11 +271,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 } catch (WebApplicationException ex) {
 fail(ex.getMessage());
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 }
 
@@ -484,11 +481,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 fail(ex.getMessage());
 }
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 
 }

[2/2] cxf git commit: Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes

[sergeyb]

Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 
3.0.x-fixes


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

Branch: refs/heads/3.0.x-fixes
Commit: b1808da98a82709fbf794e1762891647eac4d1d6
Parents: c5a9af5 7680385
Author: Sergey Beryozkin 
Authored: Mon Mar 27 12:44:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 12:44:22 2017 +0100

--
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  7 ++
 .../org/apache/cxf/systest/jaxrs/XXETest.java   | 54 ++
 .../jaxrs/src/test/resources/logging.properties | 74 
 3 files changed, 135 insertions(+)
--

cxf git commit: Adding a test to make sure that XXE declarations are not processed

[coheigea]

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


Adding a test to make sure that XXE declarations are not processed


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

Branch: refs/heads/3.0.x-fixes
Commit: 7680385c322955fc6d0dcf64d538bbf93919c766
Parents: 0928b2f
Author: Colm O hEigeartaigh 
Authored: Mon Mar 27 12:15:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Mar 27 12:31:01 2017 +0100

--
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  7 ++
 .../org/apache/cxf/systest/jaxrs/XXETest.java   | 54 ++
 .../jaxrs/src/test/resources/logging.properties | 74 
 3 files changed, 135 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7680385c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 37fb3b2..09dedbc 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -315,6 +315,13 @@ public class BookStore {
 }
 
 @POST
+@Path("/echoxmlbook")
+@Produces("application/xml")
+public Book echoXmlBook(Book book) {
+return book;
+}
+
+@POST
 @Path("/emptyform")
 @Produces("text/plain")
 @Consumes(MediaType.APPLICATION_FORM_URLENCODED)

http://git-wip-us.apache.org/repos/asf/cxf/blob/7680385c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
new file mode 100644
index 000..68f7499
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * A test to make sure that DOCTYPE declarations are not allowed
+ */
+public class XXETest extends AbstractBusClientServerTestBase {
+public static final String PORT = BookServer.PORT;
+
+@BeforeClass
+public static void startServers() throws Exception {
+AbstractResourceInfo.clearAllMaps();
+assertTrue("server did not launch correctly",
+   launchServer(BookServer.class, true));
+createStaticBus();
+}
+
+@Test
+public void testEchoXmlBookQuery() throws Exception {
+String address = "http://localhost:; + PORT + "/bookstore/echoxmlbook";
+
+WebClient webClient = 
WebClient.create(address).accept("application/xml");
+String payload = "]>"
++ "125";
+Book b = webClient.post(payload, Book.class);
+assertEquals(125L, b.getId());
+assertEquals("", b.getName());
+}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/7680385c/systests/jaxrs/src/test/resources/logging.properties
--
diff --git a/systests/jaxrs/src/test/resources/logging.properties 
b/systests/jaxrs/src/test/resources/logging.properties
new file mode 100644
index 000..b2e5a79
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/logging.properties
@@ -0,0 +1,74 @@
+#
+#
+#Licensed to the Apache Software Foundation (ASF) under one

[1/2] cxf git commit: [CXF-7301] Trying to catch the in exceptions with the status less than 300 (the higher-value status will generate an exception)

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4816a975b -> 3a14d3852


[CXF-7301] Trying to catch the in exceptions with the status less than 300 (the 
higher-value status will generate an exception)


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

Branch: refs/heads/3.1.x-fixes
Commit: 95fb948cb8b008791028c5c36db700722ca2e0d1
Parents: fd28dc9
Author: Sergey Beryozkin 
Authored: Mon Mar 27 12:26:34 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 12:31:55 2017 +0100

--
 .../org/apache/cxf/jaxrs/client/AbstractClient.java|  7 +--
 .../systest/jaxrs/security/xml/JAXRSXmlSecTest.java| 13 +++--
 2 files changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/95fb948c/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 8dfeb6e..30e032f 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -568,7 +568,9 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-ex = message.getContent(Exception.class);
+if (ex == null) {
+ex = message.getContent(Exception.class);
+}
 if (ex != null
 || PropertyUtils.isTrue(exchange.get(SERVICE_NOT_AVAIL_PROPERTY))
 && 
PropertyUtils.isTrue(exchange.get(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY))) {
@@ -588,7 +590,8 @@ public abstract class AbstractClient implements Client {
 
 Exchange exchange = outMessage.getExchange();
 Integer responseCode = getResponseCode(exchange);
-if (responseCode == null 
+if (responseCode == null
+|| responseCode < 300 && !(actualEx instanceof IOException) 
 || actualEx instanceof IOException && 
exchange.get("client.redirect.exception") != null) {
 if (actualEx instanceof ProcessingException) {
 throw (RuntimeException)actualEx;

http://git-wip-us.apache.org/repos/asf/cxf/blob/95fb948c/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index f1b22c3..b1c42d8 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.systest.jaxrs.security.Book;
 import org.apache.cxf.systest.jaxrs.security.BookStore;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.xml.security.encryption.XMLCipher;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -305,11 +306,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 } catch (WebApplicationException ex) {
 fail(ex.getMessage());
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 }
 
@@ -519,11 +516,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 fail(ex.getMessage());
 }
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 
 }

[2/2] cxf git commit: Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes

[sergeyb]

Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 
3.1.x-fixes


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

Branch: refs/heads/3.1.x-fixes
Commit: 3a14d385226d8af92b9998bd9258464abf313e15
Parents: 95fb948 4816a97
Author: Sergey Beryozkin 
Authored: Mon Mar 27 12:32:04 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 12:32:04 2017 +0100

--
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  7 ++
 .../org/apache/cxf/systest/jaxrs/XXETest.java   | 54 ++
 .../jaxrs/src/test/resources/logging.properties | 74 
 3 files changed, 135 insertions(+)
--

cxf git commit: Adding a test to make sure that XXE declarations are not processed

[coheigea]

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


Adding a test to make sure that XXE declarations are not processed


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

Branch: refs/heads/3.1.x-fixes
Commit: 4816a975b160014683cbe30b156b9f41b1ceac70
Parents: fd28dc9
Author: Colm O hEigeartaigh 
Authored: Mon Mar 27 12:15:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Mar 27 12:23:19 2017 +0100

--
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  7 ++
 .../org/apache/cxf/systest/jaxrs/XXETest.java   | 54 ++
 .../jaxrs/src/test/resources/logging.properties | 74 
 3 files changed, 135 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4816a975/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 28dfa0c..eef353d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -323,6 +323,13 @@ public class BookStore {
 }
 
 @POST
+@Path("/echoxmlbook")
+@Produces("application/xml")
+public Book echoXmlBook(Book book) {
+return book;
+}
+
+@POST
 @Path("/emptyform")
 @Produces("text/plain")
 @Consumes(MediaType.APPLICATION_FORM_URLENCODED)

http://git-wip-us.apache.org/repos/asf/cxf/blob/4816a975/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
new file mode 100644
index 000..68f7499
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * A test to make sure that DOCTYPE declarations are not allowed
+ */
+public class XXETest extends AbstractBusClientServerTestBase {
+public static final String PORT = BookServer.PORT;
+
+@BeforeClass
+public static void startServers() throws Exception {
+AbstractResourceInfo.clearAllMaps();
+assertTrue("server did not launch correctly",
+   launchServer(BookServer.class, true));
+createStaticBus();
+}
+
+@Test
+public void testEchoXmlBookQuery() throws Exception {
+String address = "http://localhost:; + PORT + "/bookstore/echoxmlbook";
+
+WebClient webClient = 
WebClient.create(address).accept("application/xml");
+String payload = "]>"
++ "125";
+Book b = webClient.post(payload, Book.class);
+assertEquals(125L, b.getId());
+assertEquals("", b.getName());
+}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/4816a975/systests/jaxrs/src/test/resources/logging.properties
--
diff --git a/systests/jaxrs/src/test/resources/logging.properties 
b/systests/jaxrs/src/test/resources/logging.properties
new file mode 100644
index 000..b2e5a79
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/logging.properties
@@ -0,0 +1,74 @@
+#
+#
+#Licensed to the Apache Software Foundation (ASF) under one

cxf git commit: [CXF-7301] Trying to catch the in exceptions with the status less than 300 (the higher-value status will generate an exception)

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 15929d58e -> 417fb946e


[CXF-7301] Trying to catch the in exceptions with the status less than 300 (the 
higher-value status will generate an exception)


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

Branch: refs/heads/master
Commit: 417fb946eec38f403d915e90f405594675a7f7e0
Parents: 15929d5
Author: Sergey Beryozkin 
Authored: Mon Mar 27 12:26:34 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Mar 27 12:26:34 2017 +0100

--
 .../org/apache/cxf/jaxrs/client/AbstractClient.java|  5 -
 .../systest/jaxrs/security/xml/JAXRSXmlSecTest.java| 13 +++--
 2 files changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/417fb946/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 27c1b31..63bd861 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -568,7 +568,9 @@ public abstract class AbstractClient implements Client {
 }
 }
 }
-ex = message.getContent(Exception.class);
+if (ex == null) {
+ex = message.getContent(Exception.class);
+}
 if (ex != null
 || PropertyUtils.isTrue(exchange.get(SERVICE_NOT_AVAIL_PROPERTY))
 && 
PropertyUtils.isTrue(exchange.get(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY))) {
@@ -589,6 +591,7 @@ public abstract class AbstractClient implements Client {
 Exchange exchange = outMessage.getExchange();
 Integer responseCode = getResponseCode(exchange);
 if (responseCode == null
+|| responseCode < 300 && !(actualEx instanceof IOException) 
 || actualEx instanceof IOException && 
exchange.get("client.redirect.exception") != null) {
 if (actualEx instanceof ProcessingException) {
 throw (RuntimeException)actualEx;

http://git-wip-us.apache.org/repos/asf/cxf/blob/417fb946/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index c1b2d7d..e8ec9c9 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.systest.jaxrs.security.Book;
 import org.apache.cxf.systest.jaxrs.security.BookStore;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.xml.security.encryption.XMLCipher;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -305,11 +306,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 } catch (WebApplicationException ex) {
 fail(ex.getMessage());
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 }
 
@@ -519,11 +516,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 fail(ex.getMessage());
 }
 } catch (ProcessingException ex) {
-if (ex.getCause() != null && ex.getCause().getMessage() != null) {
-fail(ex.getCause().getMessage());
-} else {
-fail(ex.getMessage());
-}
+assertTrue(ex.getCause() instanceof BadRequestException);
 }
 
 }

cxf git commit: Adding a test to make sure that XXE declarations are not processed

[coheigea]

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


Adding a test to make sure that XXE declarations are not processed


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

Branch: refs/heads/master
Commit: 15929d58e9535701076b6afa13b1b250d6bae157
Parents: 10ed38c
Author: Colm O hEigeartaigh 
Authored: Mon Mar 27 12:15:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Mar 27 12:15:10 2017 +0100

--
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  7 ++
 .../org/apache/cxf/systest/jaxrs/XXETest.java   | 54 ++
 .../jaxrs/src/test/resources/logging.properties | 74 
 3 files changed, 135 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/15929d58/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index e0423a3..d71473b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -323,6 +323,13 @@ public class BookStore {
 }
 
 @POST
+@Path("/echoxmlbook")
+@Produces("application/xml")
+public Book echoXmlBook(Book book) {
+return book;
+}
+
+@POST
 @Path("/emptyform")
 @Produces("text/plain")
 @Consumes(MediaType.APPLICATION_FORM_URLENCODED)

http://git-wip-us.apache.org/repos/asf/cxf/blob/15929d58/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
new file mode 100644
index 000..68f7499
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.jaxrs;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * A test to make sure that DOCTYPE declarations are not allowed
+ */
+public class XXETest extends AbstractBusClientServerTestBase {
+public static final String PORT = BookServer.PORT;
+
+@BeforeClass
+public static void startServers() throws Exception {
+AbstractResourceInfo.clearAllMaps();
+assertTrue("server did not launch correctly",
+   launchServer(BookServer.class, true));
+createStaticBus();
+}
+
+@Test
+public void testEchoXmlBookQuery() throws Exception {
+String address = "http://localhost:; + PORT + "/bookstore/echoxmlbook";
+
+WebClient webClient = 
WebClient.create(address).accept("application/xml");
+String payload = "]>"
++ "125";
+Book b = webClient.post(payload, Book.class);
+assertEquals(125L, b.getId());
+assertEquals("", b.getName());
+}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/15929d58/systests/jaxrs/src/test/resources/logging.properties
--
diff --git a/systests/jaxrs/src/test/resources/logging.properties 
b/systests/jaxrs/src/test/resources/logging.properties
new file mode 100644
index 000..b2e5a79
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/logging.properties
@@ -0,0 +1,74 @@
+#
+#
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more