You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/11/07 20:59:41 UTC
[1/6] cxf git commit: Update xalan version
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes dd4c60de2 -> f3279ea1d
Update xalan version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/497d8503
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/497d8503
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/497d8503
Branch: refs/heads/2.7.x-fixes
Commit: 497d85037a5cfadd34e80956b1bc070909bd3e97
Parents: dd4c60d
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:03:36 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:40:27 2014 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/497d8503/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e152dcd..7955f12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -813,7 +813,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>2.7.2</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
[5/6] cxf git commit: [CXF-6091] Fix problems stoping servers that
are using the MultiEndpointObserver Patch from Vadim Beilin applied
Posted by dk...@apache.org.
[CXF-6091] Fix problems stoping servers that are using the MultiEndpointObserver
Patch from Vadim Beilin applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fae68333
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fae68333
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fae68333
Branch: refs/heads/2.7.x-fixes
Commit: fae68333c52e8d67276a776efaaeec9717c89689
Parents: 1bde7c9
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 7 13:40:46 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:44:16 2014 -0500
----------------------------------------------------------------------
api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java | 9 +++++----
.../cxf/frontend/soap/SoapBindingSelectionTest.java | 10 ++++++++++
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fae68333/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index 9d4d7b3..3654ffa 100644
--- a/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -159,11 +159,12 @@ public class ServerImpl implements Server {
MessageObserver mo = getDestination().getMessageObserver();
if (mo instanceof MultipleEndpointObserver) {
((MultipleEndpointObserver)mo).getEndpoints().remove(endpoint);
- if (!((MultipleEndpointObserver)mo).getEndpoints().isEmpty()) {
- return;
+ if (((MultipleEndpointObserver)mo).getEndpoints().isEmpty()) {
+ getDestination().setMessageObserver(null);
}
- }
- getDestination().setMessageObserver(null);
+ } else {
+ getDestination().setMessageObserver(null);
+ }
stopped = true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/fae68333/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
index a25379b..13277e5 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
@@ -94,6 +94,16 @@ public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
assertFalse(service1Invoked);
assertTrue(service2Invoked);
+
+ server2.stop();
+ server2.start();
+
+ nd = invoke("http://localhost/Hello", LocalTransportFactory.TRANSPORT_ID, "soap12.xml");
+ assertEquals("http://www.w3.org/2003/05/soap-envelope", getNs(nd));
+
+ assertFalse(service1Invoked);
+ assertTrue(service2Invoked);
+
}
private String getNs(Node nd) {
[6/6] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/f3279ea1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3279ea1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3279ea1
Branch: refs/heads/2.7.x-fixes
Commit: f3279ea1da31d90a1f50b801f1d31b421907737c
Parents: fae6833
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 7 14:44:16 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:44:16 2014 -0500
----------------------------------------------------------------------
.gitmergeinfo | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3279ea1/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2a53bef..5645bea 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -98,6 +98,7 @@ B 0fa7477274ea6c430f764d5c6a013bb09cae9409
B 0fcacad057b33107b82ac05db59b1a1ebc69a963
B 0fcb49380d93b974e918e32051b5438cdc5e179c
B 0fd41e29ea4a79d7dd44569db6c804c5b257085b
+B 0ff2ca6a7aa0fde9d0cf22d2d2fdee228974d73c
B 0ff365aa8bb9b7b2180dbf1afd17b4cc39020f40
B 100bf13fe2cf118167f0d0aaf02c34e6337c12ec
B 103a6aef91a0760a4bf78e53c94f5624a0af30f4
@@ -143,6 +144,7 @@ B 16cff265ea0002e225b1bdbbaa6b5a621e0a182b
B 16d26a02d5496df1e6cc406a3ff8dad0efd96573
B 16ed4ea3179c5c19e7baca9c4d1380fd5d995006
B 16f33edc9fe9e055834b1f8d15c69663250894e9
+B 16f7e32ba9059bac2898464232f5f58d7730eb7d
B 17049b58a2629089d043e374432be733d9f4cca9
B 1704fa3169b05c9e41e0c10b4c5cbd8ea83f1826
B 17407dbb824c0d1f7cf0f34f68205ffc161ae2e3
@@ -369,6 +371,7 @@ B 3b21a29437c3f0a3f7ee05a9fa7a1e79e35393a8
B 3b349d5d2217d04828e9482ea10dcd3cceb1d1b6
B 3b49b4264d025e048695e303435b373a98cb4315
B 3b6b2574df11026a77ecc805dfa5e4156c95b2a7
+B 3b734a58ec9eb45c38fb4481e5638fdc2896b0c5
B 3b798b8f04b3b847d228c4e39476197ed251c6cb
B 3b85cfaa3e3ede4c2abf977b4c0bbe4ec289c09a
B 3b86cbaff51cb6282e10f44be0f4dfb4221506e6
@@ -377,6 +380,7 @@ B 3ba70b45de658b98c96485f10c9f688332d7510c
B 3bcf569835e6aac67b53b04c8de9f1d7333a5de9
B 3bd1723a6fa236641b8a07628b505fe755c31f9d
B 3bd4e84427598b7dfd18ccfcdea72512bc6cda9e
+B 3c059f5af8a18f84aa10ecc084cf7f08072421fc
B 3c424913fcaa01fe8a07580281f86995247942ea
B 3c5d07049883ddabcf7101ae6f5ac9c19d12937d
B 3c78d3be567447c50d10ed52fcfe231525d2bf9c
@@ -425,6 +429,7 @@ B 4391aa5b0ba88c131d348f215ae5074590498f70
B 43df09350e7e6820558ccfdb419cc3f4df9bf569
B 43df7e290666cc5bd9e461176aa7e9b5d5d59940
B 43efdb551c76a30ef897d796d6580a508313b2a0
+B 43fe4320178c6fa47907f14a936d8f39bb59be24
B 44204faaabc25977c42846ff27914294b6384079
B 4429728376a8bf0870d14785f20fd3edc7340ebe
B 445c6ddae4952653ebad7ea15e23c42f51063b3f
@@ -518,6 +523,7 @@ B 53f1131e6ef056c0ca06e73041e68eafcfe8a737
B 542e4160f6d7bc220160fd672accd963da1303e3
B 5448c31c043b1b2e18918616749fbd9f033923b4
B 5484ef481f6ab34c8e6a1bfc9f79d1c3f7789717
+B 556c23841a6d49d7c8f5b103a7abc336f944e717
B 557bcd4ea79ba9a01a62765e63e97663b73363aa
B 5588092cebb1a6a67299443b683dc871ca62f751
B 5588578e04fea8d03ee1c22a888dda3cde007744
@@ -658,6 +664,7 @@ B 6e351465962e069730f95d60d581181207a16ef3
B 6e5cba3561217f30159588f17def9e458cf63555
B 6ea2061602527aa5a3a15e022aa6efbe0aee5996
B 6edbd5859bf607dcde8f9a31b6a4658df0b91e21
+B 6f0d2e277a281f961e4c0e333b8e645f1d9d230f
B 6f7ec449d4fbebb9fefb6e7152eef93edad44730
B 6f8d4adf33c36671eb1c4a4a64a93122ddfc94fb
B 6fbbe40e41cf96318c9101f7fb597d0a508ce2f6
@@ -950,6 +957,7 @@ B 9d4ddb5a84bf3636d3e604fabf55d0b3ab507744
B 9d971b7bfa27191e09720453bdbc17e807690669
B 9db7dec8dfe58a4add1b22898997e4c6e25f17d9
B 9dd62509e232269afac7a6567fbcc568a3f91f0e
+B 9e0dcd9cfa7f1a6866b680d92e30b894199bc8bb
B 9e17d8a99e634fa9ce507afb61c1a9306255fa90
B 9e27007895d269fb3e2c47e39f65286d29a7896b
B 9e51e56a7f5c85ade60f6a902d1d2aed29a0286f
@@ -1048,6 +1056,7 @@ B aff4f5d14c7bba6f3b542b61a2a5c80430a1d350
B b0133860d6db408b21f15f9cb52c7d16cee89b13
B b04f7ed86cd6da81578c9a66f4bf7db41dc8903c
B b0e7be04d0d6ba8061831fcc26448e8e5c1c8a2e
+B b0f2aac8e8718c8dbb57d826fc8cfa5f3583b3bb
B b11ce27dcaa1180249633d3f45583949cd698ee9
B b14f773634eaee65d8b8f2f1ee67d1e95c4bcb9f
B b15370faae90413f215b82c9d8a7ff5923507708
@@ -1288,6 +1297,7 @@ B db6d55988ee70dfa3e751d4de13cac43005fc3f6
B db84f3f6128c4c670f1b328a5aeb6b2617af48a9
B db872c215057bafcaef5d48652373d607c7a9d9d
B dbaeb110eb4a575ab647fccec10b87d688114d84
+B dc1a1c0b7cca193c0278b70c567d73d3e4056807
B dc4f09b76afa9c5ac2d06d113fb0811f9e4c3594
B dc5bde7d96f8db6008a09d6d49f749da338b88e9
B dc9ae1559e892067c06daf00772e458b6428b1f5
@@ -1337,6 +1347,7 @@ B e31e934b9634d8ccb42f2ec20f55984f08078f6e
B e33fa0c6f2f8cbf1b3d69b6ea47fc53b8e68bfc9
B e3518a7b9ffd4fddfe3bc32ff7bc437a4654963f
B e3a2b0323de8fd58686dc0db135146d645d4fcc8
+B e3ac9e98557ef2f2383aff238d463fdef7f22dc0
B e3bc99d9e69950a30546dab9d988b2559e6467fd
B e3d15f85f872c67b51dc0657164ed3f2447151b2
B e3e32663ae329f8e7986b12b1e59aab030b292d8
@@ -1599,6 +1610,7 @@ M 1e7c47d8d989d0f0206c8d4c1b11ef8638d5c3d6
M 1e9e67d778ed81d9adbce3b0d3cf61ab1e8d4a38
M 1ec43095d4577dea6ba76d5a4085a07de8bfae92
M 1ed0dd8ba34164e462f160fa3c7864ac12aeb9f0
+M 1f860a92216fa630e7e3dc9e767a5cb0261d1677
M 1fa9f532b64187ac7e7f1094b659369fc4adacf6
M 20767c663fc54d3f6d0219a5c347dbaa49939b67
M 20b023d463d322b30067306acdd7b4e46292ba68
@@ -1633,6 +1645,7 @@ M 2c0d2a841135f4ae2bcf50920122a8045824d063
M 2c2c744608675c802039e79afacdae34efd5d433
M 2ca388d991f59df5282d8e960f7acfc7480b1ad4
M 2cf133d0cb05680ee3b21e3d6905faca8e2189a5
+M 2d246e708ce9d586477bed79db384e8876f7170f
M 2db2973fdead79c745584093b90a36e35fdc5766
M 2e0e4aa5c2314a3c1cf5b924ddf1a5a32f9a70a7
M 2e6ce310695f110e8a809297276fdbfaca04c395
@@ -2190,6 +2203,7 @@ M f584187d09471f28578854e288a7c7d612ea82bc
M f5a82c1c393775334725b9de61b94f492cdd1f2f
M f61876836d11eb04b47a647a20e6a1d504e93671
M f678cdd89d1ba6be3b5113743cfa5859806ba99a
+M f68f775a7b95a268e66ebbc832d1f8a30c9ac240
M f69d6b69fcb2f9677070d12b6ada8cba2c0945fc
M f73a8780a2856a2df8f0d8499232b59845b8582a
M f77a9ebf0d9ee8b2e5cf4ba1c2c38f2e33460759
[4/6] cxf git commit: [CXF-6092] Add a couple NPE guards
Posted by dk...@apache.org.
[CXF-6092] Add a couple NPE guards
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1bde7c9a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1bde7c9a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1bde7c9a
Branch: refs/heads/2.7.x-fixes
Commit: 1bde7c9a31a473bf73ad246c2f3d3996cae7d09b
Parents: d951a5d
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 7 13:25:52 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:44:06 2014 -0500
----------------------------------------------------------------------
api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1bde7c9a/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 4971677..bab6091 100644
--- a/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -381,7 +381,9 @@ public class ClientImpl
try {
return invoke(oi, params, context, exchange);
} finally {
- responseContext.put(Thread.currentThread(), resp);
+ if (responseContext != null) {
+ responseContext.put(Thread.currentThread(), resp);
+ }
}
}
public Object[] invoke(BindingOperationInfo oi,
@@ -392,7 +394,7 @@ public class ClientImpl
} finally {
if (context != null) {
Map<String, Object> resp = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT));
- if (resp != null) {
+ if (resp != null && responseContext != null) {
responseContext.put(Thread.currentThread(), resp);
}
}
@@ -858,7 +860,7 @@ public class ClientImpl
.getOutMessage()
.get(Message.INVOCATION_CONTEXT));
resCtx = CastUtils.cast((Map<?, ?>)resCtx.get(RESPONSE_CONTEXT));
- if (resCtx != null) {
+ if (resCtx != null && responseContext != null) {
responseContext.put(Thread.currentThread(), resCtx);
}
try {
[3/6] cxf git commit: [CXF-6090] Add some NPE guards in xmlbeans
tooling.
Posted by dk...@apache.org.
[CXF-6090] Add some NPE guards in xmlbeans tooling.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d951a5d4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d951a5d4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d951a5d4
Branch: refs/heads/2.7.x-fixes
Commit: d951a5d407f48165b3295f75e3b9cd9fe390d3e8
Parents: ce10114
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 7 13:16:39 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:42:46 2014 -0500
----------------------------------------------------------------------
.../cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d951a5d4/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
index b5491ef..a8d867f 100644
--- a/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
+++ b/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java
@@ -42,6 +42,7 @@ import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
+import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.tools.common.ToolConstants;
@@ -50,6 +51,7 @@ import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.common.model.DefaultValueWriter;
import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
+import org.apache.ws.commons.schema.constants.Constants;
import org.apache.xmlbeans.SchemaGlobalElement;
import org.apache.xmlbeans.SchemaProperty;
import org.apache.xmlbeans.SchemaType;
@@ -144,6 +146,9 @@ public class XMLBeansToolingDataBinding implements DataBindingProfile {
if (type == null) {
type = typeLoader.findDocumentType(qn);
}
+ if (type == null) {
+ return null;
+ }
ret = type.getFullJavaName();
if (ret.contains("$")) {
@@ -157,6 +162,13 @@ public class XMLBeansToolingDataBinding implements DataBindingProfile {
type = typeLoader.findType(qn);
}
+ if (type == null
+ && Constants.URI_2001_SCHEMA_XSD.equals(qn.getNamespaceURI())) {
+ return JAXBUtils.builtInTypeToJavaType(qn.getLocalPart());
+ }
+ if (type == null) {
+ return null;
+ }
ret = type.getFullJavaName();
return ret.replace('$', '.');
}
[2/6] cxf git commit: Update easymock
Posted by dk...@apache.org.
Update easymock
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce101145
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce101145
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce101145
Branch: refs/heads/2.7.x-fixes
Commit: ce101145a8664930840cd270273acd6b726f3a8a
Parents: 497d850
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 13:04:35 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 7 14:40:29 2014 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce101145/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7955f12..f4a8e80 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1197,7 +1197,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>