cxf git commit: Fix compile failure with java6

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 353f559cf -> e85582a9b


Fix compile failure with java6


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

Branch: refs/heads/3.0.x-fixes
Commit: e85582a9b657bc7167f4838ad3c8008b8494f79d
Parents: 353f559
Author: Daniel Kulp 
Authored: Fri Mar 31 18:37:14 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 18:37:14 2017 -0400

--
 .../cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e85582a9/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index e9f1611..d2e4e11 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -608,7 +608,7 @@ public class JAXBDataBinding implements DataBindingProfile {
 SchemaCompiler schemaCompiler,
 SchemaCollection schemaCollection) {
 
-Set ids = new HashSet<>();
+Set ids = new HashSet();
 @SuppressWarnings("unchecked")
 List serviceList = 
(List)context.get(ToolConstants.SERVICE_LIST);
 for (ServiceInfo si : serviceList) {
@@ -715,7 +715,7 @@ public class JAXBDataBinding implements DataBindingProfile {
   Options opts,
   SchemaCompiler schemaCompiler,
   SchemaCollection schemaCollection) {
-Set ids = new HashSet<>();
+Set ids = new HashSet();
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
 String key = sci.getSystemId();

[2/3] cxf git commit: [CXF-6731/CXF-6580] Fix bug introduced by CXF-6580

[dkulp]

[CXF-6731/CXF-6580] Fix bug introduced by CXF-6580

# Conflicts:
#   
tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java


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

Branch: refs/heads/3.0.x-fixes
Commit: d8d709cfa69e99f81cf0fd3e21357be90040ea6a
Parents: 8e4d8ed
Author: Daniel Kulp 
Authored: Fri Mar 31 14:22:50 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:33:18 2017 -0400

--
 .../wsdlto/databinding/jaxb/JAXBDataBinding.java   | 17 +
 .../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java |  8 
 2 files changed, 21 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d8d709cf/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index 8daf996..e9f1611 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -604,12 +604,12 @@ public class JAXBDataBinding implements 
DataBindingProfile {
 return result;
 }
 
-@SuppressWarnings("unchecked")
 private void addSchemas(Options opts,
 SchemaCompiler schemaCompiler,
 SchemaCollection schemaCollection) {
 
-Set ids = new HashSet();
+Set ids = new HashSet<>();
+@SuppressWarnings("unchecked")
 List serviceList = 
(List)context.get(ToolConstants.SERVICE_LIST);
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
@@ -672,8 +672,10 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 continue;
 }
 String key = schema.getSourceURI();
+String tns = schema.getTargetNamespace();
+String ltns = schema.getLogicalTargetNamespace();
 // accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
-if (ids.contains(key)) {
+if (ids.contains(key) || (tns == null && 
!StringUtils.isEmpty(ltns))) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {
@@ -706,7 +708,14 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 }
 }
 }
-ids.clear();
+addSchemasForServiceInfos(catalog, serviceList, opts, schemaCompiler, 
schemaCollection);
+}
+private void addSchemasForServiceInfos(OASISCatalogManager catalog,
+   List serviceList,
+  Options opts,
+  SchemaCompiler schemaCompiler,
+  SchemaCollection schemaCollection) {
+Set ids = new HashSet<>();
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
 String key = sci.getSystemId();

http://git-wip-us.apache.org/repos/asf/cxf/blob/d8d709cf/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 27236f8..f3cc145 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1196,6 +1196,14 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 fail("shouldn't get exception");
 }
 }
