[cxf] branch master updated: [CXF-7711] enable JavaToWS to use custom compiler

[asoldano]

This is an automated email from the ASF dual-hosted git repository.

asoldano pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new cab75e1  [CXF-7711] enable JavaToWS to use custom compiler
cab75e1 is described below

commit cab75e1a9651b69187bfe217b6404f4d1a3e01b7
Author: rsearls <rsea...@ibm-p8-kvm-05-fsp.mgmt.pnr.lab.eng.rdu2.redhat.com>
AuthorDate: Tue Apr 17 16:02:02 2018 -0400

[CXF-7711] enable JavaToWS to use custom compiler
---
 .../src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java | 12 
 .../java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java |  6 ++
 .../cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java  |  5 -
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
index 22df372..ed9f7a0 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.common.CommandInterfaceUtils;
+import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.toolspec.ToolRunner;
 
 public class JavaToWS {
@@ -84,6 +85,17 @@ public class JavaToWS {
.getResourceAsStream("java2ws.xml"), false, args, 
os);
 }
 
+/**
+ * Pass user app's (compiler) information in the context.
+ * @param context
+ * @param os
+ * @throws Exception
+ */
+public void run(ToolContext context, OutputStream os) throws Exception {
+ToolRunner.runTool(JavaToWSContainer.class,
+JavaToWSContainer.class.getResourceAsStream("java2ws.xml"),
+false, args, isExitOnFinish(), context, os);
+}
 
 private boolean isExitOnFinish() {
 String exit = System.getProperty("exitOnFinish");
diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
index 08366b9..08a1d5c 100644
--- 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
+++ 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
@@ -52,6 +52,12 @@ public class JavaToWSContainer extends 
AbstractCXFToolContainer {
 if (!hasInfoOption()) {
 ToolContext env = new ToolContext();
 env.setParameters(getParametersMap(new HashSet<>()));
+
+// check for custom compiler object to pass on
+if (getContext() != null && 
getContext().get(ToolConstants.COMPILER) != null) {
+env.put(ToolConstants.COMPILER, 
getContext().get(ToolConstants.COMPILER));
+}
+
 if (env.get(ToolConstants.CFG_OUTPUTDIR) == null) {
 env.put(ToolConstants.CFG_OUTPUTDIR, ".");
 }
diff --git 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
index 3df2ee2..49e4d2f 100644
--- 
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
+++ 
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java
@@ -82,7 +82,10 @@ public class BeanGenerator extends AbstractGenerator {
 }
 
 //compile the classes
-Compiler compiler = new Compiler();
+Compiler compiler = 
(Compiler)getToolContext().get(ToolConstants.COMPILER);
+if (compiler == null) {
+compiler = new Compiler();
+}
 compiler.setOutputDir(compileToDir);
 List files = new ArrayList<>(generatedFiles.size());
 for (File file : generatedFiles) {

-- 
To stop receiving notification emails like this one, please contact
asold...@apache.org.

cxf git commit: [CXF-7405] Removal of commons-lang dependency and upgrade to Velocity 2

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master a3cd2a98a -> f1ef25d99


[CXF-7405] Removal of commons-lang dependency and upgrade to Velocity 2


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

Branch: refs/heads/master
Commit: f1ef25d99cf9903af9aee0cb69ecbc1b804ce999
Parents: a3cd2a9
Author: Alessio Soldano 
Authored: Tue Jun 13 01:49:16 2017 +0200
Committer: Alessio Soldano 
Committed: Fri Aug 4 23:36:35 2017 +0200

--
 .../cxf/jca/outbound/CXFConnectionSpec.java |  2 +-
 .../outbound/ManagedConnectionFactoryImpl.java  |  2 +-
 .../cxf/maven_plugin/AbstractCodegenMoho.java   |  2 +-
 .../apache/cxf/maven_plugin/Java2WSMojo.java|  2 +-
 .../wadlto/AbstractCodeGeneratorMojo.java   |  2 +-
 .../features/src/main/resources/features.xml|  4 +-
 parent/pom.xml  |  4 +-
 .../cxf/systest/jaxb/model/ExtendedWidget.java  |  4 +-
 .../apache/cxf/systest/jaxb/model/Widget.java   |  4 +-
 tools/common/pom.xml|  2 +-
 .../cxf/tools/common/VelocityGenerator.java |  9 ++--
 .../java2wsdl/processor/internal/build.xml.vm   |  8 ++--
 .../jaxws/generator/template/javafirst-impl.vm  |  4 +-
 .../jaxws/generator/template/javafirst-sei.vm   |  2 +-
 .../internal/simple/generator/template/impl.vm  |  4 +-
 .../internal/simple/generator/template/sei.vm   |  2 +-
 .../tools/wsdlto/core/AbstractGenerator.java|  2 +-
 .../jaxws/customization/JAXWSBindingParser.java |  8 ++--
 .../frontend/jaxws/generators/SEIGenerator.java |  4 +-
 .../jaxws/generators/ServiceGenerator.java  |  2 +-
 .../wsdlto/frontend/jaxws/jaxws-toolspec.xml|  2 +-
 .../processor/internal/ServiceProcessor.java|  2 +-
 .../wsdlto/frontend/jaxws/template/build.vm |  8 ++--
 .../wsdlto/frontend/jaxws/template/client.vm| 12 ++---
 .../wsdlto/frontend/jaxws/template/fault.vm | 20 -
 .../wsdlto/frontend/jaxws/template/impl.vm  | 12 ++---
 .../tools/wsdlto/frontend/jaxws/template/sei.vm | 10 ++---
 .../wsdlto/frontend/jaxws/template/server.vm|  8 ++--
 .../wsdlto/frontend/jaxws/template/service.vm   | 46 ++--
 29 files changed, 96 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
--
diff --git 
a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
 
b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
index b20a4d7..a9ea17c 100644
--- 
a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
+++ 
b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
@@ -23,7 +23,7 @@ import java.net.URL;
 import javax.resource.spi.ConnectionRequestInfo;
 import javax.xml.namespace.QName;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
--
diff --git 
a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
 
b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index 98aa044..fc499d3 100644
--- 
a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ 
b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -35,7 +35,7 @@ import javax.resource.spi.ResourceAdapterAssociation;
 import javax.resource.spi.work.WorkManager;
 import javax.security.auth.Subject;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jca.core.logging.LoggerHelper;
 import org.apache.cxf.jca.cxf.ResourceAdapterImpl;

http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
--
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index c5e5a7f..bf62453 100644
--- 

[2/2] cxf git commit: [CXF-7339] Null key support in CacheMap

[asoldano]

[CXF-7339] Null key support in CacheMap


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

Branch: refs/heads/3.1.x-fixes
Commit: c74fd38620b905b096e02dd987e6a97bc5e0a616
Parents: a0aa234
Author: Alessio Soldano 
Authored: Wed Apr 26 16:25:34 2017 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 26 17:46:41 2017 +0200

--
 core/src/main/java/org/apache/cxf/common/util/CacheMap.java | 2 +-
 core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c74fd386/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java 
b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 15b6963..1f4b820 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -123,7 +123,7 @@ public class CacheMap implements Map {
 Set keys = new HashSet<>(extraKeyMap.keySet());
 V v2 = extraKeyMap.remove(key);
 for (K nk : keys) {
-if (key.equals(nk)) {
+if ((key != null && key.equals(nk)) || (key == null && nk == 
null)) {
 V v3 = extraKeyMap.remove(nk);
 if (v2 == null) {
 v2 = v3;

http://git-wip-us.apache.org/repos/asf/cxf/blob/c74fd386/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java 
b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
index cdec8e4..62cc4c5 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
@@ -39,12 +39,15 @@ public class CacheMapTest {
 String putKey = "test";
 definitions.put(putKey, putValue);
 
+Assert.assertNull(definitions.remove(null));
+
 String removeKey = new String("test");
 Object removeValue = definitions.remove(removeKey);
 
 Assert.assertEquals(putKey, removeKey);
 Assert.assertEquals(putValue, removeValue);
 Assert.assertTrue(definitions.isEmpty());
+Assert.assertNull(definitions.remove(null));
 }
 
 }

[1/2] cxf git commit: [CXF-7339] Fix NPE due to weak reference being GC-ed

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0487b301a -> c74fd3862


[CXF-7339] Fix NPE due to weak reference being GC-ed


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

Branch: refs/heads/3.1.x-fixes
Commit: a0aa23493598c6e7d2d9d41fd086bea430d4c6b5
Parents: 0487b30
Author: Alessio Soldano 
Authored: Wed Apr 19 00:48:39 2017 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 26 17:46:29 2017 +0200

--
 .../main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a0aa2349/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index dcbe9fc..8d9bcb7 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -229,7 +229,10 @@ public final class JAXBContextCache {
 if (cachedContextAndSchemasInternal != null) {
 context = cachedContextAndSchemasInternal.getContext();
 if (context == null) {
-
JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses());
+final Set cls = 
cachedContextAndSchemasInternal.getClasses();
+if (cls != null) {
+JAXBCONTEXT_CACHE.remove(cls);
+}
 cachedContextAndSchemasInternal = null;
 } else {
 return new CachedContextAndSchemas(context, 
cachedContextAndSchemasInternal.getClasses(),

[2/2] cxf git commit: [CXF-7339] Fix NPE due to weak reference being GC-ed

[asoldano]

[CXF-7339] Fix NPE due to weak reference being GC-ed


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

Branch: refs/heads/master
Commit: eef5bc685a4147eadb0d7784b926197db6765e2e
Parents: f4d0b21
Author: Alessio Soldano 
Authored: Wed Apr 19 00:48:39 2017 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 26 16:25:55 2017 +0200

--
 .../main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/eef5bc68/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index 924f3ef..d116af6 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -229,7 +229,10 @@ public final class JAXBContextCache {
 if (cachedContextAndSchemasInternal != null) {
 context = cachedContextAndSchemasInternal.getContext();
 if (context == null) {
-
JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses());
+final Set cls = 
cachedContextAndSchemasInternal.getClasses();
+if (cls != null) {
+JAXBCONTEXT_CACHE.remove(cls);
+}
 cachedContextAndSchemasInternal = null;
 } else {
 return new CachedContextAndSchemas(context, 
cachedContextAndSchemasInternal.getClasses(),

[1/2] cxf git commit: [CXF-7339] Null key support in CacheMap

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master f4d0b2152 -> 993439e90


[CXF-7339] Null key support in CacheMap


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

Branch: refs/heads/master
Commit: 993439e9061ae59abc65b924b2414b7b898deb9d
Parents: eef5bc6
Author: Alessio Soldano 
Authored: Wed Apr 26 16:25:34 2017 +0200
Committer: Alessio Soldano 
Committed: Wed Apr 26 16:25:55 2017 +0200

--
 core/src/main/java/org/apache/cxf/common/util/CacheMap.java | 2 +-
 core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/993439e9/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java 
b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 5a4a419..4562fb77 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -123,7 +123,7 @@ public class CacheMap implements Map {
 Set keys = new HashSet<>(extraKeyMap.keySet());
 V v2 = extraKeyMap.remove(key);
 for (K nk : keys) {
-if (key.equals(nk)) {
+if ((key != null && key.equals(nk)) || (key == null && nk == 
null)) {
 V v3 = extraKeyMap.remove(nk);
 if (v2 == null) {
 v2 = v3;

http://git-wip-us.apache.org/repos/asf/cxf/blob/993439e9/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java 
b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
index cdec8e4..62cc4c5 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
@@ -39,12 +39,15 @@ public class CacheMapTest {
 String putKey = "test";
 definitions.put(putKey, putValue);
 
+Assert.assertNull(definitions.remove(null));
+
 String removeKey = new String("test");
 Object removeValue = definitions.remove(removeKey);
 
 Assert.assertEquals(putKey, removeKey);
 Assert.assertEquals(putValue, removeValue);
 Assert.assertTrue(definitions.isEmpty());
+Assert.assertNull(definitions.remove(null));
 }
 
 }

[1/2] cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ec33f44cc -> 922ec5d24


[CXF-7166] NullPointerException at 
org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy


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

Branch: refs/heads/3.1.x-fixes
Commit: e30c816fbbaa3c589062d2ae0202fc47ddd7d70b
Parents: ec33f44
Author: Alessio Soldano 
Authored: Mon Dec 12 11:18:36 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Dec 12 12:13:33 2016 +0100

--
 .../java/org/apache/cxf/common/jaxb/JAXBContextCache.java| 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e30c816f/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index d6393d2..dcbe9fc 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -69,11 +69,6 @@ public final class JAXBContextCache {
 this.classes = classes;
 ccas = new WeakReference(i);
 }
-private CachedContextAndSchemas(CachedContextAndSchemasInternal i) {
-this.context = i.getContext();
-this.classes = i.getClasses();
-ccas = new WeakReference(i);
-}
 public JAXBContext getContext() {
 return context;
 }
@@ -237,7 +232,8 @@ public final class JAXBContextCache {
 
JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses());
 cachedContextAndSchemasInternal = null;
 } else {
-return new 
CachedContextAndSchemas(cachedContextAndSchemasInternal);
+return new CachedContextAndSchemas(context, 
cachedContextAndSchemasInternal.getClasses(),
+cachedContextAndSchemasInternal);
 }
 }
 }

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 922ec5d244f632c57ac5c3e6a3322c9d1a0abde1
Parents: e30c816
Author: Alessio Soldano 
Authored: Mon Dec 12 12:14:32 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Dec 12 12:14:32 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/922ec5d2/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c405019..44822d4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -243,6 +243,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
+M b49075882641fcebbbdf1ed8d84247fcf80aa558
 M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
 M c01c68ddda10ec6db492b86d818498bec0bf4228
 M c212240f696e3387df19bbcf22d1851aff320078

cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master de9c7ecd7 -> b49075882


[CXF-7166] NullPointerException at 
org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy


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

Branch: refs/heads/master
Commit: b49075882641fcebbbdf1ed8d84247fcf80aa558
Parents: de9c7ec
Author: Alessio Soldano 
Authored: Mon Dec 12 11:18:36 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Dec 12 11:23:02 2016 +0100

--
 .../java/org/apache/cxf/common/jaxb/JAXBContextCache.java| 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b4907588/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index d6393d2..dcbe9fc 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -69,11 +69,6 @@ public final class JAXBContextCache {
 this.classes = classes;
 ccas = new WeakReference(i);
 }
-private CachedContextAndSchemas(CachedContextAndSchemasInternal i) {
-this.context = i.getContext();
-this.classes = i.getClasses();
-ccas = new WeakReference(i);
-}
 public JAXBContext getContext() {
 return context;
 }
@@ -237,7 +232,8 @@ public final class JAXBContextCache {
 
JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses());
 cachedContextAndSchemasInternal = null;
 } else {
-return new 
CachedContextAndSchemas(cachedContextAndSchemasInternal);
+return new CachedContextAndSchemas(context, 
cachedContextAndSchemasInternal.getClasses(),
+cachedContextAndSchemasInternal);
 }
 }
 }

[1/2] cxf git commit: [CXF-6908] Adding testcase

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master e28b6d244 -> 0c2fb8fe7


[CXF-6908] Adding testcase


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

Branch: refs/heads/master
Commit: ffa81f69c90a6287429631b7da2eb0390f5608f4
Parents: e28b6d2
Author: Alessio Soldano 
Authored: Fri May 20 21:36:40 2016 +0200
Committer: Alessio Soldano 
Committed: Fri May 20 21:37:23 2016 +0200

--
 .../systest/ws/security/SecurityPolicyTest.java | 68 
 .../cxf/systest/ws/security/DoubleIt.wsdl   |  3 +
 2 files changed, 71 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ffa81f69/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index 4ab13d7..fb0eea0 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -29,6 +29,8 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.BindingProvider;
@@ -39,6 +41,7 @@ import javax.xml.ws.Service;
 import javax.xml.ws.Service.Mode;
 import javax.xml.ws.ServiceMode;
 import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.soap.SOAPFaultException;
 import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Document;
@@ -79,6 +82,8 @@ public class SecurityPolicyTest extends 
AbstractBusClientServerTestBase  {
 + PORT + "/SecPolTestSignThenEncrypt";
 public static final String POLICY_SIGNENC_PROVIDER_ADDRESS 
 = "http://localhost:; + PORT + "/SecPolTestSignThenEncryptProvider";
+public static final String POLICY_FAULT_SIGNENC_PROVIDER_ADDRESS 
+= "http://localhost:; + PORT + "/SecPolTestFaultSignThenEncryptProvider";
 public static final String POLICY_SIGN_ADDRESS = "http://localhost:; + 
PORT + "/SecPolTestSign";
 public static final String POLICY_XPATH_ADDRESS = "http://localhost:; + 
PORT + "/SecPolTestXPath";
 public static final String POLICY_SIGNONLY_ADDRESS = "http://localhost:; + 
PORT + "/SecPolTestSignedOnly";
@@ -164,6 +169,12 @@ public class SecurityPolicyTest extends 
AbstractBusClientServerTestBase  {
 ei = ep.getServer().getEndpoint().getEndpointInfo(); 
 setCryptoProperties(ei, "bob.properties", "alice.properties");
 
+ep = 
(EndpointImpl)Endpoint.publish(POLICY_FAULT_SIGNENC_PROVIDER_ADDRESS,
+new DoubleItFaultProvider());
+
+ei = ep.getServer().getEndpoint().getEndpointInfo(); 
+setCryptoProperties(ei, "bob.properties", "alice.properties");
+
 ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
 ep.setEndpointName(new 
QName("http://www.example.org/contract/DoubleIt;, "DoubleItPortSignedOnly"));
 ep.setWsdlLocation(wsdl.getPath());
@@ -468,6 +479,28 @@ public class SecurityPolicyTest extends 
AbstractBusClientServerTestBase  {
 
 }
 
+@WebServiceProvider(targetNamespace = 
"http://www.example.org/contract/DoubleIt;,
+portName = "DoubleItFaultPortSignThenEncrypt",
+serviceName = "DoubleItService",
+wsdlLocation = 
"classpath:/org/apache/cxf/systest/ws/security/DoubleIt.wsdl")
+@ServiceMode(value = Mode.MESSAGE)
+public static class DoubleItFaultProvider implements Provider 
{
+
+public SOAPMessage invoke(SOAPMessage request) {
+try {
+MessageFactory messageFactory = MessageFactory.newInstance();
+SOAPMessage msg = messageFactory.createMessage();
+msg.getSOAPBody().addFault(new 
QName("http://schemas.xmlsoap.org/soap/envelope/;, "Server"),
+   "Foo");
+return msg;
+} catch (Exception e) {
+e.printStackTrace();
+}
+return null;
+}
+
+}
+
 @Test
 public void testCXF3041() throws Exception {

[2/2] cxf git commit: [CXF-6908] Excluding test for still open issue

[asoldano]

[CXF-6908] Excluding test for still open issue


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

Branch: refs/heads/master
Commit: 0c2fb8fe7847cc85862ec5e9fec9c7bf9b2c195c
Parents: ffa81f6
Author: Alessio Soldano 
Authored: Fri May 20 21:45:48 2016 +0200
Committer: Alessio Soldano 
Committed: Fri May 20 21:45:48 2016 +0200

--
 .../org/apache/cxf/systest/ws/security/SecurityPolicyTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0c2fb8fe/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index fb0eea0..4cd7b66 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -68,6 +68,7 @@ import org.example.contract.doubleit.DoubleItPortTypeHeader;
 import org.example.schema.doubleit.DoubleIt;
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SecurityPolicyTest extends AbstractBusClientServerTestBase  {
@@ -701,6 +702,7 @@ public class SecurityPolicyTest extends 
AbstractBusClientServerTestBase  {
 }
 
 @Test
+@Ignore("CXF-6908")
 public void testFault() throws Exception {
 SpringBusFactory bf = new SpringBusFactory();
 

[2/4] cxf git commit: [CXF-6900] More SAAJ fixes

[asoldano]

[CXF-6900] More SAAJ fixes


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

Branch: refs/heads/3.1.x-fixes
Commit: 1046894b83582303820c1b43b03bbdf2b4cbe571
Parents: a1e4b88
Author: Daniel Kulp 
Authored: Tue May 17 13:26:31 2016 -0400
Committer: Alessio Soldano 
Committed: Wed May 18 14:36:09 2016 +0200

--
 .../apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java   |  2 +-
 .../apache/cxf/binding/soap/saaj/SAAJStreamWriter.java| 10 ++
 .../cxf/ws/security/wss4j/AbstractPolicySecurityTest.java |  5 ++---
 .../cxf/ws/security/wss4j/AbstractSecurityTest.java   |  8 
 .../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java  |  3 +++
 5 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java 
b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index 74de7a3..d30bf4f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -38,9 +38,9 @@ import org.apache.cxf.common.util.StringUtils;
  * location, it will just walk into it instead of creating a new element
  */
 public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
+protected boolean isOverlaid = true;
 
 List isOverlaidStack = new LinkedList();
-boolean isOverlaid = true;
 Boolean textOverlay;
 
 public OverlayW3CDOMStreamWriter(Document document) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index d29276c..393a553 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -40,6 +40,10 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 public SAAJStreamWriter(SOAPPart part) {
 super(part);
 this.part = part;
+Node nd = part.getFirstChild();
+if (nd == null) {
+isOverlaid = false;
+}
 }
 public SAAJStreamWriter(SOAPPart part, Element current) {
 super(part, current);
@@ -69,8 +73,14 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 if ("Envelope".equals(local)) {
 setChild(adjustPrefix(part.getEnvelope(), prefix), false);
 adjustPrefix(part.getEnvelope().getHeader(), prefix);
+adjustPrefix(part.getEnvelope().getBody(), prefix);
+
part.getEnvelope().removeChild(part.getEnvelope().getHeader());
+
part.getEnvelope().removeChild(part.getEnvelope().getBody());
 return;
 } else if ("Body".equals(local)) {
+if (part.getEnvelope().getBody() == null) {
+part.getEnvelope().addBody();
+}
 setChild(adjustPrefix(part.getEnvelope().getBody(), 
prefix), false);
 return;
 } else if ("Header".equals(local)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1046894b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
--
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index 5702b5e..b627081 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Executor;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.soap.Node;
-import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.xpath.XPath;
 import 

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 01bf5f841d27d94485018912a575e4d9b50caab9
Parents: fa2c624
Author: Alessio Soldano 
Authored: Wed May 18 17:34:55 2016 +0200
Committer: Alessio Soldano 
Committed: Wed May 18 17:34:55 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/01bf5f84/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cd299ef..d93b361 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,8 +54,10 @@ B f98785bd8490c4717353f1a9688cae3e7a823ec2
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 0578e16146527b0782530c40ba2db17531756d96
+M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
+M 2538ae42fb0c774023deed5264291b2fe6658cb8
 M 26edcd457ea507075a4c82e2787f11f11a432876
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 386805560479b35276d88605c5acf805e3004aa5
@@ -78,5 +80,6 @@ M a1710bdd783afcd667d9e72ccb031480d3806850
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
+M cf8ac102e728b8745da265ec969f7b5160829fdb
 M fa973bd7ab43099151f83beea351b80c7140eaab
 M fe89bf0fb8379428667f66312e6942e906142d6f

[3/4] cxf git commit: Fix unused imports

[asoldano]

Fix unused imports


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

Branch: refs/heads/3.1.x-fixes
Commit: fa2c6249224db7107ca0b92a60851310fdb6dfdf
Parents: 1046894
Author: Daniel Kulp 
Authored: Tue May 17 12:24:18 2016 -0400
Committer: Alessio Soldano 
Committed: Wed May 18 17:33:27 2016 +0200

--
 .../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fa2c6249/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
--
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1f6eeb4..c6b2087 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,7 +30,6 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
@@ -40,7 +39,6 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxSource;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Assert;
 import org.junit.Test;

[1/4] cxf git commit: [CXF-6900] Get Colm's tests working....

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0ceb6a1d9 -> 01bf5f841


[CXF-6900] Get Colm's tests working


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

Branch: refs/heads/3.1.x-fixes
Commit: a1e4b88063404e25e75db25d1022a484300a8ca1
Parents: 0ceb6a1
Author: Daniel Kulp 
Authored: Tue May 17 12:13:14 2016 -0400
Committer: Alessio Soldano 
Committed: Wed May 18 14:35:52 2016 +0200

--
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java   |  4 
 .../apache/cxf/binding/soap/saaj/ParseBodyTest.java   | 14 ++
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a1e4b880/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 14b5c2e..d29276c 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -52,6 +52,9 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 if (namespace != null 
 && 
namespace.equals(part.getEnvelope().getElementName().getURI())) {
 adjustPrefix((SOAPElement)nd2, pfx);
+if ("Envelope".equals(nd2.getLocalName())) {
+adjustPrefix(part.getEnvelope().getHeader(), pfx);
+}
 }
 } catch (SOAPException e) {
 //ignore, fallback
@@ -146,6 +149,7 @@ public final class SAAJStreamWriter extends 
OverlayW3CDOMStreamWriter {
 el = ((SOAPElement)cur).addChildElement(local, "", "");
 } else {
 el = ((SOAPElement)cur).addChildElement(local, pfx == null 
? "" : pfx, ns);
+adjustPrefix((SOAPElement)el, pfx);
 }
 cur.removeChild(el);
 return el;

http://git-wip-us.apache.org/repos/asf/cxf/blob/a1e4b880/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
--
diff --git 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index bcdb6f9..1f6eeb4 100644
--- 
a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ 
b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
@@ -39,6 +40,7 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxSource;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -87,26 +89,30 @@ public class ParseBodyTest extends Assert {
 
 // TODO - See CXF-6900
 @Test
-@org.junit.Ignore
 public void testReadSOAPFault() throws Exception {
 InputStream inStream = 
getClass().getResourceAsStream("soap12-fault.xml");
 Document doc = StaxUtils.read(inStream);
-
+
 SoapMessage msg = new SoapMessage(new MessageImpl());
 Exchange ex = new ExchangeImpl();
 ex.setInMessage(msg);
 
 SOAPMessage saajMsg = 
MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
 SOAPPart part = saajMsg.getSOAPPart();
-part.setContent(new DOMSource(doc));
+SAAJStreamWriter writer = new SAAJStreamWriter(part);
+StaxUtils.copy(doc, writer);
+//Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
+//part.setContent(s);
 saajMsg.saveChanges();
-
+
 msg.setContent(SOAPMessage.class, saajMsg);
 doc = part;
 
 // System.out.println("OUTPUT: " + StaxUtils.toString(doc));
 
 byte[] docbytes = getMessageBytes(doc);
+
+// System.out.println("OUTPUT: " + new String(docbytes));
   

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

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f01d17173 -> 727e403f7


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


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

Branch: refs/heads/3.0.x-fixes
Commit: 93c84a176cb94d0491971a7a394f61fad945d6fe
Parents: f01d171
Author: Alessio Soldano 
Authored: Wed Apr 13 23:02:56 2016 +0200
Committer: Alessio Soldano 
Committed: Thu Apr 14 11:49:13 2016 +0200

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


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

http://git-wip-us.apache.org/repos/asf/cxf/blob/93c84a17/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
--
diff --git 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
 
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 1f12f8f..37b88c5 100644
--- 
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++ 

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 727e403f7b3f8dc3c64bcc19ce3e2eddb166a9aa
Parents: 93c84a1
Author: Alessio Soldano 
Authored: Thu Apr 14 11:51:10 2016 +0200
Committer: Alessio Soldano 
Committed: Thu Apr 14 11:51:10 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/727e403f/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e366d84..b3449d0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1131,6 +1131,7 @@ M b4aa01a0de28462f7338d232e2e88be8512882af
 M b5320827561467de7e04afdba15a6063d26493a3
 M b7d33366f3311dc33c7da389f98fced6fd470c93
 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
+M bbc3ca287cca8cf982b62fb85c6a2bbc5bb59754
 M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
 M bd1d31f195caab56fbe565fbfb63d9170a0c9406
 M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa

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

[asoldano]

Recording .gitmergeinfo Changes


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

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

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


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

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

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4a749e745 -> c7234f413


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


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

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

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


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

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

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

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 6566e5c6e -> 26edcd457


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


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

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

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


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

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

[1/2] cxf git commit: [CXF-6826] Cache MediaTypeHeaderProvider.valueOf results (with automatic cache cleanup when reaching a threshold)

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 810063b93 -> e4cab6471


[CXF-6826] Cache MediaTypeHeaderProvider.valueOf results (with automatic cache 
cleanup when reaching a threshold)


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

Branch: refs/heads/3.1.x-fixes
Commit: 8a9f6cdafc87a22314c805e995fc5d286fe8beed
Parents: 810063b
Author: Alessio Soldano 
Authored: Thu Mar 10 20:39:49 2016 +0100
Committer: Alessio Soldano 
Committed: Fri Mar 11 10:38:08 2016 +0100

--
 .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8a9f6cda/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 39f484e..5d297b6 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -25,6 +25,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -45,17 +46,34 @@ public class MediaTypeHeaderProvider implements 
HeaderDelegate {
 private static final Pattern COMPLEX_PARAMETERS = 
 Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
 
+private static Map map = new ConcurrentHashMap();
+private static final int MAX_MT_CACHE_SIZE = 
+Integer.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 
200);
+
 public MediaType fromString(String mType) {
 
 return valueOf(mType);
 }
 
 public static MediaType valueOf(String mType) {
-
 if (mType == null) {
 throw new IllegalArgumentException("Media type value can not be 
null");
 }
 
+MediaType result = map.get(mType);
+if (result == null) {
+result = internalValueOf(mType);
+final int size = map.size();
+if (size >= MAX_MT_CACHE_SIZE) {
+map.clear();
+}
+map.put(mType, result);
+}
+return result;
+}
+
+public static MediaType internalValueOf(String mType) {
+
 int i = mType.indexOf('/');
 if (i == -1) {
 return handleMediaTypeWithoutSubtype(mType.trim());

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: e4cab6471a5dafedcd5b69418266f03235adf5d6
Parents: 8a9f6cd
Author: Alessio Soldano 
Authored: Fri Mar 11 10:38:41 2016 +0100
Committer: Alessio Soldano 
Committed: Fri Mar 11 10:38:41 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4cab647/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 889afbb..8191d2a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -68,4 +68,5 @@ M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
+M fa973bd7ab43099151f83beea351b80c7140eaab
 M fe89bf0fb8379428667f66312e6942e906142d6f

[2/2] cxf git commit: Merge remote-tracking branch 'asoldano/CXF-6826'

[asoldano]

Merge remote-tracking branch 'asoldano/CXF-6826'


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

Branch: refs/heads/master
Commit: 2196b6c2ccdfc2029c3ef9c7c99a338ce4d40db5
Parents: 15504ab fa973bd
Author: Alessio Soldano <asold...@redhat.com>
Authored: Fri Mar 11 09:36:25 2016 +0100
Committer: Alessio Soldano <asold...@redhat.com>
Committed: Fri Mar 11 09:36:25 2016 +0100

--
 .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--

[1/2] cxf git commit: [CXF-6826] Cache MediaTypeHeaderProvider.valueOf results (with automatic cache cleanup when reaching a threshold)

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 15504ab90 -> 2196b6c2c


[CXF-6826] Cache MediaTypeHeaderProvider.valueOf results (with automatic cache 
cleanup when reaching a threshold)


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

Branch: refs/heads/master
Commit: fa973bd7ab43099151f83beea351b80c7140eaab
Parents: 53aed2e
Author: Alessio Soldano 
Authored: Thu Mar 10 20:39:49 2016 +0100
Committer: Alessio Soldano 
Committed: Thu Mar 10 20:39:49 2016 +0100

--
 .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fa973bd7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 39f484e..5d297b6 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -25,6 +25,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -45,17 +46,34 @@ public class MediaTypeHeaderProvider implements 
HeaderDelegate {
 private static final Pattern COMPLEX_PARAMETERS = 
 Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
 
+private static Map map = new ConcurrentHashMap();
+private static final int MAX_MT_CACHE_SIZE = 
+Integer.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 
200);
+
 public MediaType fromString(String mType) {
 
 return valueOf(mType);
 }
 
 public static MediaType valueOf(String mType) {
-
 if (mType == null) {
 throw new IllegalArgumentException("Media type value can not be 
null");
 }
 
+MediaType result = map.get(mType);
+if (result == null) {
+result = internalValueOf(mType);
+final int size = map.size();
+if (size >= MAX_MT_CACHE_SIZE) {
+map.clear();
+}
+map.put(mType, result);
+}
+return result;
+}
+
+public static MediaType internalValueOf(String mType) {
+
 int i = mType.indexOf('/');
 if (i == -1) {
 return handleMediaTypeWithoutSubtype(mType.trim());

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 807605c33fdaf829b54196b8e9b8143486e35a24
Parents: 5122372
Author: Alessio Soldano 
Authored: Wed Mar 2 17:27:59 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Mar 2 17:27:59 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/807605c3/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 62f1a3f..cdf8db4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -904,6 +904,7 @@ M 5a9a2a09887c69cdfeff5eac22996ab35fbfc0cf
 M 5b20a3c909440bab1f0080a0b4b414fef6a6d4b9
 M 5d436c40e8be07ffdb336344692580faa5833586
 M 5e4a14b4da1f1b27e4df811be80a7f11fc6dae8d
+M 5e7b2c1700dde193391f994b47abba10dcc0d2b1
 M 5e919271e2e92f9845d6454b37ab0b86cfc66591
 M 5e97d1e29e85d80f0679748cc4df0d8e0647ee16
 M 5fbe7b49b88deff15f755c15f5a4c421943acc4f

[1/2] cxf git commit: handle arrays of generics

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1d802c274 -> 807605c33


handle arrays of generics


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

Branch: refs/heads/3.0.x-fixes
Commit: 51223721d3b3e0b980b804971f510ad7c0d14186
Parents: 1d802c2
Author: Chris Dolphy 
Authored: Thu Feb 25 22:33:32 2016 -0600
Committer: Alessio Soldano 
Committed: Wed Mar 2 17:26:46 2016 +0100

--
 .../apache/cxf/jaxb/JAXBContextInitializer.java| 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/51223721/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 902d0a8..62a14a6 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -251,6 +251,21 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 Type componentType = gt.getGenericComponentType();
 if (componentType instanceof Class) {
 ct = (Class)componentType;
+} else if (componentType instanceof ParameterizedType) {
+final ParameterizedType parameterizedType = 
(ParameterizedType)componentType;
+final Type rawType = parameterizedType.getRawType();
+if (rawType instanceof Class) {
+ct = (Class)rawType;
+} else {
+throw new IllegalArgumentException("Unable to determine 
type for " + rawType);
+}
+if (!parameterizedType.getRawType().equals(Enum.class)) {
+for (Type t2 : parameterizedType.getActualTypeArguments()) 
{
+if (shouldTypeBeAdded(t2, parameterizedType)) {
+addType(t2);
+}
+}
+}
 } else {
 TypeVariable tv = (TypeVariable)componentType;
 Type[] bounds = tv.getBounds();
@@ -592,4 +607,4 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 }
 
 
-}
\ No newline at end of file
+}

[1/3] cxf git commit: handle arrays of generics

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f116182ef -> 585927421


handle arrays of generics


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

Branch: refs/heads/3.1.x-fixes
Commit: 5e7b2c1700dde193391f994b47abba10dcc0d2b1
Parents: 1c17a94
Author: Chris Dolphy 
Authored: Thu Feb 25 22:33:32 2016 -0600
Committer: Chris Dolphy 
Committed: Thu Feb 25 22:33:32 2016 -0600

--
 .../apache/cxf/jaxb/JAXBContextInitializer.java| 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5e7b2c17/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index b7814d8..8415f0e 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -251,6 +251,21 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 Type componentType = gt.getGenericComponentType();
 if (componentType instanceof Class) {
 ct = (Class)componentType;
+} else if (componentType instanceof ParameterizedType) {
+final ParameterizedType parameterizedType = 
(ParameterizedType)componentType;
+final Type rawType = parameterizedType.getRawType();
+if (rawType instanceof Class) {
+ct = (Class)rawType;
+} else {
+throw new IllegalArgumentException("Unable to determine 
type for " + rawType);
+}
+if (!parameterizedType.getRawType().equals(Enum.class)) {
+for (Type t2 : parameterizedType.getActualTypeArguments()) 
{
+if (shouldTypeBeAdded(t2, parameterizedType)) {
+addType(t2);
+}
+}
+}
 } else {
 TypeVariable tv = (TypeVariable)componentType;
 Type[] bounds = tv.getBounds();
@@ -592,4 +607,4 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 }
 
 
-}
\ No newline at end of file
+}

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 58592742163e7b7e28992304ed1ff2e7e8917f91
Parents: b0b9f1e
Author: Alessio Soldano 
Authored: Wed Mar 2 17:16:29 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Mar 2 17:16:29 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/58592742/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ea88da7..d09ac58 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,5 +1,6 @@
 origin/master
 B 0234c09c11c0f89bd17f9b82695daa12af1fad09
+B 02d826d7ad223c75ad706c7b5443bd06ee6e2589
 B 0336a2399b1980e04372c651368f8718f75a4f14
 B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
 B 0dfaf8d72574511ad9027c663707f9e30b945fbc

[2/3] cxf git commit: Merge remote-tracking branch 'cdolphy/CXF-6799-3.1.x' into 3.1.x-fixes

[asoldano]

Merge remote-tracking branch 'cdolphy/CXF-6799-3.1.x' into 3.1.x-fixes


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

Branch: refs/heads/3.1.x-fixes
Commit: b0b9f1e9225157f75ab7c23d1d88499774fbb579
Parents: f116182 5e7b2c1
Author: Alessio Soldano 
Authored: Wed Mar 2 17:05:59 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Mar 2 17:05:59 2016 +0100

--
 .../apache/cxf/jaxb/JAXBContextInitializer.java| 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--

cxf git commit: [CXF-6799] handle arrays of generics - patch by Chris Dolphy

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master a9fe8470c -> 02d826d7a


[CXF-6799] handle arrays of generics - patch by Chris Dolphy


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

Branch: refs/heads/master
Commit: 02d826d7ad223c75ad706c7b5443bd06ee6e2589
Parents: a9fe847
Author: Alessio Soldano 
Authored: Wed Mar 2 15:35:17 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Mar 2 15:38:31 2016 +0100

--
 .../apache/cxf/jaxb/JAXBContextInitializer.java| 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/02d826d7/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index b7814d8..8415f0e 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -251,6 +251,21 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 Type componentType = gt.getGenericComponentType();
 if (componentType instanceof Class) {
 ct = (Class)componentType;
+} else if (componentType instanceof ParameterizedType) {
+final ParameterizedType parameterizedType = 
(ParameterizedType)componentType;
+final Type rawType = parameterizedType.getRawType();
+if (rawType instanceof Class) {
+ct = (Class)rawType;
+} else {
+throw new IllegalArgumentException("Unable to determine 
type for " + rawType);
+}
+if (!parameterizedType.getRawType().equals(Enum.class)) {
+for (Type t2 : parameterizedType.getActualTypeArguments()) 
{
+if (shouldTypeBeAdded(t2, parameterizedType)) {
+addType(t2);
+}
+}
+}
 } else {
 TypeVariable tv = (TypeVariable)componentType;
 Type[] bounds = tv.getBounds();
@@ -592,4 +607,4 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 }
 
 
-}
\ No newline at end of file
+}

[1/2] cxf git commit: Allow overriding methodToInvoke selection in JAXRSInvoker

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ad577419d -> f183b9f00


Allow overriding methodToInvoke selection in JAXRSInvoker


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

Branch: refs/heads/3.1.x-fixes
Commit: 1f44b234594e60f9604959cd2859f3970d3d4360
Parents: ad57741
Author: Alessio Soldano 
Authored: Mon Feb 1 23:33:05 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Feb 1 23:47:25 2016 +0100

--
 .../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 29 
 1 file changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f44b234/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index ad2c627..ac445d9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -166,18 +166,7 @@ public class JAXRSInvoker extends AbstractInvoker {
 }
 
 
-Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
-
-Method methodToInvoke = null;
-if (Proxy.class.isInstance(resourceObject)) {
-methodToInvoke = 
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
-if (methodToInvoke == null) {
-methodToInvoke = InjectionUtils.checkProxy(resourceMethod, 
resourceObject);
-cri.getMethodDispatcher().addProxyMethod(resourceMethod, 
methodToInvoke);
-}
-} else {
-methodToInvoke = resourceMethod;
-}
+Method methodToInvoke = getMethodToInvoke(cri, ori, resourceObject);
 
 List params = null;
 if (request instanceof List) {
@@ -290,6 +279,22 @@ public class JAXRSInvoker extends AbstractInvoker {
 setResponseContentTypeIfNeeded(inMessage, result);
 return result;
 }
+
+protected Method getMethodToInvoke(ClassResourceInfo cri, 
OperationResourceInfo ori, Object resourceObject) {
+Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
+
+Method methodToInvoke = null;
+if (Proxy.class.isInstance(resourceObject)) {
+methodToInvoke = 
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
+if (methodToInvoke == null) {
+methodToInvoke = InjectionUtils.checkProxy(resourceMethod, 
resourceObject);
+cri.getMethodDispatcher().addProxyMethod(resourceMethod, 
methodToInvoke);
+}
+} else {
+methodToInvoke = resourceMethod;
+}
+return methodToInvoke;
+}
 
 private MessageContentsList checkExchangeForResponse(Exchange exchange) {
 Response r = exchange.get(Response.class);

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: f183b9f00a596ff645b30fdc0e4954f0bf26c80f
Parents: 1f44b23
Author: Alessio Soldano 
Authored: Mon Feb 1 23:48:25 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Feb 1 23:48:25 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f183b9f0/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f781818..3691749 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,4 +25,5 @@ M 8583a24ac541dc373503d7a6c59cd90890acdae3
 M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
 M a1710bdd783afcd667d9e72ccb031480d3806850
+M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M fe89bf0fb8379428667f66312e6942e906142d6f

cxf git commit: Allow overriding methodToInvoke selection in JAXRSInvoker

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 072aba653 -> abcc137cb


Allow overriding methodToInvoke selection in JAXRSInvoker


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

Branch: refs/heads/master
Commit: abcc137cb9b27e0da0b4270a18ac2a32df1e9990
Parents: 072aba6
Author: Alessio Soldano 
Authored: Mon Feb 1 23:33:05 2016 +0100
Committer: Alessio Soldano 
Committed: Mon Feb 1 23:33:05 2016 +0100

--
 .../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 29 
 1 file changed, 17 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/abcc137c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index ad2c627..ac445d9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -166,18 +166,7 @@ public class JAXRSInvoker extends AbstractInvoker {
 }
 
 
-Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
-
-Method methodToInvoke = null;
-if (Proxy.class.isInstance(resourceObject)) {
-methodToInvoke = 
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
-if (methodToInvoke == null) {
-methodToInvoke = InjectionUtils.checkProxy(resourceMethod, 
resourceObject);
-cri.getMethodDispatcher().addProxyMethod(resourceMethod, 
methodToInvoke);
-}
-} else {
-methodToInvoke = resourceMethod;
-}
+Method methodToInvoke = getMethodToInvoke(cri, ori, resourceObject);
 
 List params = null;
 if (request instanceof List) {
@@ -290,6 +279,22 @@ public class JAXRSInvoker extends AbstractInvoker {
 setResponseContentTypeIfNeeded(inMessage, result);
 return result;
 }
+
+protected Method getMethodToInvoke(ClassResourceInfo cri, 
OperationResourceInfo ori, Object resourceObject) {
+Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
+
+Method methodToInvoke = null;
+if (Proxy.class.isInstance(resourceObject)) {
+methodToInvoke = 
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
+if (methodToInvoke == null) {
+methodToInvoke = InjectionUtils.checkProxy(resourceMethod, 
resourceObject);
+cri.getMethodDispatcher().addProxyMethod(resourceMethod, 
methodToInvoke);
+}
+} else {
+methodToInvoke = resourceMethod;
+}
+return methodToInvoke;
+}
 
 private MessageContentsList checkExchangeForResponse(Exchange exchange) {
 Response r = exchange.get(Response.class);

[2/2] cxf git commit: [CXF-6738] Replace synchronized blocks with DCL to reduce contention

[asoldano]

[CXF-6738] Replace synchronized blocks with DCL to reduce contention


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

Branch: refs/heads/master
Commit: 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
Parents: 1fe6ef5
Author: Alessio Soldano 
Authored: Thu Jan 7 22:51:53 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:48:12 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 158 +++
 1 file changed, 91 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8e650cfe/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 511a26c..e3af4c9 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -194,19 +194,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
 public EffectivePolicy getEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
Conduit c, Message 
m) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(c);
-if (m != null) {
-boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(c);
+epi.initialise(ei, boi, this, assertor, true, true, m);
+if (m != null) {
+boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, true, true, m);
-effectivePolicy = epi;
 }
-return effectivePolicy;
 }
+return effectivePolicy;
 }
 
 public void setEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
@@ -220,19 +223,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
List incoming, 
 Message m) {
 if (incoming == null) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(d);
-if (m != null) {
-boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(d);
+epi.initialise(ei, boi, this, assertor, false, false, 
null);
+if (m != null) {
+boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, false, false, 
null);
-effectivePolicy = epi;
 }
-return effectivePolicy;
-} 
+}
+return effectivePolicy;
 }
 

[1/2] cxf git commit: [CXF-6738] Minor refactoring

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 1fe6ef5fa -> a1710bdd7


[CXF-6738] Minor refactoring


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

Branch: refs/heads/master
Commit: a1710bdd783afcd667d9e72ccb031480d3806850
Parents: 8e650cf
Author: Alessio Soldano 
Authored: Tue Jan 26 23:52:22 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:48:12 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a1710bdd/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index e3af4c9..6155a38 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -313,18 +313,7 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-synchronized (ei) {
-ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-ep = createEndpointPolicyInfo(ei, isRequestor, assertor, 
m);
-}
-}
-}
-return ep;
+return createEndpointPolicyInfo(ei, isRequestor, assertor, m);
 }
 
 public void setClientEndpointPolicy(EndpointInfo ei, EndpointPolicy ep) {
@@ -600,16 +589,27 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 return vocabulary;
 } 
 
-EndpointPolicyImpl createEndpointPolicyInfo(EndpointInfo ei, 
-boolean isRequestor, 
+EndpointPolicy createEndpointPolicyInfo(EndpointInfo ei,
+boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, isRequestor, 
assertor);
-epi.initialize(m);
-if (m != null) {
-ei.setProperty(isRequestor ? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER, epi);
+EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
+   ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+synchronized (ei) {
+ep = (EndpointPolicy)ei.getProperty(isRequestor
+? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, 
isRequestor, assertor);
+epi.initialize(m);
+if (m != null) {
+ei.setProperty(isRequestor ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER, epi);
+}
+ep = epi;
+}
+}
 }
-return epi;
+return ep;
 }
 
 

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: e7a75b695afd3c64e42a2dcdf26b1febfa1250a6
Parents: a0ab1ae
Author: Alessio Soldano 
Authored: Wed Jan 27 14:00:17 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 14:00:17 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/e7a75b69/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7c7ed88..f781818 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -22,5 +22,7 @@ B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
+M a1710bdd783afcd667d9e72ccb031480d3806850
 M fe89bf0fb8379428667f66312e6942e906142d6f

[1/3] cxf git commit: [CXF-6738] Replace synchronized blocks with DCL to reduce contention

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 48aa8e93e -> e7a75b695


[CXF-6738] Replace synchronized blocks with DCL to reduce contention


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

Branch: refs/heads/3.1.x-fixes
Commit: 0384a69b7bc0b4846e89469f974ace534e7734d7
Parents: 48aa8e9
Author: Alessio Soldano 
Authored: Thu Jan 7 22:51:53 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:58:56 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 158 +++
 1 file changed, 91 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0384a69b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 511a26c..e3af4c9 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -194,19 +194,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
 public EffectivePolicy getEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
Conduit c, Message 
m) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(c);
-if (m != null) {
-boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(c);
+epi.initialise(ei, boi, this, assertor, true, true, m);
+if (m != null) {
+boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, true, true, m);
-effectivePolicy = epi;
 }
-return effectivePolicy;
 }
+return effectivePolicy;
 }
 
 public void setEffectiveClientRequestPolicy(EndpointInfo ei, 
BindingOperationInfo boi, 
@@ -220,19 +223,22 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 
List incoming, 
 Message m) {
 if (incoming == null) {
-synchronized (ei) {
-EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
-if (null == effectivePolicy) {
-EffectivePolicyImpl epi = createOutPolicyInfo();
-Assertor assertor = PolicyUtils.createAsserter(d);
-if (m != null) {
-boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+EffectivePolicy effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (effectivePolicy == null) {
+synchronized (ei) {
+effectivePolicy = 
(EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER);
+if (null == effectivePolicy) {
+EffectivePolicyImpl epi = createOutPolicyInfo();
+Assertor assertor = PolicyUtils.createAsserter(d);
+epi.initialise(ei, boi, this, assertor, false, false, 
null);
+if (m != null) {
+boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi);
+}
+effectivePolicy = epi;
 }
-epi.initialise(ei, boi, this, assertor, false, false, 
null);
-effectivePolicy = epi;
 }
-return effectivePolicy;
- 

[2/3] cxf git commit: [CXF-6738] Minor refactoring

[asoldano]

[CXF-6738] Minor refactoring


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

Branch: refs/heads/3.1.x-fixes
Commit: a0ab1ae5797eace72c563d0e2ae15d15e20d4d1f
Parents: 0384a69
Author: Alessio Soldano 
Authored: Tue Jan 26 23:52:22 2016 +0100
Committer: Alessio Soldano 
Committed: Wed Jan 27 13:59:07 2016 +0100

--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  | 38 ++--
 1 file changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a0ab1ae5/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index e3af4c9..6155a38 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -313,18 +313,7 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-synchronized (ei) {
-ep = (EndpointPolicy)ei.getProperty(isRequestor
-? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
-if (ep == null) {
-ep = createEndpointPolicyInfo(ei, isRequestor, assertor, 
m);
-}
-}
-}
-return ep;
+return createEndpointPolicyInfo(ei, isRequestor, assertor, m);
 }
 
 public void setClientEndpointPolicy(EndpointInfo ei, EndpointPolicy ep) {
@@ -600,16 +589,27 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
 return vocabulary;
 } 
 
-EndpointPolicyImpl createEndpointPolicyInfo(EndpointInfo ei, 
-boolean isRequestor, 
+EndpointPolicy createEndpointPolicyInfo(EndpointInfo ei,
+boolean isRequestor,
 Assertor assertor,
 Message m) {
-EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, isRequestor, 
assertor);
-epi.initialize(m);
-if (m != null) {
-ei.setProperty(isRequestor ? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER, epi);
+EndpointPolicy ep = (EndpointPolicy)ei.getProperty(isRequestor
+   ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+synchronized (ei) {
+ep = (EndpointPolicy)ei.getProperty(isRequestor
+? POLICY_INFO_ENDPOINT_CLIENT : 
POLICY_INFO_ENDPOINT_SERVER);
+if (ep == null) {
+EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, this, 
isRequestor, assertor);
+epi.initialize(m);
+if (m != null) {
+ei.setProperty(isRequestor ? 
POLICY_INFO_ENDPOINT_CLIENT : POLICY_INFO_ENDPOINT_SERVER, epi);
+}
+ep = epi;
+}
+}
 }
-return epi;
+return ep;
 }
 
 

cxf git commit: Recording .gitmergeinfo Changes

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2fccfdcdb -> b4bfa886e


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

Branch: refs/heads/3.1.x-fixes
Commit: b4bfa886ee80b681b09eb578c69a03a43ea964e2
Parents: 2fccfdc
Author: Alessio Soldano 
Authored: Fri Jan 8 23:30:02 2016 +0100
Committer: Alessio Soldano 
Committed: Fri Jan 8 23:30:02 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b4bfa886/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b6394a2..436297c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -15,4 +15,5 @@ B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5
 B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
+M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 8583a24ac541dc373503d7a6c59cd90890acdae3

cxf git commit: [CXF-6739] Refactor to reduce memory pressure in org.apache.cxf.attachment.AttachmentDeserializer: * reset and reuse the same StringBuilder for fetching each line from the message inpu

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 785994070 -> 2fccfdcdb


[CXF-6739] Refactor to reduce memory pressure in 
org.apache.cxf.attachment.AttachmentDeserializer:
 * reset and reuse the same StringBuilder for fetching each line from the 
message input stream, instead of allocating a new one (using 128 bytes) every 
time
 * avoid the ArrayList intermediate model and directly convert the 
StringBuilder into entries for the resulting TreeMap object
 * remove part of the special treatment of lines strating with spaces, as with 
the existing code there's no way such a line could be added to the headerLines 
list while the buffer is empty unless it's the first line from the stream 
(which means the headerLines will be empty and hence there's no need to worry 
about appending it to the previous one).


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

Branch: refs/heads/3.1.x-fixes
Commit: 2fccfdcdbcd3a8bb8ea740eda499b48b74dbaf65
Parents: 7859940
Author: Alessio Soldano 
Authored: Fri Jan 8 13:31:40 2016 +0100
Committer: Alessio Soldano 
Committed: Fri Jan 8 23:27:37 2016 +0100

--
 .../cxf/attachment/AttachmentDeserializer.java  | 109 +++
 1 file changed, 42 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2fccfdcd/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 8d54660..e8dd326 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -312,73 +312,41 @@ public class AttachmentDeserializer {
 
 
 private Map loadPartHeaders(InputStream in) throws 
IOException {
-List headerLines = new ArrayList(10);
 StringBuilder buffer = new StringBuilder(128);
-String line;
+StringBuilder b = new StringBuilder(128);
+Map heads = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 // loop until we hit the end or a null line
-while ((line = readLine(in)) != null) {
+while (readLine(in, b)) {
 // lines beginning with white space get special handling
-if (line.startsWith(" ") || line.startsWith("\t")) {
-// this gets handled using the logic defined by
-// the addHeaderLine method.  If this line is a continuation, 
but
-// there's nothing before it, just call addHeaderLine to add it
-// to the last header in the headers list
-if (buffer.length() == 0) {
-addHeaderLine(headerLines, line);
-} else {
+char c = b.charAt(0);
+if (c == ' ' || c == '\t') {
+if (buffer.length() != 0) {
 // preserve the line break and append the continuation
 buffer.append("\r\n");
-buffer.append(line);
+buffer.append(b);
 }
 } else {
 // if we have a line pending in the buffer, flush it
 if (buffer.length() > 0) {
-addHeaderLine(headerLines, buffer.toString());
+addHeaderLine(heads, buffer);
 buffer.setLength(0);
 }
 // add this to the accumulator
-buffer.append(line);
+buffer.append(b);
 }
 }
 
 // if we have a line pending in the buffer, flush it
 if (buffer.length() > 0) {
-addHeaderLine(headerLines, buffer.toString());
-}
-Map heads = new TreeMap(String.CASE_INSENSITIVE_ORDER);
-for (String h: headerLines) {
-int separator = h.indexOf(':');
-String name = null;
-String value = "";
-if (separator == -1) {
-name = h.trim();
-} else {
-name = h.substring(0, separator);
-// step past the separator.  Now we need to remove any leading 
white space characters.
-separator++;
-
-while (separator < h.length()) {
-char ch = h.charAt(separator);
-if (ch != ' ' && ch != '\t' && ch != '\r' && ch != '\n') {
-break;

[1/3] cxf git commit: [CXF-6655] Do not early fail when the HTTPConduit is initialized before a target address is set in the client (and there's no reference to a wsdl contract), perhaps because the u

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 8dc621b15 -> f1a015924


[CXF-6655] Do not early fail when the HTTPConduit is initialized before a 
target address is set in the client (and there's no reference to a wsdl 
contract), perhaps because the user is setting up a proxy in the conduit; try 
using the endpoint address set in the request context just before performing 
the invocation (and fail if that's not available either).


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

Branch: refs/heads/master
Commit: f1a015924d53e5e253aad55a49ef9a1853b6c26f
Parents: 01860c7
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:32 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 38 ++--
 1 file changed, 28 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f1a01592/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index f120abb..bb21424 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -676,10 +676,14 @@ public abstract class HTTPConduit
 setAndGetDefaultAddress();
 if (result == null) {
 if (pathInfo == null && queryString == null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 return defaultAddress;
 }
-message.put(Message.ENDPOINT_ADDRESS, defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 }
 
 // REVISIT: is this really correct?
@@ -688,8 +692,12 @@ public abstract class HTTPConduit
 }
 if (queryString != null) {
 result = result + "?" + queryString;
-}
-return result.equals(defaultAddress.getString()) ? defaultAddress : 
new Address(result);
+}
+if (defaultAddress == null) {
+return setAndGetDefaultAddress(result);
+} else {
+return result.equals(defaultAddress.getString()) ? defaultAddress 
: new Address(result);
+}
 }
 
 /**
@@ -726,12 +734,7 @@ public abstract class HTTPConduit
 if (defaultAddress == null) {
 if (fromEndpointReferenceType && 
getTarget().getAddress().getValue() != null) {
 defaultAddress = new 
Address(this.getTarget().getAddress().getValue());
-} else {
-if (endpointInfo.getAddress() == null) {
-throw new URISyntaxException("", 
- "Invalid address. 
Endpoint address cannot be null.",
- 0);
-}
+} else if (endpointInfo.getAddress() != null) {
 defaultAddress = new 
Address(endpointInfo.getAddress());
 }
 }
@@ -740,6 +743,21 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 
+private Address setAndGetDefaultAddress(String curAddr) throws 
URISyntaxException {
+if (defaultAddress == null) {
+synchronized (this) {
+if (defaultAddress == null) {
+if (curAddr != null) {
+defaultAddress = new Address(curAddr);
+} else {
+throw new URISyntaxException("",
+ "Invalid address. 
Endpoint address cannot be null.", 0);
+}
+}
+}
+}
+return defaultAddress;
+}
 /**
  * This call places HTTP Header strings into the headers that are relevant
  * to the Authorization policies that are set on this conduit by

[3/3] cxf git commit: [CXF-6655] Adding testcase

[asoldano]

[CXF-6655] Adding testcase


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

Branch: refs/heads/master
Commit: b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
Parents: 8dc621b
Author: Alessio Soldano 
Authored: Fri Oct 30 00:15:20 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 systests/jaxws/pom.xml  |  15 +++
 .../apache/cxf/systest/jaxws/CXF6655Test.java   | 109 +++
 2 files changed, 124 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3bf20ab/systests/jaxws/pom.xml
--
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 3c9d960..634e3cd 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -262,6 +262,21 @@
 ${cxf.netty3.version}
 test
 
+
+org.littleshoot
+littleproxy
+0.4
+
+
+log4j
+log4j
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b3bf20ab/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
new file mode 100644
index 000..d8eca96
--- /dev/null
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -0,0 +1,109 @@
+/**
+ * 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.jaxws;
+
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.cxf.transports.http.configuration.ProxyServerType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.littleshoot.proxy.DefaultHttpProxyServer;
+import org.littleshoot.proxy.HttpFilter;
+import org.littleshoot.proxy.ProxyUtils;
+
+public class CXF6655Test extends AbstractClientServerTestBase {
+static final String PORT = allocatePort(Server.class);
+static final int PROXY_PORT = 
Integer.parseInt(allocatePort(CXF6655Test.class));
+static DefaultHttpProxyServer proxy;
+
+public static class Server extends AbstractBusTestServerBase {
+
+protected void run() {
+Object implementor = new HelloImpl();
+String address = "http://localhost:; + PORT + "/hello";
+Endpoint.publish(address, implementor);
+}
+
+public static void main(String[] args) {
+try {
+Server s = new Server();
+s.start();
+} catch (Exception ex) {
+ex.printStackTrace();
+System.exit(-1);
+} finally {
+System.out.println("done!");
+}
+}
+}
+
+@AfterClass
+public static void stopProxy() {
+proxy.stop();
+proxy = null;
+}
+
+@BeforeClass
+public static void startServers() throws Exception {
+assertTrue("server did not launch 

[2/3] cxf git commit: [CXF-6655] Modifying test to reproduce the failure scenario

[asoldano]

[CXF-6655] Modifying test to reproduce the failure scenario


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

Branch: refs/heads/master
Commit: 01860c78f6fd7554cf89a9bc912ca78d2b304efe
Parents: b3bf20a
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:07 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 14:17:37 2015 +0100

--
 .../org/apache/cxf/systest/jaxws/CXF6655Test.java   | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/01860c78/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index d8eca96..6dcd38b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -80,12 +80,24 @@ public class CXF6655Test extends 
AbstractClientServerTestBase {
new HashMap());
 proxy.start();
 }
+
+@Test
+public void testConnection() throws Exception {
+QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/;, 
"HelloService");
+HelloService service = new HelloService(null, serviceName);
+assertNotNull(service);
+Hello hello = service.getHelloPort();
+
+
((BindingProvider)hello).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:; + 
PORT + "/hello");
+assertEquals("getSayHi", hello.sayHi("SayHi"));
+
+}
 
 @Test
 public void testConnectionWithProxy() throws Exception {
 QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/;, 
"HelloService");
-HelloService service = new 
HelloService(getClass().getResource("/wsdl/others/hello.wsdl"),
-serviceName);
+HelloService service = new HelloService(null, serviceName);
 assertNotNull(service);
 Hello hello = service.getHelloPort();
 

[3/4] cxf git commit: [CXF-6655] Adding testcase

[asoldano]

[CXF-6655] Adding testcase


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

Branch: refs/heads/3.0.x-fixes
Commit: 0ac4ffd4ca8da307a53d50fbceedb55c53fe01f8
Parents: c9b4c04
Author: Alessio Soldano 
Authored: Fri Oct 30 00:15:20 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 systests/jaxws/pom.xml  |  15 +++
 .../apache/cxf/systest/jaxws/CXF6655Test.java   | 109 +++
 2 files changed, 124 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0ac4ffd4/systests/jaxws/pom.xml
--
diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml
index 372c2b7..3cf699a 100644
--- a/systests/jaxws/pom.xml
+++ b/systests/jaxws/pom.xml
@@ -249,6 +249,21 @@
 ${cxf.netty3.version}
 test
 
+
+org.littleshoot
+littleproxy
+0.4
+
+
+log4j
+log4j
+
+
+org.slf4j
+slf4j-log4j12
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/0ac4ffd4/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
new file mode 100644
index 000..d8eca96
--- /dev/null
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -0,0 +1,109 @@
+/**
+ * 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.jaxws;
+
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.cxf.transports.http.configuration.ProxyServerType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.littleshoot.proxy.DefaultHttpProxyServer;
+import org.littleshoot.proxy.HttpFilter;
+import org.littleshoot.proxy.ProxyUtils;
+
+public class CXF6655Test extends AbstractClientServerTestBase {
+static final String PORT = allocatePort(Server.class);
+static final int PROXY_PORT = 
Integer.parseInt(allocatePort(CXF6655Test.class));
+static DefaultHttpProxyServer proxy;
+
+public static class Server extends AbstractBusTestServerBase {
+
+protected void run() {
+Object implementor = new HelloImpl();
+String address = "http://localhost:; + PORT + "/hello";
+Endpoint.publish(address, implementor);
+}
+
+public static void main(String[] args) {
+try {
+Server s = new Server();
+s.start();
+} catch (Exception ex) {
+ex.printStackTrace();
+System.exit(-1);
+} finally {
+System.out.println("done!");
+}
+}
+}
+
+@AfterClass
+public static void stopProxy() {
+proxy.stop();
+proxy = null;
+}
+
+@BeforeClass
+public static void startServers() throws Exception {
+assertTrue("server did not launch 

[1/4] cxf git commit: [CXF-6655] Do not early fail when the HTTPConduit is initialized before a target address is set in the client (and there's no reference to a wsdl contract), perhaps because the u

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c9b4c04b2 -> 7557d5fcf


[CXF-6655] Do not early fail when the HTTPConduit is initialized before a 
target address is set in the client (and there's no reference to a wsdl 
contract), perhaps because the user is setting up a proxy in the conduit; try 
using the endpoint address set in the request context just before performing 
the invocation (and fail if that's not available either).


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

Branch: refs/heads/3.0.x-fixes
Commit: 3ed849631e4f817d5d988e4d642575c9dd5b7b16
Parents: 6dd411a
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:32 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 38 ++--
 1 file changed, 28 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ed84963/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 83e5960..7f9b6fd 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -676,10 +676,14 @@ public abstract class HTTPConduit
 setAndGetDefaultAddress();
 if (result == null) {
 if (pathInfo == null && queryString == null) {
-message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 return defaultAddress;
 }
-message.put(Message.ENDPOINT_ADDRESS, defaultAddress.getString());
+if (defaultAddress != null) {
+message.put(Message.ENDPOINT_ADDRESS, 
defaultAddress.getString());
+}
 }
 
 // REVISIT: is this really correct?
@@ -688,8 +692,12 @@ public abstract class HTTPConduit
 }
 if (queryString != null) {
 result = result + "?" + queryString;
-}
-return result.equals(defaultAddress.getString()) ? defaultAddress : 
new Address(result);
+}
+if (defaultAddress == null) {
+return setAndGetDefaultAddress(result);
+} else {
+return result.equals(defaultAddress.getString()) ? defaultAddress 
: new Address(result);
+}
 }
 
 /**
@@ -726,12 +734,7 @@ public abstract class HTTPConduit
 if (defaultAddress == null) {
 if (fromEndpointReferenceType && 
getTarget().getAddress().getValue() != null) {
 defaultAddress = new 
Address(this.getTarget().getAddress().getValue());
-} else {
-if (endpointInfo.getAddress() == null) {
-throw new URISyntaxException("", 
- "Invalid address. 
Endpoint address cannot be null.",
- 0);
-}
+} else if (endpointInfo.getAddress() != null) {
 defaultAddress = new 
Address(endpointInfo.getAddress());
 }
 }
@@ -740,6 +743,21 @@ public abstract class HTTPConduit
 return defaultAddress;
 }
 
+private Address setAndGetDefaultAddress(String curAddr) throws 
URISyntaxException {
+if (defaultAddress == null) {
+synchronized (this) {
+if (defaultAddress == null) {
+if (curAddr != null) {
+defaultAddress = new Address(curAddr);
+} else {
+throw new URISyntaxException("",
+ "Invalid address. 
Endpoint address cannot be null.", 0);
+}
+}
+}
+}
+return defaultAddress;
+}
 /**
  * This call places HTTP Header strings into the headers that are relevant
  * to the Authorization policies that are set on this conduit by

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 7557d5fcf6fb7b11d665e0778f80c139a0dc66bc
Parents: 3ed8496
Author: Alessio Soldano 
Authored: Fri Oct 30 15:18:38 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:48 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/7557d5fc/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ea84691..5275beb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -485,6 +485,7 @@ B ffb10f12d5b84cef8fbd411da3d3fd54729f4893
 B ffc766ccd1d800c10d8ee52c74d69087dcc19c62
 B ffd429be404953874e141c52a9c8ba46812d73ca
 M 008c8835a460736b6491204aa999712442c7b364
+M 01860c78f6fd7554cf89a9bc912ca78d2b304efe
 M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7
 M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
 M 05383ffcfc3fe16c6acadf1a343375c00fa1116c
@@ -653,6 +654,7 @@ M ad75192db72294e6d117e020aea890a50c166f79
 M af2f7d3a52076f60d0f98a2635e2adef256a9efe
 M b283eeb95544b6088331b37567c851564655bff4
 M b33b7d7ab68f4002b4302a26e6fb339cd495765b
+M b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
 M b4aa01a0de28462f7338d232e2e88be8512882af
 M b5320827561467de7e04afdba15a6063d26493a3
 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
@@ -701,6 +703,7 @@ M eb3dd938052b3e853b0cf85dacf31ef7f802af38
 M eb9e13e2dd4a22b1d777095a5d92139829d550b8
 M efaf05170b4f76ad61ff423e30ece58bdd226ae5
 M f02b02934bf78504ffc462c364dc43e386e727b2
+M f1a015924d53e5e253aad55a49ef9a1853b6c26f
 M f399b9290e42726e30333f261d8d7f6abc4768cc
 M f3cfadb6e7bae9233a03fa6bf862ed8eb64ce237
 M f456dd41b6352dd55404272d351b1580b53558f7

[2/4] cxf git commit: [CXF-6655] Modifying test to reproduce the failure scenario

[asoldano]

[CXF-6655] Modifying test to reproduce the failure scenario


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

Branch: refs/heads/3.0.x-fixes
Commit: 6dd411a93c3f8c936f54f47e0d66873c9ae35530
Parents: 0ac4ffd
Author: Alessio Soldano 
Authored: Fri Oct 30 14:09:07 2015 +0100
Committer: Alessio Soldano 
Committed: Fri Oct 30 15:27:47 2015 +0100

--
 .../org/apache/cxf/systest/jaxws/CXF6655Test.java   | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6dd411a9/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index d8eca96..6dcd38b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -80,12 +80,24 @@ public class CXF6655Test extends 
AbstractClientServerTestBase {
new HashMap());
 proxy.start();
 }
+
+@Test
+public void testConnection() throws Exception {
+QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/;, 
"HelloService");
+HelloService service = new HelloService(null, serviceName);
+assertNotNull(service);
+Hello hello = service.getHelloPort();
+
+
((BindingProvider)hello).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:; + 
PORT + "/hello");
+assertEquals("getSayHi", hello.sayHi("SayHi"));
+
+}
 
 @Test
 public void testConnectionWithProxy() throws Exception {
 QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/;, 
"HelloService");
-HelloService service = new 
HelloService(getClass().getResource("/wsdl/others/hello.wsdl"),
-serviceName);
+HelloService service = new HelloService(null, serviceName);
 assertNotNull(service);
 Hello hello = service.getHelloPort();
 

cxf git commit: Misc minor enhancements to HandlerChain builders and resolver

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 6fd3ada7a -> 0985e79ab


Misc minor enhancements to HandlerChain builders and resolver


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

Branch: refs/heads/master
Commit: 0985e79ab47124fbe0a08b9653ae7d4d1c2b5b97
Parents: 6fd3ada
Author: Alessio Soldano 
Authored: Tue Oct 27 18:04:18 2015 +0100
Committer: Alessio Soldano 
Committed: Tue Oct 27 18:16:12 2015 +0100

--
 .../handler/AnnotationHandlerChainBuilder.java  |  7 +++---
 .../cxf/jaxws/handler/HandlerChainBuilder.java  | 24 
 .../cxf/jaxws/handler/HandlerResolverImpl.java  |  5 
 3 files changed, 19 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0985e79a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
index d8d62f4..b72a721 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
@@ -211,14 +211,15 @@ public class AnnotationHandlerChainBuilder extends 
HandlerChainBuilder {
 if ("*".equals(namePattern)) {
 return true;
 }
-if (!namePattern.contains(":")) {
+final int idx = namePattern.indexOf(':');
+if (idx < 0) {
 String xml = StaxUtils.toString(el);
 throw new WebServiceException(
 BundleUtils.getFormattedString(BUNDLE,
"NOT_A_QNAME_PATTER",
namePattern, xml)); 
   
 }
-String pfx = namePattern.substring(0, namePattern.indexOf(':'));
+String pfx = namePattern.substring(0, idx);
 String ns = el.lookupNamespaceURI(pfx);
 if (ns == null) {
 ns = pfx;
@@ -226,7 +227,7 @@ public class AnnotationHandlerChainBuilder extends 
HandlerChainBuilder {
 if (!ns.equals(comp.getNamespaceURI())) {
 return false;
 }
-String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
+String localPart = namePattern.substring(idx + 1,
  namePattern.length());
 if (localPart.contains("*")) {
 //wildcard pattern matching

http://git-wip-us.apache.org/repos/asf/cxf/blob/0985e79a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
index c8ba542..7e733b8 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
+++ 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
@@ -93,21 +93,22 @@ public class HandlerChainBuilder {
  */
 public List sortHandlers(List handlers) {
 
-List logicalHandlers = new 
ArrayList();
-List protocolHandlers = new ArrayList();
+final int size = handlers.size();
+List logicalHandlers = new ArrayList(size);
+List protocolHandlers = new ArrayList(Math.min(10, 
size));
 
 for (Handler handler : handlers) {
 if (handler instanceof LogicalHandler) {
-logicalHandlers.add((LogicalHandler)handler);
+logicalHandlers.add(handler);
 } else {
 protocolHandlers.add(handler);
 }
 }
 
-List sortedHandlers = new ArrayList();
-sortedHandlers.addAll(logicalHandlers);
-sortedHandlers.addAll(protocolHandlers);
-return sortedHandlers;
+if (!protocolHandlers.isEmpty()) {
+logicalHandlers.addAll(protocolHandlers);
+}
+return logicalHandlers;
 }
 
 protected ClassLoader getHandlerClassLoader() {
@@ -117,7 +118,10 @@ public class HandlerChainBuilder {
 protected List buildHandlerChain(PortComponentHandlerType ht, 
ClassLoader classLoader) {
 List handlerChain = new ArrayList();
 try {
-  

cxf git commit: Revert to 1.6 java target

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 58ceaafe4 -> f181f1e75


Revert to 1.6 java target


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

Branch: refs/heads/3.0.x-fixes
Commit: f181f1e75353ea9ed2b02e6edde284b1a2888d32
Parents: 58ceaaf
Author: Alessio Soldano 
Authored: Mon Oct 26 21:26:20 2015 +0100
Committer: Alessio Soldano 
Committed: Mon Oct 26 21:26:20 2015 +0100

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f181f1e7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9a0ea76..6f4be1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -509,8 +509,8 @@
 maven-compiler-plugin
 3.3
 
-1.7
-1.7
+1.6
+1.6
 256M
 ${cxf.compiler.fork}
 UTF-8

[1/2] cxf git commit: [CXF-6552] Fixed chained imports of schema; added/fixed a bunch of tests

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes df052fbb3 -> 7fe047444


[CXF-6552] Fixed chained imports of schema; added/fixed a bunch of tests


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

Branch: refs/heads/2.7.x-fixes
Commit: 9f465cc524d56bbc3963801d1f379d2e28bf946e
Parents: df052fb
Author: Alessio Soldano 
Authored: Fri Aug 21 11:37:20 2015 +0200
Committer: Alessio Soldano 
Committed: Mon Oct 26 22:24:34 2015 +0100

--
 .../apache/cxf/common/util/URIParserUtil.java   |  74 +
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 105 +++
 .../cxf/systest/jaxws/OASISCatalogTest.java |   2 +-
 .../cxf/systest/schemaimport/SayHiImpl2.java|  64 +++
 .../systest/schemaimport/SchemaImportTest.java  |  33 +-
 .../apache/cxf/systest/schemaimport/Server.java |   3 +
 .../test/resources/wsdl_systest/e/sayHi.wsdl|  63 +++
 .../others/hello_world_bindings_catalog.wsdl|  15 +--
 .../others/hello_world_services_catalog.wsdl|  16 +--
 .../others/hello_world_wsdl_import_catalog.wsdl |  15 +--
 .../cxf/tools/util/URIParserUtilTest.java   |  25 +
 11 files changed, 349 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9f465cc5/api/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
--
diff --git a/api/src/main/java/org/apache/cxf/common/util/URIParserUtil.java 
b/api/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index d03bdf9..158765c 100644
--- a/api/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/api/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -300,4 +300,78 @@ public final class URIParserUtil {
 return normalize(arg);
 }
 }
+
+public static String relativize(String base, String toBeRelativized) 
throws URISyntaxException {
+if (base == null || toBeRelativized == null) {
+return null;
+}
+return relativize(new URI(base), new URI(toBeRelativized));
+}
+
+/**
+ * This is a custom implementation for doing what URI.relativize(URI uri) 
should be
+ * doing but is not actually doing when URI roots do not fully match.
+ * See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6226081
+ *
+ * @param baseURI   The base URI
+ * @param toBeRelativizedURI The URI to be realivized
+ * @return  The string value of the URI you'd expect to 
get as result
+ *  of calling 
baseURI.relativize(toBeRelativizedURI).
+ *  null is returned if the parameters are null or 
are not
+ *  both absolute or not absolute.
+ * @throws URISyntaxException
+ */
+public static String relativize(URI baseURI, URI toBeRelativizedURI) 
throws URISyntaxException {
+if (baseURI == null || toBeRelativizedURI == null) {
+return null;
+}
+if (baseURI.isAbsolute() ^ toBeRelativizedURI.isAbsolute()) {
+return null;
+}
+final String base = baseURI.getSchemeSpecificPart();
+final String toBeRelativized = 
toBeRelativizedURI.getSchemeSpecificPart();
+final int l1 = base.length();
+final int l2 = toBeRelativized.length();
+if (l1 == 0) {
+return toBeRelativized;
+}
+int slashes = 0;
+StringBuilder sb = new StringBuilder();
+boolean differenceFound = false;
+for (int i = 0; i < l1; i++) {
+char c = base.charAt(i);
+if (i < l2) {
+if (!differenceFound && c == toBeRelativized.charAt(i)) {
+sb.append(c);
+} else {
+differenceFound = true;
+if (c == '/') {
+slashes++;
+}
+}
+} else {
+if (c == '/') {
+slashes++;
+}
+}
+}
+String rResolved = new URI(getRoot(sb.toString())).relativize(new 
URI(toBeRelativized)).toString();
+StringBuilder relativizedPath = new StringBuilder();
+for (int i = 0; i < slashes; i++) {
+relativizedPath.append("../");
+}
+relativizedPath.append(rResolved);
+return relativizedPath.toString();
+}
+
+private static String getRoot(String uri) {
+int idx = uri.lastIndexOf('/');
+if (idx == uri.length() - 1) {
+return uri;
+

[2/2] cxf git commit: [CXF-6621] Schema imports are not handled correctly in generated WSDL

[asoldano]

[CXF-6621] Schema imports are not handled correctly in generated WSDL

...and XSD files when using catalog rewrites

Fixes these issues:

- import of nested XSDs that lies in different directory tree from WSDL
  files

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/xsd/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd;
  /xsd/schema.xsd

  ```

- import and access of nested XSDs with equal relative paths when XSDs
  are outside of WSDL directory (previously this was working only when
  XSDs were inside WSDL directory)

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/xsd/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd;
  /xsd/schema.xsd - imports "d/included.xsd"
  /xsd/d/included.xsd - imports "d/included.xsd"
  /xsd/d/d/included.xsd
  ```

- accessing nested XSD and WSDL under URIs affected by rewrite rules
  which aren't directly used by WSDLs/XSDs

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/wsdl/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "./included.wsdl"
  /wsdl/included.wsdl

request for: http://example.org/uri/included.wsdl
  ```

- in some cases imports weren't working when catalog rule rewritePrefix
  was "/path" instead of "classpath:/path" - catalog resolves those two
  into different values


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

Branch: refs/heads/2.7.x-fixes
Commit: 7fe0474442d1f2394bff3606126030004ba1a6d3
Parents: 9f465cc
Author: Tomas Hofman 
Authored: Thu Oct 1 15:43:37 2015 +0200
Committer: Alessio Soldano 
Committed: Mon Oct 26 22:24:35 2015 +0100

--
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 214 +++
 .../cxf/systest/jaxws/OASISCatalogTest.java | 131 
 .../main/resources/META-INF/jax-ws-catalog.xml  |   2 +
 .../others/hello_world_messages_catalog.wsdl|  10 +
 .../resources/wsdl/schemas/another-schema.xsd   |  29 +++
 .../wsdl/schemas/d/another-included.xsd |  29 +++
 .../wsdl/schemas/d/d/another-included.xsd   |  27 +++
 .../resources/wsdl/schemas/d/d/included.xsd |  27 +++
 .../main/resources/wsdl/schemas/d/included.xsd  |  29 +++
 .../src/main/resources/wsdl/schemas/schema.xsd  |  29 +++
 10 files changed, 344 insertions(+), 183 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7fe04744/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index b99949f..3202bab 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -60,6 +60,7 @@ import org.apache.cxf.catalog.OASISCatalogManagerHelper;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.URIParserUtil;
+import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.message.Message;
@@ -357,7 +358,8 @@ public class WSDLGetUtils {
 Map done,
 Map doneSchemas,
 String base,
-String docBase) {
+String docBase,
+String parentResolvedLocation) {
 OASISCatalogManager catalogs = 
OASISCatalogManager.getCatalogManager(bus);
 
 Collection imports = 
CastUtils.cast((Collection)def.getImports().values());
@@ -365,7 +367,7 @@ public class WSDLGetUtils {
 List impLst = CastUtils.cast(lst);
 for (Import imp : impLst) {
 String start = imp.getLocationURI();
-String decodedStart = null;
+String decodedStart;
 // Always use the URL decoded version to ensure that we have a
 // canonical representation of the import URL for lookup.
 
@@ -392,13 +394,20 @@ public class WSDLGetUtils {
 //ignore
 }
 if (done.put(decodedStart, imp.getDefinition()) == 
null) {
-

cxf git commit: Recording .gitmergeinfo Changes

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 7fe047444 -> 6951f4391


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

Branch: refs/heads/2.7.x-fixes
Commit: 6951f439193bd638412f9fa1e88b167e7198
Parents: 7fe0474
Author: Alessio Soldano 
Authored: Mon Oct 26 23:07:02 2015 +0100
Committer: Alessio Soldano 
Committed: Mon Oct 26 23:07:02 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6951f439/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4cb39af..beea0dd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -728,6 +728,7 @@ B 47a0908a8a90a00029e859a21feb9fd4b9512563
 B 47b248a25e4de8f876119fff2c0a3f0dce3bc8de
 B 47b80b935f2fa1f70af71ba58baef4e2d9b226a5
 B 47d9548557c352b7ddf0468c322678b901d20ab9
+B 47fe9b86df867010af31023e7d528cf8859a
 B 48084ffd0625178e758c52ffcf2b695206ef8015
 B 48144f06a9779320b7d8537899b2f3b9ecacdb43
 B 4843806921c665a3a2fecb5826ae2d20ec563ab2
@@ -2263,6 +2264,7 @@ B ed66e7d56758e60c96091b208c81c2f2b26bb61f
 B ed8ac50116f225ad4a71b888b7e4f44c1f81991a
 B edb79aaae7672449bb0a1e3e9c48caa4791694c6
 B edbadd5a9e980694106979e85221714e600f8b7c
+B edcfc3b8f44e0ec495e2477e4c566b6c78765ef3
 B eec9d19c2bd836b28d60ec826f3ed0bd9e67e977
 B eecaebb4b0ea89fc2aa94acb6464f0e913b8b223
 B ef319d587510c92c693abe5d4c7f565ff84a1490
@@ -2282,6 +2284,7 @@ B f1309316e090eae58a2f51e60fd7549e1d002ba0
 B f15115757f1f203c5962b652f3f7e893a71d95e8
 B f1614ea6d66bee3989b3218a3b8559b776357191
 B f16d1694f39d4cc82c874a90c783e49652539f7d
+B f181f1e75353ea9ed2b02e6edde284b1a2888d32
 B f18207332e756d013797ff65a5d8d094d20e51e0
 B f18544e2d66b5e2cd337d0f8091a5dfaa4ff8ec8
 B f18780cf52189338fee6681374f2622856f09330

cxf git commit: [CXF-6621] Schema imports are not handled correctly in generated WSDL

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 7abdac771 -> a602c9df3


[CXF-6621] Schema imports are not handled correctly in generated WSDL

...and XSD files when using catalog rewrites

Fixes these issues:

- import of nested XSDs that lies in different directory tree from WSDL
  files

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/xsd/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd;
  /xsd/schema.xsd

  ```

- import and access of nested XSDs with equal relative paths when XSDs
  are outside of WSDL directory (previously this was working only when
  XSDs were inside WSDL directory)

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/xsd/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "http://example.org/uri/schema.xsd;
  /xsd/schema.xsd - imports "d/included.xsd"
  /xsd/d/included.xsd - imports "d/included.xsd"
  /xsd/d/d/included.xsd
  ```

- accessing nested XSD and WSDL under URIs affected by rewrite rules
  which aren't directly used by WSDLs/XSDs

  example:

  ```
jax-ws-catalog.xml contains:
  http://example.org/uri/; 
rewritePrefix="/wsdl/"/>

WSDL structure:
  /wsdl/service.wsdl - imports "./included.wsdl"
  /wsdl/included.wsdl

request for: http://example.org/uri/included.wsdl
  ```

- in some cases imports weren't working when catalog rule rewritePrefix
  was "/path" instead of "classpath:/path" - catalog resolves those two
  into different values


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

Branch: refs/heads/master
Commit: a602c9df3e2e09855410f0e75af9b108620b7794
Parents: 7abdac7
Author: Tomas Hofman 
Authored: Thu Oct 1 15:43:37 2015 +0200
Committer: Alessio Soldano 
Committed: Mon Oct 26 17:17:44 2015 +0100

--
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 214 +++
 .../cxf/systest/jaxws/OASISCatalogTest.java | 131 
 .../main/resources/META-INF/jax-ws-catalog.xml  |   2 +
 .../others/hello_world_messages_catalog.wsdl|  10 +
 .../resources/wsdl/schemas/another-schema.xsd   |  29 +++
 .../wsdl/schemas/d/another-included.xsd |  29 +++
 .../wsdl/schemas/d/d/another-included.xsd   |  27 +++
 .../resources/wsdl/schemas/d/d/included.xsd |  27 +++
 .../main/resources/wsdl/schemas/d/included.xsd  |  29 +++
 .../src/main/resources/wsdl/schemas/schema.xsd  |  29 +++
 10 files changed, 344 insertions(+), 183 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a602c9df/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 822233e..c7ffc71 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -60,6 +60,7 @@ import org.apache.cxf.catalog.OASISCatalogManagerHelper;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.URIParserUtil;
+import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.message.Message;
@@ -356,7 +357,8 @@ public class WSDLGetUtils {
 Map done,
 Map doneSchemas,
 String base,
-String docBase) {
+String docBase,
+String parentResolvedLocation) {
 OASISCatalogManager catalogs = 
OASISCatalogManager.getCatalogManager(bus);
 
 Collection imports = 
CastUtils.cast((Collection)def.getImports().values());
@@ -364,7 +366,7 @@ public class WSDLGetUtils {
 List impLst = CastUtils.cast(lst);
 for (Import imp : impLst) {
 String start = imp.getLocationURI();
-String decodedStart = null;
+String decodedStart;
 // Always use the URL decoded version to ensure that we have a
 // canonical representation of the import URL for lookup.
 
@@ -391,13 +393,20 @@ public class WSDLGetUtils {
 //ignore
 }
 if 

[1/3] cxf git commit: [CXF-6621] integration of changes from cxf-2.7.x-fixes

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ecb9139d1 -> 58ceaafe4


[CXF-6621] integration of changes from cxf-2.7.x-fixes


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

Branch: refs/heads/3.0.x-fixes
Commit: 47fe9b86df867010af31023e7d528cf8859a
Parents: edcfc3b
Author: rsearls 
Authored: Mon Oct 26 09:33:47 2015 -0400
Committer: Alessio Soldano 
Committed: Mon Oct 26 18:21:10 2015 +0100

--
 .../apache/cxf/common/util/URIParserUtil.java   |  18 +-
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 217 +++
 .../cxf/systest/jaxws/OASISCatalogTest.java | 131 +++
 .../systest/schemaimport/SchemaImportTest.java  |   4 +-
 .../main/resources/META-INF/jax-ws-catalog.xml  |   3 +
 .../others/hello_world_messages_catalog.wsdl|  25 ++-
 .../others/hello_world_wsdl_import_catalog.wsdl |   2 +
 .../resources/wsdl/schemas/another-schema.xsd   |  29 +++
 .../wsdl/schemas/d/another-included.xsd |  29 +++
 .../wsdl/schemas/d/d/another-included.xsd   |  27 +++
 .../resources/wsdl/schemas/d/d/included.xsd |  27 +++
 .../main/resources/wsdl/schemas/d/included.xsd  |  29 +++
 .../src/main/resources/wsdl/schemas/schema.xsd  |  29 +++
 .../cxf/tools/util/URIParserUtilTest.java   |  25 +++
 14 files changed, 404 insertions(+), 191 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/47fe9b86/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 98afa1f..158765c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -26,13 +26,23 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.StringTokenizer;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.helpers.JavaUtils;
 
 public final class URIParserUtil {
+private static final Set KEYWORDS = new HashSet(Arrays
+.asList(new String[] {"abstract", "boolean", "break", "byte", "case", 
"catch", "char", "class",
+  "const", "continue", "default", "do", "double", 
"else", "extends", "final",
+  "finally", "float", "for", "goto", "if", 
"implements", "import", "instanceof",
+  "int", "interface", "long", "native", "new", 
"package", "private", "protected",
+  "public", "return", "short", "static", 
"strictfp", "super", "switch",
+  "synchronized", "this", "throw", "throws", 
"transient", "try", "void",
+  "volatile", "while", "true", "false", "null", 
"assert", "enum"}));
 private static final String EXCLUDED_CHARS = "<>\"{}|\\^`";
 private static final String HEX_DIGITS = "0123456789abcdef";
 
@@ -213,7 +223,7 @@ public final class URIParserUtil {
 }
 
 public static boolean containsReservedKeywords(String token) {
-return JavaUtils.isJavaKeyword(token);
+return KEYWORDS.contains(token);
 }
 
 public static String escapeChars(String s) {
@@ -303,8 +313,8 @@ public final class URIParserUtil {
  * doing but is not actually doing when URI roots do not fully match.
  * See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6226081
  *
- * @param base  The base URI
- * @param toBeRelativized   The URI to be realivized
+ * @param baseURI   The base URI
+ * @param toBeRelativizedURI The URI to be realivized
  * @return  The string value of the URI you'd expect to 
get as result
  *  of calling 
baseURI.relativize(toBeRelativizedURI).
  *  null is returned if the parameters are null or 
are not

http://git-wip-us.apache.org/repos/asf/cxf/blob/47fe9b86/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index f114e47..3202bab 100644
--- 

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 58ceaafe46d5d08f2cab23b22607bd46ebdd3882
Parents: 47fe9b8
Author: Alessio Soldano 
Authored: Mon Oct 26 18:22:37 2015 +0100
Committer: Alessio Soldano 
Committed: Mon Oct 26 18:22:37 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/58ceaafe/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c7e880e..7479c33 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -318,6 +318,7 @@ B a4222c930f7d69608f826c14e4bc7bc9f670097c
 B a4315cb442fa31960cbd47f11e95e81b4a71441d
 B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07
 B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
+B a602c9df3e2e09855410f0e75af9b108620b7794
 B a77c05fcbef3f8a0d963dd196fa1f142a975f6cd
 B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba
 B a7b79ea692add4f9da0f1232e3bfb338099f4147

[2/3] cxf git commit: [CXF-6413] Backport of changes provided in CXF-6552 (tag: cxf-3.1.3)

[asoldano]

[CXF-6413] Backport of changes provided in CXF-6552 (tag: cxf-3.1.3)


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

Branch: refs/heads/3.0.x-fixes
Commit: edcfc3b8f44e0ec495e2477e4c566b6c78765ef3
Parents: ecb9139
Author: rsearls 
Authored: Thu Oct 15 11:34:55 2015 -0400
Committer: Alessio Soldano 
Committed: Mon Oct 26 18:21:10 2015 +0100

--
 .../apache/cxf/common/util/URIParserUtil.java   | 74 +++
 .../cxf/common/util/URIParserUtilsTest.java | 54 +++
 pom.xml |  4 +-
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 97 +++-
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 25 -
 .../cxf/systest/jaxws/OASISCatalogTest.java |  2 +-
 .../cxf/systest/schemaimport/SayHiImpl2.java| 64 +
 .../systest/schemaimport/SchemaImportTest.java  | 33 ++-
 .../apache/cxf/systest/schemaimport/Server.java |  3 +
 .../test/resources/wsdl_systest/e/sayHi.wsdl| 63 +
 .../others/hello_world_bindings_catalog.wsdl|  2 +-
 .../others/hello_world_services_catalog.wsdl|  2 +-
 .../others/hello_world_wsdl_import_catalog.wsdl |  2 +-
 13 files changed, 395 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/edcfc3b8/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 8372db0..98afa1f 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -290,4 +290,78 @@ public final class URIParserUtil {
 return normalize(arg);
 }
 }
+
+public static String relativize(String base, String toBeRelativized) 
throws URISyntaxException {
+if (base == null || toBeRelativized == null) {
+return null;
+}
+return relativize(new URI(base), new URI(toBeRelativized));
+}
+
+/**
+ * This is a custom implementation for doing what URI.relativize(URI uri) 
should be
+ * doing but is not actually doing when URI roots do not fully match.
+ * See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6226081
+ *
+ * @param base  The base URI
+ * @param toBeRelativized   The URI to be realivized
+ * @return  The string value of the URI you'd expect to 
get as result
+ *  of calling 
baseURI.relativize(toBeRelativizedURI).
+ *  null is returned if the parameters are null or 
are not
+ *  both absolute or not absolute.
+ * @throws URISyntaxException
+ */
+public static String relativize(URI baseURI, URI toBeRelativizedURI) 
throws URISyntaxException {
+if (baseURI == null || toBeRelativizedURI == null) {
+return null;
+}
+if (baseURI.isAbsolute() ^ toBeRelativizedURI.isAbsolute()) {
+return null;
+}
+final String base = baseURI.getSchemeSpecificPart();
+final String toBeRelativized = 
toBeRelativizedURI.getSchemeSpecificPart();
+final int l1 = base.length();
+final int l2 = toBeRelativized.length();
+if (l1 == 0) {
+return toBeRelativized;
+}
+int slashes = 0;
+StringBuilder sb = new StringBuilder();
+boolean differenceFound = false;
+for (int i = 0; i < l1; i++) {
+char c = base.charAt(i);
+if (i < l2) {
+if (!differenceFound && c == toBeRelativized.charAt(i)) {
+sb.append(c);
+} else {
+differenceFound = true;
+if (c == '/') {
+slashes++;
+}
+}
+} else {
+if (c == '/') {
+slashes++;
+}
+}
+}
+String rResolved = new URI(getRoot(sb.toString())).relativize(new 
URI(toBeRelativized)).toString();
+StringBuilder relativizedPath = new StringBuilder();
+for (int i = 0; i < slashes; i++) {
+relativizedPath.append("../");
+}
+relativizedPath.append(rResolved);
+return relativizedPath.toString();
+}
+
+private static String getRoot(String uri) {
+int idx = uri.lastIndexOf('/');
+if (idx == uri.length() - 1) {
+ 

cxf git commit: [CXF-6198] Adding property for getting SOAPFault for HTTP error code 400

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 4005dfa73 - 2bbdbdab9


[CXF-6198] Adding property for getting SOAPFault for HTTP error code 400


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

Branch: refs/heads/master
Commit: 2bbdbdab92befd79e5083cf7a298f6a931a2e76e
Parents: 4005dfa
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Aug 26 09:38:46 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Aug 26 09:39:48 2015 +0200

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 35 +---
 1 file changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2bbdbdab/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 1462a67..ea24009 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1554,28 +1554,39 @@ public abstract class HTTPConduit
 return responseCode == 500  
MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false);
 }
 
-protected void handleResponseInternal() throws IOException {
+protected int doProcessResponseCode() throws IOException {
 Exchange exchange = outMessage.getExchange();
-int responseCode = getResponseCode();
-if (responseCode == -1) {
+int rc = getResponseCode();
+if (rc == -1) {
 LOG.warning(HTTP Response code appears to be corrupted);
 }
 if (exchange != null) {
-exchange.put(Message.RESPONSE_CODE, responseCode);
+exchange.put(Message.RESPONSE_CODE, rc);
 }

-// This property should be set in case the exceptions should not 
be handled here
-// For example jax rs uses this
-boolean noExceptions = 
MessageUtils.isTrue(outMessage.getContextualProperty(
-org.apache.cxf.transport.no_io_exceptions));
+// org.apache.cxf.transport.no_io_exceptions property should be 
set in case the exceptions
+// should not be handled here; for example jax rs uses this
 
-if (responseCode = 400  responseCode != 500  !noExceptions) {
-
-if (responseCode == 404 || responseCode == 503) {
+// org.apache.cxf.transport.process_fault_on_http_400 property 
should be set in case a
+// soap fault because of a HTTP 400 should be returned back to the 
client (SOAP 1.2 spec)
+
+if (rc = 400  rc != 500
+ 
!MessageUtils.isTrue(outMessage.getContextualProperty(org.apache.cxf.transport.no_io_exceptions))
+ (rc  400 || !MessageUtils.isTrue(outMessage
+
.getContextualProperty(org.apache.cxf.transport.process_fault_on_http_400 
{
+
+if (rc == 404 || rc == 503) {
 
exchange.put(org.apache.cxf.transport.service_not_available, true);
 }
-throw new HTTPException(responseCode, getResponseMessage(), 
url.toURL());
+
+throw new HTTPException(rc, getResponseMessage(), url.toURL());
 }
+return rc;
+}
+
+protected void handleResponseInternal() throws IOException {
+Exchange exchange = outMessage.getExchange();
+int responseCode = doProcessResponseCode();
 
 InputStream in = null;
 // oneway or decoupled twoway calls may expect HTTP 202 with no 
content

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.7.x-fixes
Commit: 2b15d76387c9568197b46e906b4a587369f996fc
Parents: ca4e956
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Aug 26 11:56:03 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Aug 26 11:56:03 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2b15d763/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a214495..22ecb6a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2369,6 +2369,7 @@ M 1e7c47d8d989d0f0206c8d4c1b11ef8638d5c3d6
 M 1e9e67d778ed81d9adbce3b0d3cf61ab1e8d4a38
 M 1ec43095d4577dea6ba76d5a4085a07de8bfae92
 M 1ed0dd8ba34164e462f160fa3c7864ac12aeb9f0
+M 1f36ca2212cea46a1a842b4770c7614fbb093c84
 M 1f860a92216fa630e7e3dc9e767a5cb0261d1677
 M 1fa9f532b64187ac7e7f1094b659369fc4adacf6
 M 20767c663fc54d3f6d0219a5c347dbaa49939b67

[1/2] cxf git commit: [CXF-6198] Adding property for getting SOAPFault for HTTP error code 400

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a1b0028a8 - bf03cdc51


[CXF-6198] Adding property for getting SOAPFault for HTTP error code 400


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

Branch: refs/heads/3.0.x-fixes
Commit: 1f36ca2212cea46a1a842b4770c7614fbb093c84
Parents: a1b0028
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Aug 26 09:38:46 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Aug 26 11:51:09 2015 +0200

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 35 +---
 1 file changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f36ca22/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 737221b..44d9faf 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1557,28 +1557,39 @@ public abstract class HTTPConduit
 return false;
 }
 
-protected void handleResponseInternal() throws IOException {
+protected int doProcessResponseCode() throws IOException {
 Exchange exchange = outMessage.getExchange();
-int responseCode = getResponseCode();
-if (responseCode == -1) {
+int rc = getResponseCode();
+if (rc == -1) {
 LOG.warning(HTTP Response code appears to be corrupted);
 }
 if (exchange != null) {
-exchange.put(Message.RESPONSE_CODE, responseCode);
+exchange.put(Message.RESPONSE_CODE, rc);
 }

-// This property should be set in case the exceptions should not 
be handled here
-// For example jax rs uses this
-boolean noExceptions = 
MessageUtils.isTrue(outMessage.getContextualProperty(
-org.apache.cxf.transport.no_io_exceptions));
+// org.apache.cxf.transport.no_io_exceptions property should be 
set in case the exceptions
+// should not be handled here; for example jax rs uses this
 
-if (responseCode = 400  responseCode != 500  !noExceptions) {
-
-if (responseCode == 404 || responseCode == 503) {
+// org.apache.cxf.transport.process_fault_on_http_400 property 
should be set in case a
+// soap fault because of a HTTP 400 should be returned back to the 
client (SOAP 1.2 spec)
+
+if (rc = 400  rc != 500
+ 
!MessageUtils.isTrue(outMessage.getContextualProperty(org.apache.cxf.transport.no_io_exceptions))
+ (rc  400 || !MessageUtils.isTrue(outMessage
+
.getContextualProperty(org.apache.cxf.transport.process_fault_on_http_400 
{
+
+if (rc == 404 || rc == 503) {
 
exchange.put(org.apache.cxf.transport.service_not_available, true);
 }
-throw new HTTPException(responseCode, getResponseMessage(), 
url.toURL());
+
+throw new HTTPException(rc, getResponseMessage(), url.toURL());
 }
+return rc;
+}
+
+protected void handleResponseInternal() throws IOException {
+Exchange exchange = outMessage.getExchange();
+int responseCode = doProcessResponseCode();
 
 InputStream in = null;
 // oneway or decoupled twoway calls may expect HTTP 202 with no 
content

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: bf03cdc511752d6c6722776119075f4410976e13
Parents: 1f36ca2
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Aug 26 11:50:23 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Aug 26 11:52:34 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf03cdc5/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 13eae83..8180c00 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -471,6 +471,7 @@ M 25d02a2a04b8552faf88fd0879423618f15be8ee
 M 27c1bb5a19ea70ef1befccff22d72f1656247b0d
 M 2895b7b052e6c96d192abf39d472737b54fcd9c2
 M 2b4fe9966c46457177f6412525c57c64d07dbe69
+M 2bbdbdab92befd79e5083cf7a298f6a931a2e76e
 M 2cfcbbc2ce20118e06ca3ef11f08f6f106181055
 M 2d3ac551c8614516cbbf288195d2a99cadb79659
 M 2e701bcd1cabcc7ae4cb69346eacb8ab278e2827

[1/2] cxf git commit: [CXF-6198] Adding property for getting SOAPFault for HTTP error code 400

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 8081b6dfe - 2b15d7638


[CXF-6198] Adding property for getting SOAPFault for HTTP error code 400


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

Branch: refs/heads/2.7.x-fixes
Commit: ca4e9565c40dbe1e6c0c39e176b89cd158ccc607
Parents: 8081b6d
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Aug 26 09:38:46 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Aug 26 11:54:31 2015 +0200

--
 .../apache/cxf/transport/http/HTTPConduit.java  | 35 +---
 1 file changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca4e9565/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 4c14abf..b16009e 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1545,28 +1545,39 @@ public abstract class HTTPConduit
 return false;
 }
 
-protected void handleResponseInternal() throws IOException {
+protected int doProcessResponseCode() throws IOException {
 Exchange exchange = outMessage.getExchange();
-int responseCode = getResponseCode();
-if (responseCode == -1) {
+int rc = getResponseCode();
+if (rc == -1) {
 LOG.warning(HTTP Response code appears to be corrupted);
 }
 if (exchange != null) {
-exchange.put(Message.RESPONSE_CODE, responseCode);
+exchange.put(Message.RESPONSE_CODE, rc);
 }

-// This property should be set in case the exceptions should not 
be handled here
-// For example jax rs uses this
-boolean noExceptions = 
MessageUtils.isTrue(outMessage.getContextualProperty(
-org.apache.cxf.transport.no_io_exceptions));
+// org.apache.cxf.transport.no_io_exceptions property should be 
set in case the exceptions
+// should not be handled here; for example jax rs uses this
 
-if (responseCode = 400  responseCode != 500  !noExceptions) {
-
-if (responseCode == 404 || responseCode == 503) {
+// org.apache.cxf.transport.process_fault_on_http_400 property 
should be set in case a
+// soap fault because of a HTTP 400 should be returned back to the 
client (SOAP 1.2 spec)
+
+if (rc = 400  rc != 500
+ 
!MessageUtils.isTrue(outMessage.getContextualProperty(org.apache.cxf.transport.no_io_exceptions))
+ (rc  400 || !MessageUtils.isTrue(outMessage
+
.getContextualProperty(org.apache.cxf.transport.process_fault_on_http_400 
{
+
+if (rc == 404 || rc == 503) {
 
exchange.put(org.apache.cxf.transport.service_not_available, true);
 }
-throw new HTTPException(responseCode, getResponseMessage(), 
url.toURL());
+
+throw new HTTPException(rc, getResponseMessage(), url.toURL());
 }
+return rc;
+}
+
+protected void handleResponseInternal() throws IOException {
+Exchange exchange = outMessage.getExchange();
+int responseCode = doProcessResponseCode();
 
 InputStream in = null;
 // oneway or decoupled twoway calls may expect HTTP 202 with no 
content

cxf git commit: [CXF-6552] Fixed chained imports of schema; added/fixed a bunch of tests

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master f16a65393 - ffd4296f9


[CXF-6552] Fixed chained imports of schema; added/fixed a bunch of tests


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

Branch: refs/heads/master
Commit: ffd4296f9f899043ea7f2a67d7ead216234d67ac
Parents: f16a653
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Aug 21 11:37:20 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Aug 21 11:40:08 2015 +0200

--
 .../apache/cxf/common/util/URIParserUtil.java   |  74 +
 .../cxf/common/util/URIParserUtilsTest.java |  54 ++
 .../org/apache/cxf/frontend/WSDLGetUtils.java   | 105 +++
 .../cxf/systest/jaxws/OASISCatalogTest.java |   2 +-
 .../cxf/systest/schemaimport/SayHiImpl2.java|  64 +++
 .../systest/schemaimport/SchemaImportTest.java  |  31 +-
 .../apache/cxf/systest/schemaimport/Server.java |   3 +
 .../test/resources/wsdl_systest/e/sayHi.wsdl|  63 +++
 .../others/hello_world_bindings_catalog.wsdl|   2 +-
 .../others/hello_world_services_catalog.wsdl|   2 +-
 .../others/hello_world_wsdl_import_catalog.wsdl |   2 +-
 11 files changed, 373 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ffd4296f/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java 
b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 8372db0..8170709 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -290,4 +290,78 @@ public final class URIParserUtil {
 return normalize(arg);
 }
 }
+
+public static String relativize(String base, String toBeRelativized) 
throws URISyntaxException {
+if (base == null || toBeRelativized == null) {
+return null;
+}
+return relativize(new URI(base), new URI(toBeRelativized));
+}
+
+/**
+ * This is a custom implementation for doing what URI.relativize(URI uri) 
should be
+ * doing but is not actually doing when URI roots do not fully match.
+ * See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6226081
+ * 
+ * @param base  The base URI
+ * @param toBeRelativized   The URI to be realivized
+ * @return  The string value of the URI you'd expect to 
get as result
+ *  of calling 
baseURI.relativize(toBeRelativizedURI).
+ *  null is returned if the parameters are null or 
are not
+ *  both absolute or not absolute.
+ * @throws URISyntaxException
+ */
+public static String relativize(URI baseURI, URI toBeRelativizedURI) 
throws URISyntaxException {
+if (baseURI == null || toBeRelativizedURI == null) {
+return null;
+}
+if (baseURI.isAbsolute() ^ toBeRelativizedURI.isAbsolute()) {
+return null;
+}
+final String base = baseURI.getSchemeSpecificPart();
+final String toBeRelativized = 
toBeRelativizedURI.getSchemeSpecificPart();
+final int l1 = base.length();
+final int l2 = toBeRelativized.length();
+if (l1 == 0) {
+return toBeRelativized;
+}
+int slashes = 0;
+StringBuilder sb = new StringBuilder();
+boolean differenceFound = false;
+for (int i = 0; i  l1; i++) {
+char c = base.charAt(i);
+if (i  l2) {
+if (!differenceFound  c == toBeRelativized.charAt(i)) {
+sb.append(c);
+} else {
+differenceFound = true;
+if (c == '/') {
+slashes++;
+}
+}
+} else {
+if (c == '/') {
+slashes++;
+}
+}
+}
+String rResolved = new URI(getRoot(sb.toString())).relativize(new 
URI(toBeRelativized)).toString();
+StringBuilder relativizedPath = new StringBuilder();
+for (int i = 0; i  slashes; i++) {
+relativizedPath.append(../);
+}
+relativizedPath.append(rResolved);
+return relativizedPath.toString();
+}
+
+private static String getRoot(String uri) {
+int idx = uri.lastIndexOf('/');
+if (idx == uri.length() - 1) {
+return uri;
+} else 

svn commit: r10018 - /release/cxf/2.7.17/

[asoldano]

Author: asoldano
Date: Fri Jul 31 07:32:35 2015
New Revision: 10018

Log:
Creating CXF 2.7.17 release distribution area

Added:
release/cxf/2.7.17/

svn commit: r10020 - /release/cxf/2.7.17/

[asoldano]

Author: asoldano
Date: Fri Jul 31 08:07:18 2015
New Revision: 10020

Log:
Adding CXF 2.7.17 distribution

Added:
release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.asc   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.md5
release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.sha1
release/cxf/2.7.17/apache-cxf-2.7.17-src.zip   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.asc   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.md5
release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.sha1
release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.asc   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.md5
release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.sha1
release/cxf/2.7.17/apache-cxf-2.7.17.zip   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17.zip.asc   (with props)
release/cxf/2.7.17/apache-cxf-2.7.17.zip.md5
release/cxf/2.7.17/apache-cxf-2.7.17.zip.sha1

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.asc
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.md5
==
--- release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.md5 (added)
+++ release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.md5 Fri Jul 31 08:07:18 2015
@@ -0,0 +1 @@
+177d9e6cddd0a3ed620450071ba23e4f
\ No newline at end of file

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.sha1
==
--- release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.sha1 (added)
+++ release/cxf/2.7.17/apache-cxf-2.7.17-src.tar.gz.sha1 Fri Jul 31 08:07:18 
2015
@@ -0,0 +1 @@
+336136035952aebe5c171f918333ca5120d03bbc
\ No newline at end of file

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip
--
svn:mime-type = application/zip

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.asc
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.asc
--
svn:mime-type = application/pgp-signature

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.md5
==
--- release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.md5 (added)
+++ release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.md5 Fri Jul 31 08:07:18 2015
@@ -0,0 +1 @@
+3811cf8a3899353e5466d559214825e1
\ No newline at end of file

Added: release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.sha1
==
--- release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.sha1 (added)
+++ release/cxf/2.7.17/apache-cxf-2.7.17-src.zip.sha1 Fri Jul 31 08:07:18 2015
@@ -0,0 +1 @@
+5b9d4f0164a98e8975b4e054a759ebc24c5e6fd3
\ No newline at end of file

Added: release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz
--
svn:mime-type = application/x-gzip

Added: release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.asc
==
Binary file - no diff available.

Propchange: release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.md5
==
--- release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.md5 (added)
+++ release/cxf/2.7.17/apache-cxf-2.7.17.tar.gz.md5 Fri Jul 31 08:07:18 2015
@@ -0,0 +1 @@
+eebeb4fa427ebb1d48036c223f056201
\ No newline at end of file

Added: release/cxf/2.7.17/apache-cxf-2.7.17

cxf git commit: Update release notes for 2.7.17

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 218e5a959 - 9f36b9d8b


Update release notes for 2.7.17


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

Branch: refs/heads/2.7.x-fixes
Commit: 9f36b9d8ba01ba93ac34e7be7c3d897165a9978d
Parents: 218e5a9
Author: Alessio Soldano asold...@redhat.com
Authored: Mon Jul 27 17:06:12 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Mon Jul 27 17:06:12 2015 +0200

--
 distribution/src/main/release/release_notes.txt | 48 +---
 1 file changed, 22 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9f36b9d8/distribution/src/main/release/release_notes.txt
--
diff --git a/distribution/src/main/release/release_notes.txt 
b/distribution/src/main/release/release_notes.txt
index d775d56..a845c00 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,4 +1,4 @@
-Apache CXF 2.7.16 Release Notes
+Apache CXF 2.7.17 Release Notes
 
 1. Overview
 
@@ -28,7 +28,7 @@ In particular, Apache CXF no longer supports Java5.   Users 
must upgrade to
 Java 6 in order to upgrade to Apache CXF 2.7.x.
 
 
-2.7.16 fixes over 20 JIRA issues reported by users and the community.
+2.7.17 fixes over 18 JIRA issues reported by users and the community.
 
 
 
@@ -74,30 +74,26 @@ for caveats when upgrading from CXF 2.6.x to 2.7.x.
 
 
 ** Bug
-* [CXF-6007] - WebClient does not resend request in Digest authentication 
for HTTP methods GET, HEAD, DELETE, OPTIONS (with no body).
-* [CXF-6257] - Creating and Endpoint using JAX-WS API, getting the binding 
and then publishing causes a NullPointerException
-* [CXF-6274] - NullPointerException in DestinationSequence because of 
RMCaptureInInterceptor not in interceptor chain
-* [CXF-6276] - Some non-primitive properties lost during generating WADL
-* [CXF-6284] - JAX-RS servlet run-time leaks additional strong references
-* [CXF-6292] - Init parameters on OSGi service are not picked up
-* [CXF-6299] - Providers registered in cxf bus are ignored.
-* [CXF-6300] - cipherSuite configuration does not work with HTTPJ servers
-* [CXF-6302] - JAXRS endpoints with URL encoded addresses can not be 
located
-* [CXF-6309] - Client processing exception has its cause set to the 
original exception wrapped in Fault
-* [CXF-6313] - SamlHeaderOutInterceptor does not set headers on the 
message if it had none
-* [CXF-6317] - Authorization not possible with multiple service beans
-* [CXF-6319] - Regression: failing namespace resolution after CXF-5891
-* [CXF-6321] - Make sure global JAX-RS filters are applied once per 
request even if made to sub-resource
-* [CXF-6332] - Wadl Genertion: @Description cannot be bound to field
-* [CXF-6336] - Client ParamConverterProvider may be lost if Client runs in 
the server scope
-* [CXF-6359] - NullPointerException when certAlias specified but no 
keyManagers are configured
-* [CXF-6361] - HttpCondiut is not detecting the redirect loop properly
-* [CXF-6376] - Unexpected exception thrown from ResponseHandler is 
swallowed and status code 200 is returned
-* [CXF-6379] - Separate HTTP headers for multiple header values not 
possible - bug in CXF-3714 fix
-
+* [CXF-6392] - Schema imports are not handled correctly in generated WSDL 
and XSD files
+* [CXF-6402] - JettyHTTPServerEngine cannot set a provided Jetty Server
+* [CXF-6408] - HTTP Conduit throws NPE exception for invalid 401 HTTP 
response
+* [CXF-6430] - SwA: Wrong Content-Type of root part
+* [CXF-6431] - Attachment serialization does not conform to the relevant 
specs
+* [CXF-6433] - SOAPAction value may not be extracted correctly for SOAP 
1.2 with Attachments
+* [CXF-6444] - CrossOriginResourceSharingFilter.java should not set 
Origin=* when Credentials=true
+* [CXF-6467] - Jaxrs client handles array type property in a form object 
as a single element
+* [CXF-6469] - schemaLocation in xsd import is not rewritten correctly in 
Java 8
+* [CXF-6473] - Double signatures while using AsymmetricBindingHandler
+* [CXF-6479] - Denial of Service: Regular Expression in StringUtils
+* [CXF-6480] - InjectionUtils createThreadLocalServletApiContext better 
error message for invalid @Context classes
+* [CXF-6484] - Regression in Content-id format
+* [CXF-6502] - JAXRSInInterceptor throw 
java.lang.IndexOutOfBoundsException if content-type header is empty
 
 ** Improvement
-* [CXF-6337] - Support the redirection directly 

[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml 
b/distribution/src/main/release/samples/ws_notification/pom.xml
index 443d808..6c8efc3 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_notification/artifactId
 nameWS-Notification Demo/name
 descriptionWS-Notification Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -95,32 +95,32 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-addr/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-policy/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-core/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 /dependencies
 /project

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml 
b/distribution/src/main/release/samples/ws_policy/pom.xml
index 2e11081..7e6b4c6 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_policy/artifactId
 nameWS-Policy Demo/name
 descriptionWS-Policy Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 
 properties
@@ -124,17 +124,17 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.springframework/groupId

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index e92f44b..6e3e846 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_rm/artifactId
 nameWS-RM Demo/name
 descriptionWS-RM Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-

[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 06134f7..8125b85 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery/artifactId
 packagingpom/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index 5064f4a..8187ebb 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-api/artifactId
 packagingjar/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery API/name
 descriptionApache CXF WS-Discovery API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index 0b6343a..fcfbafc 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-service/artifactId
 packagingjar/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery Service/name
 descriptionApache CXF WS-Discovery Service/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index 47cb514..4165576 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn/artifactId
 packagingpom/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WSN service/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 48f4200..4466d95 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-api/artifactId
 packagingbundle/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WSN API/name
 descriptionApache CXF WSN API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index f3ab380..3e6ffc8 100644
--- a/services/wsn/wsn-core/pom.xml
+++ 

[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x [created] 12acd46e3


http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 120631c..06134f7 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery/artifactId
 packagingpom/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index 80af3e5..5064f4a 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-api/artifactId
 packagingjar/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery API/name
 descriptionApache CXF WS-Discovery API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index d4d6723..0b6343a 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-service/artifactId
 packagingjar/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery Service/name
 descriptionApache CXF WS-Discovery Service/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index e124a62..47cb514 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn/artifactId
 packagingpom/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WSN service/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 3761876..48f4200 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-api/artifactId
 packagingbundle/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WSN API/name
 descriptionApache CXF WSN API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 3320a18..f3ab380 

[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

[maven-release-plugin] prepare release cxf-2.7.17


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

Branch: refs/heads/2.7.x
Commit: 8bd9499df7dd858d8edc0eabd00b392d14f2c702
Parents: 9f36b9d
Author: Alessio Soldano asold...@redhat.com
Authored: Mon Jul 27 17:55:29 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Mon Jul 27 17:55:29 2015 +0200

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../src/main/release/samples/oauth/client/pom.xml |  2 +-
 .../src/main/release/samples/oauth/server/pom.xml |  2 +-
 distribution/src/main/release/samples/pom.xml |  2 +-
 .../main/release/samples/restful_dispatch/pom.xml | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 

[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml 
b/distribution/src/main/release/samples/ws_notification/pom.xml
index 9e787e8..443d808 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_notification/artifactId
 nameWS-Notification Demo/name
 descriptionWS-Notification Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -95,32 +95,32 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-addr/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-policy/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-core/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 /dependencies
 /project

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml 
b/distribution/src/main/release/samples/ws_policy/pom.xml
index 6a8c436..2e11081 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_policy/artifactId
 nameWS-Policy Demo/name
 descriptionWS-Policy Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 
 properties
@@ -124,17 +124,17 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.springframework/groupId

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 3ab0d1c..e92f44b 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_rm/artifactId
 nameWS-RM Demo/name
 descriptionWS-RM Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-

[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/2.7.x
Commit: 12acd46e3dbe98fa1321374b09174d5876271f08
Parents: 8bd9499
Author: Alessio Soldano asold...@redhat.com
Authored: Mon Jul 27 17:58:31 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Mon Jul 27 17:58:31 2015 +0200

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../src/main/release/samples/oauth/client/pom.xml |  2 +-
 .../src/main/release/samples/oauth/server/pom.xml |  2 +-
 distribution/src/main/release/samples/pom.xml |  2 +-
 .../main/release/samples/restful_dispatch/pom.xml | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 

Git Push Summary

[asoldano]

Repository: cxf
Updated Tags:  refs/tags/cxf-2.7.17 [created] d8e7b4fd8

[2/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml 
b/distribution/src/main/release/samples/ws_notification/pom.xml
index 9e787e8..443d808 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_notification/artifactId
 nameWS-Notification Demo/name
 descriptionWS-Notification Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -95,32 +95,32 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-addr/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-policy/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-core/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 /dependencies
 /project

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml 
b/distribution/src/main/release/samples/ws_policy/pom.xml
index 6a8c436..2e11081 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_policy/artifactId
 nameWS-Policy Demo/name
 descriptionWS-Policy Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 
 properties
@@ -124,17 +124,17 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /dependency
 dependency
 groupIdorg.springframework/groupId

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index 3ab0d1c..e92f44b 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_rm/artifactId
 nameWS-RM Demo/name
 descriptionWS-RM Demo/description
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-

[5/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_notification/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml 
b/distribution/src/main/release/samples/ws_notification/pom.xml
index 443d808..6c8efc3 100644
--- a/distribution/src/main/release/samples/ws_notification/pom.xml
+++ b/distribution/src/main/release/samples/ws_notification/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_notification/artifactId
 nameWS-Notification Demo/name
 descriptionWS-Notification Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -95,32 +95,32 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-addr/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-ws-policy/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-core/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 /dependencies
 /project

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_policy/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml 
b/distribution/src/main/release/samples/ws_policy/pom.xml
index 2e11081..7e6b4c6 100644
--- a/distribution/src/main/release/samples/ws_policy/pom.xml
+++ b/distribution/src/main/release/samples/ws_policy/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_policy/artifactId
 nameWS-Policy Demo/name
 descriptionWS-Policy Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 
 properties
@@ -124,17 +124,17 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /dependency
 dependency
 groupIdorg.springframework/groupId

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/distribution/src/main/release/samples/ws_rm/pom.xml
--
diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml 
b/distribution/src/main/release/samples/ws_rm/pom.xml
index e92f44b..6e3e846 100644
--- a/distribution/src/main/release/samples/ws_rm/pom.xml
+++ b/distribution/src/main/release/samples/ws_rm/pom.xml
@@ -22,12 +22,12 @@
 artifactIdws_rm/artifactId
 nameWS-RM Demo/name
 descriptionWS-RM Demo/description
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 
 parent
 groupIdorg.apache.cxf.samples/groupId
 artifactIdcxf-samples/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 /parent
 properties
 cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
 dependency
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-rt-frontend-jaxws/artifactId
-

[4/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 06134f7..8125b85 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery/artifactId
 packagingpom/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index 5064f4a..8187ebb 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-api/artifactId
 packagingjar/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery API/name
 descriptionApache CXF WS-Discovery API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index 0b6343a..fcfbafc 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-service/artifactId
 packagingjar/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WS-Discovery Service/name
 descriptionApache CXF WS-Discovery Service/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index 47cb514..4165576 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn/artifactId
 packagingpom/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WSN service/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 48f4200..4466d95 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-api/artifactId
 packagingbundle/packaging
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 nameApache CXF WSN API/name
 descriptionApache CXF WSN API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17/version
+version2.7.18-SNAPSHOT/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/12acd46e/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index f3ab380..3e6ffc8 100644
--- a/services/wsn/wsn-core/pom.xml
+++ 

[1/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9f36b9d8b - 12acd46e3


http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/pom.xml
--
diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml
index 120631c..06134f7 100644
--- a/services/ws-discovery/pom.xml
+++ b/services/ws-discovery/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery/artifactId
 packagingpom/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/ws-discovery-api/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml 
b/services/ws-discovery/ws-discovery-api/pom.xml
index 80af3e5..5064f4a 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-api/artifactId
 packagingjar/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery API/name
 descriptionApache CXF WS-Discovery API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/ws-discovery/ws-discovery-service/pom.xml
--
diff --git a/services/ws-discovery/ws-discovery-service/pom.xml 
b/services/ws-discovery/ws-discovery-service/pom.xml
index d4d6723..0b6343a 100644
--- a/services/ws-discovery/ws-discovery-service/pom.xml
+++ b/services/ws-discovery/ws-discovery-service/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.ws-discovery/groupId
 artifactIdcxf-services-ws-discovery-service/artifactId
 packagingjar/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WS-Discovery Service/name
 descriptionApache CXF WS-Discovery Service/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/pom.xml
--
diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml
index e124a62..47cb514 100644
--- a/services/wsn/pom.xml
+++ b/services/wsn/pom.xml
@@ -21,14 +21,14 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn/artifactId
 packagingpom/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WSN service/name
 urlhttp://cxf.apache.org/url
 
 parent
 groupIdorg.apache.cxf.services/groupId
 artifactIdcxf-services/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/wsn-api/pom.xml
--
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 3761876..48f4200 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -21,7 +21,7 @@
 groupIdorg.apache.cxf.services.wsn/groupId
 artifactIdcxf-services-wsn-api/artifactId
 packagingbundle/packaging
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 nameApache CXF WSN API/name
 descriptionApache CXF WSN API/description
 urlhttp://cxf.apache.org/url
@@ -29,7 +29,7 @@
 parent
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-parent/artifactId
-version2.7.17-SNAPSHOT/version
+version2.7.17/version
 relativePath../../../parent/pom.xml/relativePath
 /parent
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/8bd9499d/services/wsn/wsn-core/pom.xml
--
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 

[3/6] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.17

[asoldano]

[maven-release-plugin] prepare release cxf-2.7.17


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

Branch: refs/heads/2.7.x-fixes
Commit: 8bd9499df7dd858d8edc0eabd00b392d14f2c702
Parents: 9f36b9d
Author: Alessio Soldano asold...@redhat.com
Authored: Mon Jul 27 17:55:29 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Mon Jul 27 17:55:29 2015 +0200

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../src/main/release/samples/oauth/client/pom.xml |  2 +-
 .../src/main/release/samples/oauth/server/pom.xml |  2 +-
 distribution/src/main/release/samples/pom.xml |  2 +-
 .../main/release/samples/restful_dispatch/pom.xml | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 

[6/6] cxf git commit: [maven-release-plugin] prepare for next development iteration

[asoldano]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/2.7.x-fixes
Commit: 12acd46e3dbe98fa1321374b09174d5876271f08
Parents: 8bd9499
Author: Alessio Soldano asold...@redhat.com
Authored: Mon Jul 27 17:58:31 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Mon Jul 27 17:58:31 2015 +0200

--
 api/pom.xml   |  4 ++--
 common/pom.xml|  4 ++--
 common/wstx-msv-validation/pom.xml|  4 ++--
 common/xerces-xsd-validation/pom.xml  |  4 ++--
 distribution/manifest/pom.xml |  4 ++--
 distribution/pom.xml  |  4 ++--
 .../src/main/release/samples/aegis/pom.xml| 12 ++--
 .../main/release/samples/aegis_standalone/pom.xml |  6 +++---
 .../src/main/release/samples/callback/pom.xml | 10 +-
 .../samples/configuration_interceptor/pom.xml | 12 ++--
 .../src/main/release/samples/corba/bank/pom.xml   | 10 +-
 .../samples/corba/bank_ws_addressing/pom.xml  | 10 +-
 .../release/samples/corba/hello_world/pom.xml | 10 +-
 .../release/samples/groovy_spring_support/pom.xml | 10 +-
 .../main/release/samples/in_jvm_transport/pom.xml | 12 ++--
 .../main/release/samples/java_first_jaxws/pom.xml |  8 
 .../samples/java_first_jaxws_factory_bean/pom.xml | 10 +-
 .../main/release/samples/java_first_jms/pom.xml   |  8 
 .../main/release/samples/java_first_pojo/pom.xml  | 10 +-
 .../samples/java_first_spring_support/pom.xml | 10 +-
 .../src/main/release/samples/jax_rs/basic/pom.xml | 10 +-
 .../release/samples/jax_rs/basic_https/pom.xml|  4 ++--
 .../samples/jax_rs/content_negotiation/pom.xml| 12 ++--
 .../release/samples/jax_rs/minimal_osgi/pom.xml   |  4 ++--
 .../samples/jax_rs/spring_security/pom.xml| 10 +-
 .../samples/jax_server_aegis_client/pom.xml   | 12 ++--
 .../src/main/release/samples/jaxws_async/pom.xml  | 12 ++--
 .../samples/jaxws_dispatch_provider/pom.xml   | 10 +-
 .../main/release/samples/jaxws_handlers/pom.xml   | 10 +-
 .../src/main/release/samples/jms_pubsub/pom.xml   | 10 +-
 .../src/main/release/samples/jms_queue/pom.xml|  8 
 .../main/release/samples/jms_spec_demo/pom.xml|  8 
 .../release/samples/jms_spring_config/pom.xml |  8 
 .../samples/js_browser_client_java_first/pom.xml  | 12 ++--
 .../samples/js_browser_client_simple/pom.xml  | 12 ++--
 .../src/main/release/samples/js_client/pom.xml| 12 ++--
 .../src/main/release/samples/js_provider/pom.xml  | 10 +-
 .../src/main/release/samples/logbrowser/pom.xml   |  2 +-
 .../src/main/release/samples/mtom/pom.xml | 10 +-
 .../src/main/release/samples/oauth/client/pom.xml |  2 +-
 .../src/main/release/samples/oauth/server/pom.xml |  2 +-
 distribution/src/main/release/samples/pom.xml |  2 +-
 .../main/release/samples/restful_dispatch/pom.xml | 12 ++--
 .../release/samples/ruby_spring_support/pom.xml   | 10 +-
 .../src/main/release/samples/soap_header/pom.xml  | 10 +-
 distribution/src/main/release/samples/sts/pom.xml |  4 ++--
 .../main/release/samples/ws_addressing/pom.xml| 10 +-
 .../src/main/release/samples/ws_discovery/pom.xml | 12 ++--
 .../main/release/samples/ws_notification/pom.xml  | 16 
 .../src/main/release/samples/ws_policy/pom.xml| 10 +-
 .../src/main/release/samples/ws_rm/pom.xml| 12 ++--
 .../release/samples/ws_security/sign_enc/pom.xml  | 18 +-
 .../main/release/samples/ws_security/ut/pom.xml   | 12 ++--
 .../release/samples/ws_security/ut_policy/pom.xml |  4 ++--
 .../release/samples/ws_security/ut_sign/pom.xml   | 18 +-
 .../src/main/release/samples/wsdl_first/pom.xml   |  8 
 .../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
 .../main/release/samples/wsdl_first_https/pom.xml |  4 ++--
 .../release/samples/wsdl_first_pure_xml/pom.xml   | 10 +-
 .../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
 .../release/samples/wsdl_first_soap12/pom.xml | 10 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml| 10 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml   | 12 ++--
 integration/jca/pom.xml   |  4 ++--
 integration/pom.xml   |  4 ++--
 .../archetypes/cxf-jaxrs-service/pom.xml  |  4 ++--
 

Git Push Summary

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x [deleted] 12acd46e3

[1/2] cxf git commit: [CXF-6392] Prevent NPE

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 88ad79a57 - 1caca0f66


[CXF-6392] Prevent NPE


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

Branch: refs/heads/3.0.x-fixes
Commit: 07e3230db86ff44f5838315f7ca20f6f69f647c7
Parents: 88ad79a
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Jul 24 17:30:28 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Jul 24 17:40:48 2015 +0200

--
 .../simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/07e3230d/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index e522301..95d0197 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -174,7 +174,7 @@ public class WSDLGetUtils {
 if (!smp.containsKey(URLDecoder.decode(key, utf-8))) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
-if (smp.containsKey(URLDecoder.decode(resolved, utf-8))) 
{
+if (resolved != null   
smp.containsKey(URLDecoder.decode(resolved, utf-8))) {
 // if it is resolvable, we can use it
 return base + ?xsd= + key.replace( , %20);
 }

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 1caca0f66b64d7aaa509b1dd6fb38b4bcb981183
Parents: 07e3230
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Jul 24 17:41:17 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Jul 24 17:41:17 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/1caca0f6/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3016e0a..e3ee031 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -478,6 +478,7 @@ M 7b4cb818cb6276dfd3a7432c796e67e98c8c941e
 M 7bf10fc3fb018d533409cc444c2d7b75144b9e23
 M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6
 M 81f0b461d662eccd23ac5ade7349eecdc0316ddf
+M 81f3a848e30751f52be6e4d694e3522f77a14b50
 M 824234e627f6205129b7f97e2fde7f1cf1f17093
 M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5
 M 88a7cd850f0471d6e51f9045bf01f775a905cbf2

[1/2] cxf git commit: [CXF-6392] Prevent NPE

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 19b3e261f - 218e5a959


[CXF-6392] Prevent NPE


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

Branch: refs/heads/2.7.x-fixes
Commit: 90a5982a52bd74b49e485f4985dffac4ac0cdf64
Parents: 19b3e26
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Jul 24 17:30:28 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Jul 24 17:43:02 2015 +0200

--
 .../simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/90a5982a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index bab0a60..7b17ed6 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -175,7 +175,7 @@ public class WSDLGetUtils {
 if (!smp.containsKey(URLDecoder.decode(key, utf-8))) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
-if (smp.containsKey(URLDecoder.decode(resolved, utf-8))) 
{
+if (resolved != null   
smp.containsKey(URLDecoder.decode(resolved, utf-8))) {
 // if it is resolvable, we can use it
 return base + ?xsd= + key.replace( , %20);
 }

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.7.x-fixes
Commit: 218e5a9593eaaad771a58e686b2a3da70f6b6315
Parents: 90a5982
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Jul 24 17:43:27 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Jul 24 17:43:27 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/218e5a95/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 817303a..2d5197a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2249,6 +2249,7 @@ M 070bde423e1b7f0544be1ae1f408cbc0e507825f
 M 0739099f15a76e983d19ed3c09e897e27022cd0f
 M 073d2dd843e2c3b56ae1837b588cac52b3d257b9
 M 07dd93864acf1a9ba9cfd4af03dc69d0944f3864
+M 07e3230db86ff44f5838315f7ca20f6f69f647c7
 M 07f5ffddfd5684eff1c06aa9fc6c3b59105b73ee
 M 083fe4f98a41e75d0fe9d118384a8afe6a264b41
 M 086b11667b96dec701f592ae2925bfa5de7ad647

cxf git commit: [CXF-6392] Prevent NPE

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master b1ea93904 - 81f3a848e


[CXF-6392] Prevent NPE


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

Branch: refs/heads/master
Commit: 81f3a848e30751f52be6e4d694e3522f77a14b50
Parents: b1ea939
Author: Alessio Soldano asold...@redhat.com
Authored: Fri Jul 24 17:30:28 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Fri Jul 24 17:30:28 2015 +0200

--
 .../simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/81f3a848/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index e522301..95d0197 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -174,7 +174,7 @@ public class WSDLGetUtils {
 if (!smp.containsKey(URLDecoder.decode(key, utf-8))) {
 // if the result is not known, check if we can resolve it 
into something known
 String resolved = 
resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
-if (smp.containsKey(URLDecoder.decode(resolved, utf-8))) 
{
+if (resolved != null   
smp.containsKey(URLDecoder.decode(resolved, utf-8))) {
 // if it is resolvable, we can use it
 return base + ?xsd= + key.replace( , %20);
 }

[1/2] cxf git commit: cxf-6484

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes a70005059 - 2ed09a67d


cxf-6484


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

Branch: refs/heads/2.7.x-fixes
Commit: f7a8009fc9cffd40d34d23279ca25d7f5e4880cb
Parents: 0c637e9
Author: Chris Dolphy chris.dol...@redhat.com
Authored: Thu Jul 2 22:43:32 2015 -0500
Committer: Chris Dolphy chris.dol...@redhat.com
Committed: Thu Jul 2 22:43:32 2015 -0500

--
 .../main/java/org/apache/cxf/attachment/AttachmentUtil.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f7a8009f/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
--
diff --git a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java 
b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index e027d75..7ca5877 100644
--- a/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/api/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -196,7 +197,12 @@ public final class AttachmentUtil {
 
 String name = ATT_UUID + - + String.valueOf(++counter);
 if (ns != null  (ns.length()  0)) {
-cid = ns;
+try {
+URI uri = new URI(ns);
+cid = uri.getHost();
+} catch (Exception e) {
+cid = ns;
+}
 }
 return URLEncoder.encode(name, UTF-8) + @ + URLEncoder.encode(cid, 
UTF-8);
 }

cxf git commit: Recording .gitmergeinfo Changes

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 2ed09a67d - 19b3e261f


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

Branch: refs/heads/2.7.x-fixes
Commit: 19b3e261fbe7856608f084e9b4e4fc8bd4205fbf
Parents: 2ed09a6
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jul 22 21:44:59 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jul 22 21:44:59 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/19b3e261/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 33b95fd..817303a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1682,6 +1682,7 @@ B c0d434e8d6542c1f18d2055f2c55b98ac32fe519
 B c0ebc2556820c57b9f1255e9b046a0560e54e68a
 B c0ee2ba9022bbe83b170d7445d0c26ccd8e52b7e
 B c0f463915fdb8ddf4bab9fadefc705988d9efd36
+B c10ec21f253508989a90ba6304dbba69dfc22b1a
 B c158293c3d23885559ce9a39d9ebc9478fd8edf3
 B c15bc1bba2de108dd543365af33a9f4b59a0339e
 B c175b954a3160e42ba106ff654e0e7b98bc1223a

[1/2] cxf git commit: [CXF-6484] Regression in Content-id format - applying patch from 2.7.x pull request - Thanks Chris Dolphy

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4eb8d15a2 - 5d021211f


[CXF-6484] Regression in Content-id format - applying patch from 2.7.x pull 
request - Thanks Chris Dolphy


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

Branch: refs/heads/3.0.x-fixes
Commit: c10ec21f253508989a90ba6304dbba69dfc22b1a
Parents: 4eb8d15
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jul 22 21:24:32 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jul 22 21:29:23 2015 +0200

--
 .../main/java/org/apache/cxf/attachment/AttachmentUtil.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c10ec21f/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index ba82579..a054ca2 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -196,7 +197,12 @@ public final class AttachmentUtil {
 
 String name = ATT_UUID + - + String.valueOf(++counter);
 if (ns != null  (ns.length()  0)) {
-cid = ns;
+try {
+URI uri = new URI(ns);
+cid = uri.getHost();
+} catch (Exception e) {
+cid = ns;
+}
 }
 return URLEncoder.encode(name, UTF-8) + @ + URLEncoder.encode(cid, 
UTF-8);
 }

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 5d021211f26472ccd374a166d4b45583578851f9
Parents: c10ec21
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jul 22 21:30:35 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jul 22 21:30:35 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d021211/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 49ddda8..3016e0a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -511,6 +511,7 @@ M aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
 M ad75192db72294e6d117e020aea890a50c166f79
 M af2f7d3a52076f60d0f98a2635e2adef256a9efe
 M b283eeb95544b6088331b37567c851564655bff4
+M b5320827561467de7e04afdba15a6063d26493a3
 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
 M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
 M bd1d31f195caab56fbe565fbfb63d9170a0c9406

[2/2] cxf git commit: Merge branch 'cxf-6484' of https://github.com/chrisdolphy/cxf into 2.7.x

[asoldano]

Merge branch 'cxf-6484' of https://github.com/chrisdolphy/cxf into 2.7.x

This closes #80
commit f7a8009fc9cffd40d34d23279ca25d7f5e4880cb
Author: Chris Dolphy chris.dol...@redhat.com
Date: 2015-07-03T03:43:32Z
cxf-6484


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

Branch: refs/heads/2.7.x-fixes
Commit: 2ed09a67d9a2e9fb9804d2df5db6373efb1cb9fe
Parents: a700050 f7a8009
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jul 22 21:32:58 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jul 22 21:32:58 2015 +0200

--
 .../main/java/org/apache/cxf/attachment/AttachmentUtil.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--

cxf git commit: [CXF-6484] Regression in Content-id format - applying patch from 2.7.x pull request - Thanks Chris Dolphy

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 8c4dab45a - b53208275


[CXF-6484] Regression in Content-id format - applying patch from 2.7.x pull 
request - Thanks Chris Dolphy


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

Branch: refs/heads/master
Commit: b5320827561467de7e04afdba15a6063d26493a3
Parents: 8c4dab4
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jul 22 21:24:32 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jul 22 21:24:32 2015 +0200

--
 .../main/java/org/apache/cxf/attachment/AttachmentUtil.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b5320827/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
--
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index ba82579..a054ca2 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -196,7 +197,12 @@ public final class AttachmentUtil {
 
 String name = ATT_UUID + - + String.valueOf(++counter);
 if (ns != null  (ns.length()  0)) {
-cid = ns;
+try {
+URI uri = new URI(ns);
+cid = uri.getHost();
+} catch (Exception e) {
+cid = ns;
+}
 }
 return URLEncoder.encode(name, UTF-8) + @ + URLEncoder.encode(cid, 
UTF-8);
 }

cxf git commit: [CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports with JDK8

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master a9a1305a9 - 0a91c7b36


[CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports 
with JDK8


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

Branch: refs/heads/master
Commit: 0a91c7b3694c8fb453a3eb9c50b94ba4870f8aff
Parents: a9a1305
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 25 14:23:43 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 25 14:25:18 2015 +0200

--
 .../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a91c7b3/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 9213e67..e522301 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -625,8 +625,8 @@ public class WSDLGetUtils {
 
 if (imp.getReferencedSchema() != null) {
 for (Map.EntryString, SchemaReference e : 
doneSchemas.entrySet()) {
-if (e.getValue().getReferencedSchema().getElement()
-== imp.getReferencedSchema().getElement()) {
+if ((e.getValue().getReferencedSchema().getElement() == 
imp.getReferencedSchema().getElement())
+ schemaLocationURI.equals(e.getKey())) {
 doneSchemas.put(schemaLocationURI, imp);
 imp.setSchemaLocationURI(e.getKey());
 return e.getKey();

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 8312517acf5b4ba26d50250ecc3b468ad281ef65
Parents: 1bec032
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 25 16:08:40 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 25 16:08:40 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/8312517a/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7df6c0a..0f34561 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -380,6 +380,7 @@ M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7
 M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
 M 05383ffcfc3fe16c6acadf1a343375c00fa1116c
 M 05b96b6e8d1c3f845ce4d9b8a77c638ed7e987b7
+M 0a91c7b3694c8fb453a3eb9c50b94ba4870f8aff
 M 0cb64ee2bb66e4249c4a0f8d7ae62068e2a95dcd
 M 0d3d0bd91a8dd9e01e4716bc40dce28ed07c4325
 M 0d63846798b590255c45463359e2cb1a28e4d3cb

[1/2] cxf git commit: [CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports with JDK8

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 4d453da45 - bdb066bee


[CXF-6469] Applying patch from Rebecca Searls for proper rewrite of xsd imports 
with JDK8


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

Branch: refs/heads/2.7.x-fixes
Commit: 9a4d1fe635291331ef554922079b44d380117f85
Parents: 4d453da
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 25 14:23:43 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 25 18:12:06 2015 +0200

--
 .../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9a4d1fe6/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 1826598..bab0a60 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -626,8 +626,8 @@ public class WSDLGetUtils {
 
 if (imp.getReferencedSchema() != null) {
 for (Map.EntryString, SchemaReference e : 
doneSchemas.entrySet()) {
-if (e.getValue().getReferencedSchema().getElement()
-== imp.getReferencedSchema().getElement()) {
+if ((e.getValue().getReferencedSchema().getElement() == 
imp.getReferencedSchema().getElement())
+ schemaLocationURI.equals(e.getKey())) {
 doneSchemas.put(schemaLocationURI, imp);
 imp.setSchemaLocationURI(e.getKey());
 return e.getKey();

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

[asoldano]

Recording .gitmerginfo Changes


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

Branch: refs/heads/2.7.x-fixes
Commit: bdb066beefac52b366d2795c7b33b4650aa1d019
Parents: 9a4d1fe
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 25 18:16:45 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 25 18:16:45 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/bdb066be/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 29e903b..62db0b4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2287,6 +2287,7 @@ M 1a0c4aad7f0360c30539e49a98eb4f16fa554512
 M 1a4b7cfd929bdfd1c53feef8099c1a67a24afeff
 M 1a96465f1f599d96e6ea74aa1477a39152b42879
 M 1ab9f70d4112432482f7030ea43b3870d524bd0d
+M 1bec032480a2dbe6c2ba7b6c4c8d2b99d1fad257
 M 1c218c8f21311db0c9e77ca401ddbe339f18dc06
 M 1c8cbd98259ac6a6d45e2ba58945d100bffa8d83
 M 1c96e19bdc570947b18b343f143c6a85a27c0acb

cxf git commit: [CXF-6438] Optimize ExtensionInvocationHandler

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master c2b70fd46 - d5585c4c3


[CXF-6438] Optimize ExtensionInvocationHandler


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

Branch: refs/heads/master
Commit: d5585c4c352803bfdf43e91d3c5dd2bea2abeb86
Parents: c2b70fd
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 4 16:07:25 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 4 16:07:25 2015 +0200

--
 .../cxf/common/util/ExtensionInvocationHandler.java | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d5585c4c/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
index 1524c18..7672382 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
@@ -30,15 +30,13 @@ public class ExtensionInvocationHandler implements 
InvocationHandler {
 }
 
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
-Class?[] clzs = null;
-if (args != null) {
-clzs = new Class[args.length];
-for (int i = 0; i  args.length; i++) {
-clzs[i] = args[i].getClass();
-}
+if (method.getDeclaringClass().isAssignableFrom(obj.getClass())) {
+return method.invoke(obj, args);
+} else {
+//in case obj has the required method with exact signature despite 
it's class
+//not being assignable from the class declaring the specified 
method
+Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
+return m.invoke(obj, args);
 }
-
-Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
-return m.invoke(obj, args);
 }
 }

cxf git commit: Comment typo

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master d5585c4c3 - a2c4be5e9


Comment typo


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

Branch: refs/heads/master
Commit: a2c4be5e99472fc23b1740fc594e5d4c64961ca4
Parents: d5585c4
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 4 16:11:09 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 4 16:11:09 2015 +0200

--
 .../org/apache/cxf/common/util/ExtensionInvocationHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a2c4be5e/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
index 7672382..53185e8 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
@@ -33,7 +33,7 @@ public class ExtensionInvocationHandler implements 
InvocationHandler {
 if (method.getDeclaringClass().isAssignableFrom(obj.getClass())) {
 return method.invoke(obj, args);
 } else {
-//in case obj has the required method with exact signature despite 
it's class
+//in case obj has the required method with exact signature despite 
its class
 //not being assignable from the class declaring the specified 
method
 Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
 return m.invoke(obj, args);

[1/3] cxf git commit: [CXF-6438] Optimize ExtensionInvocationHandler

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 32812b2bd - 99311036f


[CXF-6438] Optimize ExtensionInvocationHandler


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

Branch: refs/heads/3.0.x-fixes
Commit: e76de136822100ba01f8f9902e689ce28e44a964
Parents: 32812b2
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 4 16:07:25 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 4 16:11:57 2015 +0200

--
 .../cxf/common/util/ExtensionInvocationHandler.java | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e76de136/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
index 1524c18..7672382 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
@@ -30,15 +30,13 @@ public class ExtensionInvocationHandler implements 
InvocationHandler {
 }
 
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
-Class?[] clzs = null;
-if (args != null) {
-clzs = new Class[args.length];
-for (int i = 0; i  args.length; i++) {
-clzs[i] = args[i].getClass();
-}
+if (method.getDeclaringClass().isAssignableFrom(obj.getClass())) {
+return method.invoke(obj, args);
+} else {
+//in case obj has the required method with exact signature despite 
it's class
+//not being assignable from the class declaring the specified 
method
+Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
+return m.invoke(obj, args);
 }
-
-Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
-return m.invoke(obj, args);
 }
 }

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

[asoldano]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: 99311036ff037b6744c2f2ee90ff56b6e33db3b6
Parents: 8fc672b
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 4 16:12:58 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 4 16:12:58 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/99311036/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2b0dc40..5c479b2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -465,6 +465,7 @@ M 9c7b2bc668a8b1e1d620aa79c3c32927b06a3ff3
 M 9d25f9a0617bcb30e19d23fa4d5b4bd7948b8434
 M 9f18da888e37f203b1aa9a3240ed7b6aab3a4ef9
 M a088c793efd923a52f68044b02221f8b47569ef9
+M a2c4be5e99472fc23b1740fc594e5d4c64961ca4
 M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7
 M a5b1c33534d83b4d0696263439d0d1a906b1afe6
 M a64265c29be124e9bffb46eb35a68b3504860c3a
@@ -492,6 +493,7 @@ M d25e4c94c518cb79af1e05a32fb8ded52a951324
 M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
 M d4a35c40d53fde17fec3d08c25215c7533dcb667
 M d5315e072b8dd5222ede6f8e47c1e3e645209f59
+M d5585c4c352803bfdf43e91d3c5dd2bea2abeb86
 M d7945c77da4f438cd7f52b1a512e65c62409d0ef
 M d9f4142e87bc8a4f31c1bd1560a01a18b5c66407
 M da352523c42bf69ab743f75a5216a03e26a20bef

[2/3] cxf git commit: Comment typo

[asoldano]

Comment typo


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

Branch: refs/heads/3.0.x-fixes
Commit: 8fc672b9793339c70787d2e754d184eae6fb14cd
Parents: e76de13
Author: Alessio Soldano asold...@redhat.com
Authored: Thu Jun 4 16:11:09 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Thu Jun 4 16:12:07 2015 +0200

--
 .../org/apache/cxf/common/util/ExtensionInvocationHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8fc672b9/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
index 7672382..53185e8 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/ExtensionInvocationHandler.java
@@ -33,7 +33,7 @@ public class ExtensionInvocationHandler implements 
InvocationHandler {
 if (method.getDeclaringClass().isAssignableFrom(obj.getClass())) {
 return method.invoke(obj, args);
 } else {
-//in case obj has the required method with exact signature despite 
it's class
+//in case obj has the required method with exact signature despite 
its class
 //not being assignable from the class declaring the specified 
method
 Method m = obj.getClass().getMethod(method.getName(), 
method.getParameterTypes());
 return m.invoke(obj, args);

cxf git commit: Avoid useless string concat when logs are disabled

[asoldano]

Repository: cxf
Updated Branches:
  refs/heads/master 907adf94a - e3f89d3c0


Avoid useless string concat when logs are disabled


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

Branch: refs/heads/master
Commit: e3f89d3c07f38f2e01c951d7bad8336e090837ae
Parents: 907adf9
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Jun 3 10:19:38 2015 +0200
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Jun 3 10:19:38 2015 +0200

--
 .../main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e3f89d3c/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index afde3f4..902d0a8 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -34,6 +34,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -309,7 +310,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
 if (cls == null 
  ReflectionUtil.getDeclaredConstructors(claz).length  0 
  !Modifier.isAbstract(claz.getModifiers())) {
-LOG.info(Class  + claz.getName() +  does not have a default 
constructor which JAXB requires.);
+if (LOG.isLoggable(Level.INFO)) {
+LOG.info(Class  + claz.getName() +  does not have a 
default constructor which JAXB requires.);
+}
 //there is no init(), but other constructors
 Object factory = createFactory(claz, 
ReflectionUtil.getDeclaredConstructors(claz)[0]);
 unmarshallerProperties.put(com.sun.xml.bind.ObjectFactory, 
factory);