+
+
+@Test
+public void testsdfasdf() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
+processor.setContext(env);
+processor.execute();
+}
 
 @Test
 public void testCXF5280() throws Exception {

[1/3] cxf git commit: [CXF-7083] Better handling of system property changes in plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 326268973 -> 353f559cf


[CXF-7083] Better handling of system property changes in plugins

# Conflicts:
#   
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
#   
maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
#   
maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 8e4d8edbf8649e9caa0aeed1d57fcfc395469ae2
Parents: 3262689
Author: Daniel Kulp 
Authored: Fri Mar 31 13:22:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:33:10 2017 -0400

--
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 15 --
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 21 ++--
 .../common/ClassLoaderSwitcher.java | 21 +++-
 3 files changed, 17 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e4d8edb/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index b6fff97..9cf75e5 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -24,10 +24,9 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -44,7 +43,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -104,7 +103,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap(System.getProperties());
+origProps = (Properties)System.getProperties().clone();
 
 origClassPath = System.getProperty("java.class.path");
 
@@ -126,13 +125,7 @@ public class ClassLoaderSwitcher {
 }
 
 if (origProps != null) {
-Map newProps = new HashMap(System.getProperties());
-for (Object o : newProps.keySet()) {
-if (!origProps.containsKey(o)) {
-System.clearProperty(o.toString());
-}
-}
-System.getProperties().putAll(origProps);
+System.setProperties(origProps);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8e4d8edb/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 0f8ca2c..a759414 100644
--- 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -23,9 +23,8 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -41,7 +40,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -97,8 +96,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap(System.getProperties());
-
+origProps = (Properties)System.getProperties().clone();
 origClassPath 

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

Branch: refs/heads/3.0.x-fixes
Commit: 353f559cf9ae37d5774929cb316625df5b8b3117
Parents: d8d709c
Author: Daniel Kulp 
Authored: Fri Mar 31 15:33:19 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:33:19 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/353f559c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7bbf381..b0d4681 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -579,6 +579,7 @@ B 55c72f2257e9afaacfcd9de8fe0635ea0de6d786
 B 55e9924dd0694f09ef8b3343b566699dfd2f266f
 B 55f92f4c2c750f13e231482466181eb4bcfdcc74
 B 560c72ef7ad2fef318c0fd65412a39bb9507cf09
+B 5639e679f3e1a6ef9746a59a633a03f0631bdaa7
 B 563ad5b3905ad93d7cff22f8472abbd634234c7d
 B 564e9a6926f7b41982350e796d55bf8c371b912d
 B 5669ebf9b7f3ed1293458d5f3ff3e3e84fde21ef
@@ -1146,6 +1147,7 @@ B b0097f19641e9c42837e87e98d37415026087640
 B b04eaeb4961564786d73dc02c3d0c1276810ae1b
 B b0673b54a2af930cb7730064e2c324debefe3882
 B b08a6ba02f0e67ea29cc69fb5c878fc1e57dee75
+B b0ad4130d33de937d799d27819dd5e67ee77edb4
 B b0b51cf57ba0236f75485183888906c406bfdd51
 B b0ccc3f87b373009f4bd9d9a6a7aa9484e7aca73
 B b0cfaad377fef998773f590afea500a68ddc0ff0

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

Branch: refs/heads/3.1.x-fixes
Commit: b0ad4130d33de937d799d27819dd5e67ee77edb4
Parents: f8511a5
Author: Daniel Kulp 
Authored: Fri Mar 31 15:32:07 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:32:07 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b0ad4130/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2467aab..22c186f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -311,6 +311,7 @@ B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e
 B ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
 B ef13d2b2f8f7b67b7351030a3a097377435371c5
 B efb1f0830f5441777198737fb26e9305ab969f66
+B f03e6313365a853c6c4eea9d5f63532fb92364fb
 B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f12557bd4323e5bb87b4678120f367dcce4b504e
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5
@@ -413,6 +414,7 @@ M 6613e46662317ea151f72e26e5deb4f50148a148
 M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
 M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
 M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
+M 7228709bff3fe66626830b0018547d001588da00
 M 726c0aa641e408a18fa5f4ff82df682d489874f4
 M 7304dfbd8f3044d8d46981abf2058c6cb732d219
 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
@@ -473,6 +475,7 @@ M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
 M ad200706d0ea914987930a64d2f5c14336a0c641
 M ae3ae2a25109375cc82114d15078f04e8c5353c5
 M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
+M b12d8a04f280d39e62a18fa4a8f7946c27f06d75
 M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6

[1/3] cxf git commit: [CXF-7083] Better handling of system property changes in plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 5639e679f -> b0ad4130d


[CXF-7083] Better handling of system property changes in plugins

# Conflicts:
#   
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
#   
maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
#   
maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 2d04ee0c4b6b55772d5746b8f58f6386d264c00b
Parents: 5639e67
Author: Daniel Kulp 
Authored: Fri Mar 31 13:22:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:31:28 2017 -0400

--
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 15 --
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 21 ++--
 .../common/ClassLoaderSwitcher.java | 21 +++-
 3 files changed, 17 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2d04ee0c/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index a8a3fae..6d4442a 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -24,10 +24,9 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -44,7 +43,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -105,7 +104,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap(System.getProperties());
+origProps = (Properties)System.getProperties().clone();
 
 origClassPath = System.getProperty("java.class.path");
 
@@ -127,13 +126,7 @@ public class ClassLoaderSwitcher {
 }
 
 if (origProps != null) {
-Map newProps = new HashMap(System.getProperties());
-for (Object o : newProps.keySet()) {
-if (!origProps.containsKey(o)) {
-System.clearProperty(o.toString());
-}
-}
-System.getProperties().putAll(origProps);
+System.setProperties(origProps);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/2d04ee0c/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index d411616..f3cb6e3 100644
--- 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -23,9 +23,8 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -41,7 +40,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -98,8 +97,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap(System.getProperties());
-
+origProps = (Properties)System.getProperties().clone();
 origClassPath 

[2/3] cxf git commit: [CXF-6731/CXF-6580] Fix bug introduced by CXF-6580

[dkulp]

[CXF-6731/CXF-6580] Fix bug introduced by CXF-6580

# Conflicts:
#   
tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java


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

Branch: refs/heads/3.1.x-fixes
Commit: f8511a5e52ad9055514a4b6aa3ad102ae0f0ae55
Parents: 2d04ee0
Author: Daniel Kulp 
Authored: Fri Mar 31 14:22:50 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 15:31:55 2017 -0400

--
 .../wsdlto/databinding/jaxb/JAXBDataBinding.java   | 17 +
 .../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java |  8 
 2 files changed, 21 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f8511a5e/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index d85ee7d..41f1eeb 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -604,12 +604,12 @@ public class JAXBDataBinding implements 
DataBindingProfile {
 return result;
 }
 
-@SuppressWarnings("unchecked")
 private void addSchemas(Options opts,
 SchemaCompiler schemaCompiler,
 SchemaCollection schemaCollection) {
 
-Set ids = new HashSet();
+Set ids = new HashSet<>();
+@SuppressWarnings("unchecked")
 List serviceList = 
(List)context.get(ToolConstants.SERVICE_LIST);
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
@@ -672,8 +672,10 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 continue;
 }
 String key = schema.getSourceURI();
+String tns = schema.getTargetNamespace();
+String ltns = schema.getLogicalTargetNamespace();
 // accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
-if (ids.contains(key)) {
+if (ids.contains(key) || (tns == null && 
!StringUtils.isEmpty(ltns))) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {
@@ -706,7 +708,14 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 }
 }
 }
-ids.clear();
+addSchemasForServiceInfos(catalog, serviceList, opts, schemaCompiler, 
schemaCollection);
+}
+private void addSchemasForServiceInfos(OASISCatalogManager catalog,
+   List serviceList,
+  Options opts,
+  SchemaCompiler schemaCompiler,
+  SchemaCollection schemaCollection) {
+Set ids = new HashSet<>();
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
 String key = sci.getSystemId();

http://git-wip-us.apache.org/repos/asf/cxf/blob/f8511a5e/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 30d3031..db2acba 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1195,6 +1195,14 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 fail("shouldn't get exception");
 }
 }
+
+
+@Test
+public void testsdfasdf() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
+processor.setContext(env);
+processor.execute();
+}
 
 @Test
 public void testCXF5280() throws Exception {

[3/3] cxf git commit: [CXF-6185] Updates to ClientPolicyCalculator to handle optional chunking/autoredirect Patch from Xu ShiChang Desmond applied

[dkulp]

[CXF-6185] Updates to ClientPolicyCalculator to handle optional 
chunking/autoredirect
Patch from Xu ShiChang Desmond applied


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

Branch: refs/heads/master
Commit: f03e6313365a853c6c4eea9d5f63532fb92364fb
Parents: 7228709
Author: Daniel Kulp 
Authored: Fri Mar 31 14:43:46 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 14:56:36 2017 -0400

--
 .../policy/impl/ClientPolicyCalculator.java | 20 
 .../http/policy/ClientPolicyCalculatorTest.java |  1 +
 .../transport/http/policy/PolicyUtilsTest.java  |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f03e6313/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
index 1746b66..629bcac 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
@@ -32,7 +32,7 @@ public class ClientPolicyCalculator implements 
PolicyCalculatorhttp://git-wip-us.apache.org/repos/asf/cxf/blob/f03e6313/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
--
diff --git 
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
 
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 8b04511..053d18c 100644
--- 
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ 
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -37,6 +37,7 @@ public class ClientPolicyCalculatorTest extends Assert {
 p1.setConnectionTimeout(1);
 assertTrue("Policies are not compatible.", calc.compatible(p1, p2));
 p1.setAllowChunking(false);
+p2.setAllowChunking(true);
 assertTrue("Policies are compatible.", !calc.compatible(p1, p2));
 p2.setAllowChunking(false);
 assertTrue("Policies are compatible.", calc.compatible(p1, p2));

http://git-wip-us.apache.org/repos/asf/cxf/blob/f03e6313/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
--
diff --git 
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
 
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index 563d6f5..ba5696d 100644
--- 
a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ 
b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -138,7 +138,7 @@ public class PolicyUtilsTest extends Assert {
 pde.assertMessage(message, ep, new ClientPolicyCalculator());
 assertTrue(eai.isAsserted());
 assertTrue(cmai.isAsserted());
-assertTrue(outbound ? !icmai.isAsserted() : icmai.isAsserted());
+assertTrue(icmai.isAsserted());
 control.verify();
 }
 

[2/3] cxf git commit: [CXF-6731/CXF-6580] Fix bug introduced by CXF-6580

[dkulp]

[CXF-6731/CXF-6580] Fix bug introduced by CXF-6580


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

Branch: refs/heads/master
Commit: 7228709bff3fe66626830b0018547d001588da00
Parents: b12d8a0
Author: Daniel Kulp 
Authored: Fri Mar 31 14:22:50 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 14:22:50 2017 -0400

--
 .../wsdlto/databinding/jaxb/JAXBDataBinding.java | 15 ---
 .../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java   |  8 
 2 files changed, 20 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7228709b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index 6860b01..50045ce 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -604,12 +604,12 @@ public class JAXBDataBinding implements 
DataBindingProfile {
 return result;
 }
 
-@SuppressWarnings("unchecked")
 private void addSchemas(Options opts,
 SchemaCompiler schemaCompiler,
 SchemaCollection schemaCollection) {
 
 Set ids = new HashSet<>();
+@SuppressWarnings("unchecked")
 List serviceList = 
(List)context.get(ToolConstants.SERVICE_LIST);
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
@@ -672,8 +672,10 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 continue;
 }
 String key = schema.getSourceURI();
+String tns = schema.getTargetNamespace();
+String ltns = schema.getLogicalTargetNamespace();
 // accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
-if (ids.contains(key)) {
+if (ids.contains(key) || (tns == null && 
!StringUtils.isEmpty(ltns))) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {
@@ -706,7 +708,14 @@ public class JAXBDataBinding implements DataBindingProfile 
{
 }
 }
 }
-ids.clear();
+addSchemasForServiceInfos(catalog, serviceList, opts, schemaCompiler, 
schemaCollection);
+}
+private void addSchemasForServiceInfos(OASISCatalogManager catalog,
+   List serviceList,
+  Options opts,
+  SchemaCompiler schemaCompiler,
+  SchemaCollection schemaCollection) {
+Set ids = new HashSet<>();
 for (ServiceInfo si : serviceList) {
 for (SchemaInfo sci : si.getSchemas()) {
 String key = sci.getSystemId();

http://git-wip-us.apache.org/repos/asf/cxf/blob/7228709b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index f1e28d6..4d67f65 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -1195,6 +1195,14 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
 fail("shouldn't get exception");
 }
 }
+
+
+@Test
+public void testsdfasdf() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
"/Users/dkulp/Downloads/test/WSDL.wsdl");
+processor.setContext(env);
+processor.execute();
+}
 
 @Test
 public void testCXF5280() throws Exception {

[1/3] cxf git commit: [CXF-7083] Better handling of system property changes in plugins

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master d641562a3 -> f03e63133


[CXF-7083] Better handling of system property changes in plugins


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

Branch: refs/heads/master
Commit: b12d8a04f280d39e62a18fa4a8f7946c27f06d75
Parents: d641562
Author: Daniel Kulp 
Authored: Fri Mar 31 13:22:04 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 13:22:04 2017 -0400

--
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 15 --
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   | 20 ++-
 .../common/ClassLoaderSwitcher.java | 21 +++-
 3 files changed, 17 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b12d8a04/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 220bcc1..ef40d0a 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -24,10 +24,9 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -44,7 +43,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -105,7 +104,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap<>(System.getProperties());
+origProps = (Properties)System.getProperties().clone();
 
 origClassPath = System.getProperty("java.class.path");
 
@@ -127,13 +126,7 @@ public class ClassLoaderSwitcher {
 }
 
 if (origProps != null) {
-Map newProps = new 
HashMap<>(System.getProperties());
-for (Object o : newProps.keySet()) {
-if (!origProps.containsKey(o)) {
-System.clearProperty(o.toString());
-}
-}
-System.getProperties().putAll(origProps);
+System.setProperties(origProps);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/b12d8a04/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
--
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 0c72dbf..2c130b4 100644
--- 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -23,9 +23,8 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -41,7 +40,7 @@ public class ClassLoaderSwitcher {
 
 private Log log;
 private String origClassPath;
-private Map origProps;
+private Properties origProps;
 private ClassLoader origContextClassloader;
 
 public ClassLoaderSwitcher(Log log) {
@@ -98,7 +97,7 @@ public class ClassLoaderSwitcher {
 
 log.debug("Classpath: " + urlList.toString());
 
-origProps = new HashMap<>(System.getProperties());
+origProps = (Properties)System.getProperties().clone();
 
 origClassPath = System.getProperty("java.class.path");
 
@@ -115,18 +114,11 @@ public class ClassLoaderSwitcher {
 
Thread.currentThread().setContextClassLoader(origContextClassloader);
 origContextClassloader = null; // don't hold a reference.
 }
-if (origClassPath != null) {
-System.setProperty("java.

cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 067142ddb -> 5639e679f


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

Branch: refs/heads/3.1.x-fixes
Commit: 5639e679f3e1a6ef9746a59a633a03f0631bdaa7
Parents: 067142d
Author: Daniel Kulp 
Authored: Fri Mar 31 12:50:53 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 12:50:53 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5639e679/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 65bcc65..2467aab 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -269,6 +269,7 @@ B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4
 B d3900dd8431e50e544896cf0ce019595984384bb
 B d3d65670d697fc2a32d72ea305fdc49e693a8fc0
 B d62b480a16b9361d63a99a620b0006a425ebc73f
+B d641562a30b76af9e90ef0c767e2e81e93a4fad7
 B d770183ad67370694e140a4aac9dae6b0753dbf2
 B d8a0a04d9b8b5206c2e24e976a94f328c73a49bf
 B da321593b597711af7307a0fc2c11de070653356
@@ -283,6 +284,7 @@ B e14d803ff84be7c59dd7c2321f1090231967d45c
 B e18b4fb7d5f4f585eea1a2637c5158cd6e0c61af
 B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
 B e1d950605941ef77bd4a3e9e4ad47eb63ac8f221
+B e262bd20dbc8e8567ffe0c8ed3d394191696e981
 B e2efd0386e210d162c7646f4a4f2aa15e9752924
 B e5b9f0e1695e73c33a40248d45fa4eba034d39b3
 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
@@ -458,6 +460,7 @@ M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
 M a2efc18eff09700eded186478a7c2ae8fa543eef
+M a304f27b8ad9da04dde3610932266c64baa3aa7e
 M a42362e397b84d335015f7f9aa07b4f0bfb49260
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
 M a719adccae8500f2d7e7140a9f4cd26e20775818

[2/2] cxf git commit: - implemented AutoCloseable Client This closes #124

[dkulp]

 - implemented AutoCloseable Client
This closes #124


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

Branch: refs/heads/master
Commit: e262bd20dbc8e8567ffe0c8ed3d394191696e981
Parents: ef3ca8e
Author: bilak 
Authored: Thu Mar 31 11:44:32 2016 +0200
Committer: Daniel Kulp 
Committed: Fri Mar 31 12:50:21 2017 -0400

--
 core/src/main/java/org/apache/cxf/endpoint/Client.java|  2 +-
 .../src/main/java/org/apache/cxf/endpoint/ClientImpl.java | 10 ++
 .../apache/cxf/endpoint/dynamic/DynamicClientFactory.java |  6 +++---
 .../apache/cxf/jaxrs/client/FrontendClientAdapter.java|  5 -
 4 files changed, 18 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e262bd20/core/src/main/java/org/apache/cxf/endpoint/Client.java
--
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Client.java 
b/core/src/main/java/org/apache/cxf/endpoint/Client.java
index 6ff2940..27ec1b3 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Client.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Client.java
@@ -31,7 +31,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.MessageObserver;
 
-public interface Client extends InterceptorProvider, MessageObserver, 
ConduitSelectorHolder {
+public interface Client extends InterceptorProvider, MessageObserver, 
ConduitSelectorHolder, AutoCloseable {
 String REQUEST_CONTEXT = "RequestContext";
 String RESPONSE_CONTEXT = "ResponseContext";
 String KEEP_CONDUIT_ALIVE = "KeepConduitAlive";

http://git-wip-us.apache.org/repos/asf/cxf/blob/e262bd20/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
--
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java 
b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 09f8373..9551c3f 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -175,6 +175,11 @@ public class ClientImpl
 }
 }
 
+ClassLoaderHolder holder = bus.getExtension(ClassLoaderHolder.class);
+if (null != holder){
+holder.reset();
+}
+
 bus = null;
 conduitSelector = null;
 outFaultObserver = null;
@@ -1020,6 +1025,11 @@ public class ClientImpl
 return Boolean.TRUE.equals(in.get(Message.PARTIAL_RESPONSE_MESSAGE));
 }
 
+@Override
+public void close() throws Exception {
+destroy();
+}
+
 
 /*
  * modification are echoed back to the shared map

http://git-wip-us.apache.org/repos/asf/cxf/blob/e262bd20/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 1640cfc..36aa236 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -424,7 +424,8 @@ public class DynamicClientFactory {
 ServiceInfo svcfo = 
client.getEndpoint().getEndpointInfo().getService();
 
 // Setup the new classloader!
-ClassLoaderUtils.setThreadContextClassloader(cl);
+ClassLoaderUtils.ClassLoaderHolder holder = 
ClassLoaderUtils.setThreadContextClassloader(cl);
+bus.setExtension(holder, ClassLoaderUtils.ClassLoaderHolder.class);
 
 TypeClassInitializer visitor = new TypeClassInitializer(svcfo,
 
intermediateModel,
@@ -440,7 +441,7 @@ public class DynamicClientFactory {
 
 protected SchemaCompiler createSchemaCompiler() {
 SchemaCompiler compiler =
-JAXBUtils.createSchemaCompilerWithDefaultAllocator(new 
HashSet<>());
+ JAXBUtils.createSchemaCompilerWithDefaultAllocator(new HashSet<>());
 if (schemaCompilerOptions != null && schemaCompilerOptions.length > 0) 
{
 compiler.getOptions().parseArguments(schemaCompilerOptions);
 }
@@ -630,7 +631,6 @@ public class DynamicClientFactory {
 } else {
 javaCompiler.setTarget("1.6");
 }
-
 return javaCompiler.compileFiles(srcList);
 }
 

http://git-wip-us.apache.

[1/2] cxf git commit: Some updates for java8 only and warning cleanups

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master ef3ca8e24 -> d641562a3


Some updates for java8 only and warning cleanups


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

Branch: refs/heads/master
Commit: d641562a30b76af9e90ef0c767e2e81e93a4fad7
Parents: e262bd2
Author: Daniel Kulp 
Authored: Fri Mar 31 12:10:37 2017 -0400
Committer: Daniel Kulp 
Committed: Fri Mar 31 12:50:21 2017 -0400

--
 .../java/org/apache/cxf/endpoint/ClientImpl.java   | 17 +++--
 .../src/main/resources/archetype-resources/pom.xml |  4 ++--
 .../src/main/resources/archetype-resources/pom.xml |  4 ++--
 .../src/main/resources/archetype-resources/pom.xml |  4 ++--
 .../java/org/apache/cxf/jaxws/JaxWsClientTest.java |  1 +
 .../cxf/endpoint/dynamic/DynamicClientFactory.java |  7 +++
 .../test/java/org/apache/cxf/ws/rm/ProxyTest.java  |  3 ++-
 .../wsdl_maven/codegen/src/it/it-parent/pom.xml|  4 ++--
 8 files changed, 21 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d641562a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
--
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java 
b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 9551c3f..504ce8d 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -151,11 +151,13 @@ public class ClientImpl
 if (bus == null) {
 return;
 }
-for (Closeable c : getEndpoint().getCleanupHooks()) {
-try {
-c.close();
-} catch (IOException e) {
-//ignore
+if (getEndpoint() != null) {
+for (Closeable c : getEndpoint().getCleanupHooks()) {
+try {
+c.close();
+} catch (IOException e) {
+//ignore
+}
 }
 }
 ClientLifeCycleManager mgr = 
bus.getExtension(ClientLifeCycleManager.class);
@@ -175,11 +177,6 @@ public class ClientImpl
 }
 }
 
-ClassLoaderHolder holder = bus.getExtension(ClassLoaderHolder.class);
-if (null != holder){
-holder.reset();
-}
-
 bus = null;
 conduitSelector = null;
 outFaultObserver = null;

http://git-wip-us.apache.org/repos/asf/cxf/blob/d641562a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
 
b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
index ca1f68b..01332ce 100644
--- 
a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
+++ 
b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
@@ -73,8 +73,8 @@
 org.apache.maven.plugins
 maven-compiler-plugin
 
-1.7
-1.7
+1.8
+1.8
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d641562a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
 
b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
index babbd78..06f4aa5 100644
--- 
a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
+++ 
b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
@@ -80,8 +80,8 @@
 org.apache.maven.plugins
 maven-compiler-plugin
 
-1.7
-1.7
+1.8
+1.8
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/d641562a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml
 
b/maven-plugins/arc

[2/3] cxf git commit: [CXF-7304] Step1 - using UTF-8 for the decoded destinations given that HttpServletRequest.getPathInfo() uses it by default too and the earlier encooding was used to support a cas

[sergeyb]

[CXF-7304] Step1 - using UTF-8 for the decoded destinations given that 
HttpServletRequest.getPathInfo() uses it by default too and the earlier 
encooding was used to support a case where an endpoint address has 
percent-encoded reserved chars which work fine with UTF-8 too


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

Branch: refs/heads/3.0.x-fixes
Commit: c14363bda9df850433c5bb6eca4e14b86d4c536f
Parents: 3042e7a
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:01:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:25:40 2017 +0100

--
 .../apache/cxf/transport/http/DestinationRegistryImpl.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c14363bd/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 7d01b17..78f0803 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -50,9 +50,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 throw new RuntimeException("Already a destination on " + path);
 }
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.put(URLDecoder.decode(path, "ISO-8859-1"), 
destination);
+decodedDestinations.put(path2, destination);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);
@@ -62,9 +62,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 public synchronized void removeDestination(String path) {
 destinations.remove(path);
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.remove(URLDecoder.decode(path, 
"ISO-8859-1"));
+decodedDestinations.remove(path2);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);

[3/3] cxf git commit: [CXF-7304] Adding a test

[sergeyb]

[CXF-7304] Adding a test


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

Branch: refs/heads/3.0.x-fixes
Commit: 3262689738f01b62321915954c5516382e55cf38
Parents: e9e341c
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:22:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:25:41 2017 +0100

--
 .../cxf/systest/jaxrs/JAXRSUnicodeTest.java | 71 
 .../resources/jaxrs_unicode/WEB-INF/beans.xml   | 35 ++
 .../resources/jaxrs_unicode/WEB-INF/web.xml | 45 +
 3 files changed, 151 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/32626897/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
new file mode 100644
index 000..6f7fd30
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
@@ -0,0 +1,71 @@
+/**
+ * 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 javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase {
+public static final int PORT = SpringServer.PORT;
+
+@BeforeClass
+public static void beforeClass() throws Exception {
+// must be 'in-process' to communicate with inner class in single JVM
+// and to spawn class SpringServer w/o using main() method
+launchServer(SpringServer.class, true);
+}
+@Ignore
+public static class SpringServer extends AbstractSpringServer {
+public static final int PORT = allocatePortAsInt(SpringServer.class);
+public SpringServer() {
+super("/jaxrs_unicode", PORT);
+}
+}
+
+
+@Test
+public void testGetHelloMessage() {
+WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/кирилица");
+
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000L);
+wc.accept("text/plain");
+assertEquals("Hello", wc.get(String.class));
+}
+
+@Ignore
+@Path("/")
+public static class Resource {
+
+@GET
+@Produces("text/plain")
+public String getHello() {
+return "Hello";
+}
+
+}
+
+}
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/32626897/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
--
diff --git a/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml 
b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
new file mode 100644
index 000..5b922e1
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
@@ -0,0 +1,35 @@
+
+
+
+
+http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd 
http://cxf.apache.org/jaxrs  http://cxf.apache.org/schemas/jaxrs.xsd 
http://www.springframework.org/schema/util  
http://www.springframework.org/schema/util/spring-util-4.2.xsd";>
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/32626897/systests/jaxrs/src/test/resources/jaxrs_unic

[1/3] cxf git commit: Adding HttpUtils test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3042e7a35 -> 326268973


Adding HttpUtils test


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

Branch: refs/heads/3.0.x-fixes
Commit: e9e341c44e7c01739548c0a81f70193bf7f12b21
Parents: c14363b
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:08:37 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:25:40 2017 +0100

--
 .../apache/cxf/jaxrs/utils/HttpUtilsTest.java   | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e9e341c4/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index 601765d..a6de9db 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -40,6 +40,29 @@ import org.junit.Test;
 public class HttpUtilsTest extends Assert {
 
 @Test
+public void testEncodePartiallyEncoded() {
+assertEquals("/address", HttpUtils.encodePartiallyEncoded("/address", 
false));
+}
+@Test
+public void testEncodePartiallyEncoded2() {
+assertEquals("/add%20ress", HttpUtils.encodePartiallyEncoded("/add 
ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded3() {
+assertEquals("/add%20ress", 
HttpUtils.encodePartiallyEncoded("/add%20ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded4() {
+assertEquals("http://localhost:8080/";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/";, false));
+}
+@Test
+public void testEncodePartiallyEncoded5() {
+assertEquals("http://localhost:8080/1/%202";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/1/ 2", false));
+}
+
+@Test
 public void testUrlDecode() {
 assertEquals("+ ", HttpUtils.urlDecode("%2B+"));
 }

cxf git commit: [CXF-7304] Adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f62e09bea -> 067142ddb


[CXF-7304] Adding a test


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

Branch: refs/heads/3.1.x-fixes
Commit: 067142ddba05f9c320595177c67aaee58039b28d
Parents: f62e09b
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:22:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:23:16 2017 +0100

--
 .../cxf/systest/jaxrs/JAXRSUnicodeTest.java | 71 
 .../resources/jaxrs_unicode/WEB-INF/beans.xml   | 35 ++
 .../resources/jaxrs_unicode/WEB-INF/web.xml | 45 +
 3 files changed, 151 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/067142dd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
new file mode 100644
index 000..6f7fd30
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
@@ -0,0 +1,71 @@
+/**
+ * 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 javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase {
+public static final int PORT = SpringServer.PORT;
+
+@BeforeClass
+public static void beforeClass() throws Exception {
+// must be 'in-process' to communicate with inner class in single JVM
+// and to spawn class SpringServer w/o using main() method
+launchServer(SpringServer.class, true);
+}
+@Ignore
+public static class SpringServer extends AbstractSpringServer {
+public static final int PORT = allocatePortAsInt(SpringServer.class);
+public SpringServer() {
+super("/jaxrs_unicode", PORT);
+}
+}
+
+
+@Test
+public void testGetHelloMessage() {
+WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/кирилица");
+
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000L);
+wc.accept("text/plain");
+assertEquals("Hello", wc.get(String.class));
+}
+
+@Ignore
+@Path("/")
+public static class Resource {
+
+@GET
+@Produces("text/plain")
+public String getHello() {
+return "Hello";
+}
+
+}
+
+}
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/067142dd/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
--
diff --git a/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml 
b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
new file mode 100644
index 000..5b922e1
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
@@ -0,0 +1,35 @@
+
+
+
+
+http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd 
http://cxf.apache.org/jaxrs  http://cxf.apache.org/schemas/jaxrs.xsd 
http://www.springframework.org/schema/util  
http://www.springframework.org/schema/util/spring-util-4.2.xsd";>
+
+
+
+
+
+
+
+
+

http://git-wip-us

cxf git commit: [CXF-7304] Adding a test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master d3041f867 -> ef3ca8e24


[CXF-7304] Adding a test


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

Branch: refs/heads/master
Commit: ef3ca8e24859d1704c6767c039e067b5ba5b1197
Parents: d3041f8
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:22:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:22:18 2017 +0100

--
 .../cxf/systest/jaxrs/JAXRSUnicodeTest.java | 71 
 .../resources/jaxrs_unicode/WEB-INF/beans.xml   | 35 ++
 .../resources/jaxrs_unicode/WEB-INF/web.xml | 45 +
 3 files changed, 151 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ef3ca8e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
new file mode 100644
index 000..6f7fd30
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
@@ -0,0 +1,71 @@
+/**
+ * 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 javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase {
+public static final int PORT = SpringServer.PORT;
+
+@BeforeClass
+public static void beforeClass() throws Exception {
+// must be 'in-process' to communicate with inner class in single JVM
+// and to spawn class SpringServer w/o using main() method
+launchServer(SpringServer.class, true);
+}
+@Ignore
+public static class SpringServer extends AbstractSpringServer {
+public static final int PORT = allocatePortAsInt(SpringServer.class);
+public SpringServer() {
+super("/jaxrs_unicode", PORT);
+}
+}
+
+
+@Test
+public void testGetHelloMessage() {
+WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/кирилица");
+
WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000L);
+wc.accept("text/plain");
+assertEquals("Hello", wc.get(String.class));
+}
+
+@Ignore
+@Path("/")
+public static class Resource {
+
+@GET
+@Produces("text/plain")
+public String getHello() {
+return "Hello";
+}
+
+}
+
+}
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/ef3ca8e2/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
--
diff --git a/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml 
b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
new file mode 100644
index 000..5b922e1
--- /dev/null
+++ b/systests/jaxrs/src/test/resources/jaxrs_unicode/WEB-INF/beans.xml
@@ -0,0 +1,35 @@
+
+
+
+
+http://www.springframework.org/schema/beans"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:jaxrs="http://cxf.apache.org/jaxrs"; 
xmlns:util="http://www.springframework.org/schema/util"; xsi:schemaLocation=" 
http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd 
http://cxf.apache.org/jaxrs  http://cxf.apache.org/schemas/jaxrs.xsd 
http://www.springframework.org/schema/util  
http://www.springframework.org/schema/util/spring-util-4.2.xsd";>
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.or

cxf git commit: Adding HttpUtils test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 12a4e8c0b -> f62e09bea


Adding HttpUtils test


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

Branch: refs/heads/3.1.x-fixes
Commit: f62e09bea57712e64e1000190726b57cb44d922b
Parents: 12a4e8c
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:08:37 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:11:05 2017 +0100

--
 .../apache/cxf/jaxrs/utils/HttpUtilsTest.java   | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f62e09be/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index 601765d..a6de9db 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -40,6 +40,29 @@ import org.junit.Test;
 public class HttpUtilsTest extends Assert {
 
 @Test
+public void testEncodePartiallyEncoded() {
+assertEquals("/address", HttpUtils.encodePartiallyEncoded("/address", 
false));
+}
+@Test
+public void testEncodePartiallyEncoded2() {
+assertEquals("/add%20ress", HttpUtils.encodePartiallyEncoded("/add 
ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded3() {
+assertEquals("/add%20ress", 
HttpUtils.encodePartiallyEncoded("/add%20ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded4() {
+assertEquals("http://localhost:8080/";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/";, false));
+}
+@Test
+public void testEncodePartiallyEncoded5() {
+assertEquals("http://localhost:8080/1/%202";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/1/ 2", false));
+}
+
+@Test
 public void testUrlDecode() {
 assertEquals("+ ", HttpUtils.urlDecode("%2B+"));
 }

cxf git commit: Adding HttpUtils test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master b174e1d49 -> d3041f867


Adding HttpUtils test


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

Branch: refs/heads/master
Commit: d3041f867f4d65bd5c4ba21eadcc84dc9c675c9b
Parents: b174e1d
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:08:37 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:08:37 2017 +0100

--
 .../apache/cxf/jaxrs/utils/HttpUtilsTest.java   | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3041f86/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index ed93790..f1e36e8 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -40,6 +40,29 @@ import org.junit.Test;
 public class HttpUtilsTest extends Assert {
 
 @Test
+public void testEncodePartiallyEncoded() {
+assertEquals("/address", HttpUtils.encodePartiallyEncoded("/address", 
false));
+}
+@Test
+public void testEncodePartiallyEncoded2() {
+assertEquals("/add%20ress", HttpUtils.encodePartiallyEncoded("/add 
ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded3() {
+assertEquals("/add%20ress", 
HttpUtils.encodePartiallyEncoded("/add%20ress", false));
+}
+@Test
+public void testEncodePartiallyEncoded4() {
+assertEquals("http://localhost:8080/";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/";, false));
+}
+@Test
+public void testEncodePartiallyEncoded5() {
+assertEquals("http://localhost:8080/1/%202";, 
+ 
HttpUtils.encodePartiallyEncoded("http://localhost:8080/1/ 2", false));
+}
+
+@Test
 public void testUrlDecode() {
 assertEquals("+ ", HttpUtils.urlDecode("%2B+"));
 }

cxf git commit: [CXF-7304] Step1 - using UTF-8 for the decoded destinations given that HttpServletRequest.getPathInfo() uses it by default too and the earlier encooding was used to support a case wher

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 91b2c2012 -> 12a4e8c0b


[CXF-7304] Step1 - using UTF-8 for the decoded destinations given that 
HttpServletRequest.getPathInfo() uses it by default too and the earlier 
encooding was used to support a case where an endpoint address has 
percent-encoded reserved chars which work fine with UTF-8 too


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

Branch: refs/heads/3.1.x-fixes
Commit: 12a4e8c0b55e55231d020df2510333efc8bde81a
Parents: 91b2c20
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:01:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:03:18 2017 +0100

--
 .../apache/cxf/transport/http/DestinationRegistryImpl.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/12a4e8c0/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 7d01b17..78f0803 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -50,9 +50,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 throw new RuntimeException("Already a destination on " + path);
 }
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.put(URLDecoder.decode(path, "ISO-8859-1"), 
destination);
+decodedDestinations.put(path2, destination);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);
@@ -62,9 +62,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 public synchronized void removeDestination(String path) {
 destinations.remove(path);
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.remove(URLDecoder.decode(path, 
"ISO-8859-1"));
+decodedDestinations.remove(path2);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);

cxf git commit: [CXF-7304] Step1 - using UTF-8 for the decoded destinations given that HttpServletRequest.getPathInfo() uses it by default too and the earlier encooding was used to support a case wher

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 3c4396f4a -> b174e1d49


[CXF-7304] Step1 - using UTF-8 for the decoded destinations given that 
HttpServletRequest.getPathInfo() uses it by default too and the earlier 
encooding was used to support a case where an endpoint address has 
percent-encoded reserved chars which work fine with UTF-8 too


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

Branch: refs/heads/master
Commit: b174e1d4976ef822be1c47d2e7c61b4b12ce9028
Parents: 3c4396f
Author: Sergey Beryozkin 
Authored: Fri Mar 31 17:01:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri Mar 31 17:01:18 2017 +0100

--
 .../apache/cxf/transport/http/DestinationRegistryImpl.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b174e1d4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 286b564..2e75059 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -50,9 +50,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 throw new RuntimeException("Already a destination on " + path);
 }
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.put(URLDecoder.decode(path, "ISO-8859-1"), 
destination);
+decodedDestinations.put(path2, destination);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);
@@ -62,9 +62,9 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 public synchronized void removeDestination(String path) {
 destinations.remove(path);
 try {
-String path2 = URLDecoder.decode(path, "ISO-8859-1");
+String path2 = URLDecoder.decode(path, "UTF-8");
 if (!path.equals(path2)) {
-decodedDestinations.remove(URLDecoder.decode(path, 
"ISO-8859-1"));
+decodedDestinations.remove(path2);
 }
 } catch (UnsupportedEncodingException e) {
 throw new RuntimeException("Unsupported Encoding", e);

cxf git commit: Adding JAX-RS LB test

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 18ac71fc4 -> 3c4396f4a


Adding JAX-RS LB test


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

Branch: refs/heads/master
Commit: 3c4396f4aadb772b43a14e3b41bad6b29e49261b
Parents: 18ac71f
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 15:07:09 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 31 15:07:18 2017 +0100

--
 .../jaxrs/failover/FailoverWebClientTest.java   |  2 +-
 .../jaxrs/failover/LoadDistributorServer.java   | 43 +++
 .../failover/LoadDistributorWebClientTest.java  | 80 
 .../cxf/systest/jaxrs/failover/cxf-client.xml   | 43 +++
 .../systest/jaxrs/failover/cxf-lb-service.xml   | 65 
 5 files changed, 232 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3c4396f4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
index eb7269f..f77a429 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java
@@ -50,7 +50,7 @@ public class FailoverWebClientTest extends 
AbstractBusClientServerTestBase {
 }
 
 @Test
-public void testEchoXmlBookQuery() throws Exception {
+public void testFailover() throws Exception {
 String address = "http://localhost:"; + PORT1 + "/bookstore";
 
 FailoverFeature failoverFeature = new FailoverFeature();

http://git-wip-us.apache.org/repos/asf/cxf/blob/3c4396f4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
new file mode 100644
index 000..99a7436
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class LoadDistributorServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-lb-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/3c4396f4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
new file mode 100644
index 000..03ce218
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributo

cxf git commit: [CXF-7307] fix the 404 error in empty string query parameter injection.

[nealhu]

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


[CXF-7307] fix the 404 error in empty string query parameter injection.


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

Branch: refs/heads/3.0.x-fixes
Commit: 3042e7a351c595d4bbe31398ec3a9eb425c535d6
Parents: c140c23
Author: Neal Hu 
Authored: Fri Mar 31 19:59:06 2017 +0800
Committer: Neal Hu 
Committed: Fri Mar 31 20:03:01 2017 +0800

--
 .../org/apache/cxf/common/util/PrimitiveUtils.java  |  5 +
 .../org/apache/cxf/jaxrs/utils/InjectionUtils.java  |  5 +
 .../apache/cxf/jaxrs/utils/InjectionUtilsTest.java  | 16 
 3 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3042e7a3/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index c641b50..cd60275 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@ -56,6 +56,11 @@ public final class PrimitiveUtils {
 
 public static  Object read(String value, Class type) {
 Object ret = value;
+if (!(Character.TYPE.equals(type) || Character.class.equals(type))
+&& value != null && value.equals("")) {
+//pass empty string to number type will result in Exception
+value = "0";
+}
 if (Integer.TYPE.equals(type) || Integer.class.equals(type)) {
 ret = Integer.valueOf(value);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/3042e7a3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index d4c5897..ea10274 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -394,6 +394,11 @@ public final class InjectionUtils {
 }
 return theResult;
 }
+
+if (Number.class.isAssignableFrom(pClass) && "".equals(value)) {
+//pass empty string to boxed number type will result in 404
+return null;
+}
 if (pClass.isPrimitive()) {
 try {
 T ret = (T)PrimitiveUtils.read(value, pClass);

http://git-wip-us.apache.org/repos/asf/cxf/blob/3042e7a3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index eac8a42..521482d 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -150,6 +150,22 @@ public class InjectionUtilsTest extends Assert {
 }
 
 @Test
+public void testInstantiateIntegerInQuery() {
+Integer integer = InjectionUtils.handleParameter("", false, 
Integer.class,
+Integer.class, null,
+ParameterType.QUERY, null);
+assertNull("Integer is not null", integer);
+}
+
+@Test
+public void testInstantiateFloatInQuery() {
+Float f = InjectionUtils.handleParameter("", false, float.class,
+float.class, null,
+ParameterType.QUERY, null);
+assertEquals("Float is not 0", Float.valueOf(0F), f);
+}
+
+@Test
 public void testGenericInterfaceType() throws NoSuchMethodException {
 Type str = 
InjectionUtils.getGenericResponseType(GenericInterface.class.getMethod("get"),
TestService.class, "", String.class, new 
ExchangeImpl());

cxf git commit: [CXF-7307] fix the 404 error in empty string query parameter injection.

[nealhu]

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


[CXF-7307] fix the 404 error in empty string query parameter injection.


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

Branch: refs/heads/3.1.x-fixes
Commit: 91b2c201227e6fd150e68f45a29c4995d69f4555
Parents: 551f30a
Author: Neal Hu 
Authored: Fri Mar 31 19:59:06 2017 +0800
Committer: Neal Hu 
Committed: Fri Mar 31 19:59:06 2017 +0800

--
 .../org/apache/cxf/common/util/PrimitiveUtils.java  |  5 +
 .../org/apache/cxf/jaxrs/utils/InjectionUtils.java  |  5 +
 .../apache/cxf/jaxrs/utils/InjectionUtilsTest.java  | 16 
 3 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/91b2c201/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index dc131de..7a0b64e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@ -75,6 +75,11 @@ public final class PrimitiveUtils {
 
 public static  Object read(String value, Class type) {
 Object ret = value;
+if (!(Character.TYPE.equals(type) || Character.class.equals(type))
+&& value != null && value.equals("")) {
+//pass empty string to number type will result in Exception
+value = "0";
+}
 if (Integer.TYPE.equals(type) || Integer.class.equals(type)) {
 ret = Integer.valueOf(value);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/91b2c201/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 3e9252a..dd143c2 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -406,6 +406,11 @@ public final class InjectionUtils {
 }
 return theResult;
 }
+
+if (Number.class.isAssignableFrom(pClass) && "".equals(value)) {
+//pass empty string to boxed number type will result in 404
+return null;
+}
 if (pClass.isPrimitive()) {
 try {
 T ret = (T)PrimitiveUtils.read(value, pClass);

http://git-wip-us.apache.org/repos/asf/cxf/blob/91b2c201/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index 74b8f08..edbcd55 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -150,6 +150,22 @@ public class InjectionUtilsTest extends Assert {
 }
 
 @Test
+public void testInstantiateIntegerInQuery() {
+Integer integer = InjectionUtils.handleParameter("", false, 
Integer.class,
+Integer.class, null,
+ParameterType.QUERY, null);
+assertNull("Integer is not null", integer);
+}
+
+@Test
+public void testInstantiateFloatInQuery() {
+Float f = InjectionUtils.handleParameter("", false, float.class,
+float.class, null,
+ParameterType.QUERY, null);
+assertEquals("Float is not 0", Float.valueOf(0F), f);
+}
+
+@Test
 public void testGenericInterfaceType() throws NoSuchMethodException {
 Type str = 
InjectionUtils.getGenericResponseType(GenericInterface.class.getMethod("get"),
TestService.class, "", String.class, new 
ExchangeImpl());

cxf git commit: Adding WebClient Failover test

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master a304f27b8 -> 18ac71fc4


Adding WebClient Failover test


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

Branch: refs/heads/master
Commit: 18ac71fc402b0cd912bbf2849c44f438f63384f9
Parents: a304f27
Author: Colm O hEigeartaigh 
Authored: Fri Mar 31 12:52:41 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Mar 31 12:52:41 2017 +0100

--
 .../jaxrs/failover/FailoverBookServer.java  | 43 ++
 .../jaxrs/failover/FailoverBookStore.java   | 47 +++
 .../jaxrs/failover/FailoverWebClientTest.java   | 83 
 .../cxf/systest/jaxrs/failover/cxf-service.xml  | 75 ++
 4 files changed, 248 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/18ac71fc/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
new file mode 100644
index 000..34e99b3
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookServer.java
@@ -0,0 +1,43 @@
+/**
+ * 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.failover;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class FailoverBookServer extends AbstractBusTestServerBase {
+protected void run()  {
+URL busFile = Server.class.getResource("cxf-service.xml");
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/18ac71fc/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
new file mode 100644
index 000..29b5432
--- /dev/null
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverBookStore.java
@@ -0,0 +1,47 @@
+/**
+ * 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.failover;
+
+
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+
+import org.apache.cxf.systest.jaxrs.Book;
+
+/**
+ * Just allow one invocation + then return 404
+ */
+@Path("/bookstore")
+public class FailoverBookStore {
+
+private int counter;
+
+@GET
+@Path("/")
+public Book getBookRoot() {
+if (counter != 0)

cxf git commit: [CXF-7307] fix the 404 error in empty string query parameter injection.

[nealhu]

Repository: cxf
Updated Branches:
  refs/heads/master 0dc7db7aa -> a304f27b8


[CXF-7307] fix the 404 error in empty string query parameter injection.


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

Branch: refs/heads/master
Commit: a304f27b8ad9da04dde3610932266c64baa3aa7e
Parents: 0dc7db7
Author: Neal Hu 
Authored: Fri Mar 31 19:15:36 2017 +0800
Committer: Neal Hu 
Committed: Fri Mar 31 19:15:36 2017 +0800

--
 .../test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a304f27b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index dafb8ae..d600825 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -162,7 +162,7 @@ public class InjectionUtilsTest extends Assert {
 Float f = InjectionUtils.handleParameter("", false, float.class,
 float.class, null,
 ParameterType.QUERY, null);
-assertEquals("Long is not 0", Float.valueOf(0F), f);
+assertEquals("Float is not 0", Float.valueOf(0F), f);
 }
 
 @Test

[2/2] cxf git commit: [CXF-7307] fix the 404 error in empty string query parameter injection.

[nealhu]

[CXF-7307] fix the 404 error in empty string query parameter injection.


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

Branch: refs/heads/master
Commit: 0dc7db7aa48f36235f33ff1e7281bec525222903
Parents: fe4c8b6 6fd7678
Author: Neal Hu 
Authored: Fri Mar 31 17:56:57 2017 +0800
Committer: Neal Hu 
Committed: Fri Mar 31 17:56:57 2017 +0800

--
 .../org/apache/cxf/common/util/PrimitiveUtils.java  |  5 +
 .../org/apache/cxf/jaxrs/utils/InjectionUtils.java  |  5 +
 .../apache/cxf/jaxrs/utils/InjectionUtilsTest.java  | 16 
 3 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc7db7a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
--
diff --cc core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index 1c1b9ff,1c1b9ff..86c175c
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@@ -74,6 -74,6 +74,11 @@@ public final class PrimitiveUtils 
  }
  
  public static  Object read(String value, Class type) {
++if (!(Character.TYPE.equals(type) || Character.class.equals(type))
++&& value != null && value.equals("")) {
++//pass empty string to number type will result in Exception
++value = "0";
++}
  Object ret = value;
  if (Integer.TYPE.equals(type) || Integer.class.equals(type)) {
  ret = Integer.valueOf(value);

http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc7db7a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --cc 
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 1f278ae,1f278ae..334a464
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@@ -433,6 -433,6 +433,11 @@@ public final class InjectionUtils 
  }
  return theResult;
  }
++
++if (Number.class.isAssignableFrom(pClass) && "".equals(value)) {
++//pass empty string to boxed number type will result in 404
++return null;
++}
  if (pClass.isPrimitive()) {
  try {
  T ret = (T)PrimitiveUtils.read(value, pClass);

http://git-wip-us.apache.org/repos/asf/cxf/blob/0dc7db7a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
--
diff --cc 
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index 3c96039,3c96039..dafb8ae
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@@ -150,6 -150,6 +150,22 @@@ public class InjectionUtilsTest extend
  }
  
  @Test
++public void testInstantiateIntegerInQuery() {
++Integer integer = InjectionUtils.handleParameter("", false, 
Integer.class,
++Integer.class, null,
++ParameterType.QUERY, null);
++assertNull("Integer is not null", integer);
++}
++
++@Test
++public void testInstantiateFloatInQuery() {
++Float f = InjectionUtils.handleParameter("", false, float.class,
++float.class, null,
++ParameterType.QUERY, null);
++assertEquals("Long is not 0", Float.valueOf(0F), f);
++}
++
++@Test
  public void testGenericInterfaceType() throws NoSuchMethodException {
  Type str = 
InjectionUtils.getGenericResponseType(GenericInterface.class.getMethod("get"),
 TestService.class, "", String.class, new 
ExchangeImpl());

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

[nealhu]

Repository: cxf
Updated Branches:
  refs/heads/master 6fd76780c -> 0dc7db7aa


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


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

Branch: refs/heads/master
Commit: fe4c8b6e94fd286473f8ca3b626f08cee50d2ee2
Parents: 408fe33
Author: Neal Hu 
Authored: Fri Mar 31 17:54:17 2017 +0800
Committer: Neal Hu 
Committed: Fri Mar 31 17:54:17 2017 +0800

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


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

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

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

[buildbot]

Author: buildbot
Date: Fri Mar 31 09:47:47 2017
New Revision: 1009459

Log:
Production update by buildbot for cxf

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

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

Modified: websites/production/cxf/content/docs/failoverfeature.html
==
--- websites/production/cxf/content/docs/failoverfeature.html (original)
+++ websites/production/cxf/content/docs/failoverfeature.html Fri Mar 31 
09:47:47 2017
@@ -117,11 +117,11 @@ Apache CXF -- FailoverFeature


 Failover and Load 
Distributor Feature/**/
+/*]]>*/
 Failover and Load 
Distributor FeatureFailoverCircuit Breakers 
FailoverLoad DistributionConfiguring 
JAX-RS clients
 FailoverThe CXF Failover 
feature allows to configure CXF frontend clients to retry a call when the 
target endpoint becomes unavailable. A number of retry 
strategies available: a client can iterate sequentially over the alternative 
addresses or chose them randomly.  Every strategy can be 
configured to do a delay between selecting the addresses.
 ;
 
@@ -189,6 +190,7 @@ http://www.springframework.org/schema/ut
xmlns:util="http://www.springframework.org/schema/util";
xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util.xsd">;
 
@@ -246,6 +248,7 @@ http://www.springframework.org/schema/ut
xmlns:util="http://www.springframework.org/schema/util";
xsi:schemaLocation="
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
 http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util.xsd">;