cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 30da37246 - 97dc66811 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/97dc6681 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97dc6681 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97dc6681 Branch: refs/heads/2.7.x-fixes Commit: 97dc66811e63cadf1e5b6a74330aee92200a3339 Parents: 30da372 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Feb 11 14:43:31 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Feb 11 14:43:31 2015 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/97dc6681/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b733f39..c98c94a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1725,6 +1725,7 @@ B ec154bddb76600400674592cca57f93c31bdf484 B ec3dc635c4c9e78c5f26918aebe7c3d3f0ccfc84 B ec5b0902123c0f7b531b7517759cc20c45f5f577 B ec760bb51b1970892c3ac22093b5b0027fc12588 +B ec9805a4792c1bdbf486e4ba18acb91046514e4b B ec9df9cd410d00640d8939077f80849727ae46f0 B eca7b721742ee7272aa7ce3658a97c493ee916dc B ecae5ecb2a104dc5eabfe27c704d11914e720cb1
cxf git commit: [CXF-6085] Just prototyping JweJsonProducerTest and fixing few typos
Repository: cxf
Updated Branches:
refs/heads/master 69da964ce - 76e1cd86b
[CXF-6085] Just prototyping JweJsonProducerTest and fixing few typos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/76e1cd86
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76e1cd86
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76e1cd86
Branch: refs/heads/master
Commit: 76e1cd86bf15145a3a5d6942d5b36567a98b54fd
Parents: 69da964
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 17:41:09 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 17:41:09 2015 +
--
.../jose/jwe/AbstractJweEncryption.java | 2 +-
.../rs/security/jose/jwe/JweJsonProducer.java | 28 ++---
.../jose/jwe/JweCompactReaderWriterTest.java| 6 +-
.../security/jose/jwe/JweJsonProducerTest.java | 66
4 files changed, 88 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/76e1cd86/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index e0d7cf6..ba805938 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -143,7 +143,7 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
(getKeyAlgorithm() == null
||
!getKeyAlgorithm().equals(jweInHeaders.getKeyEncryptionAlgorithm()))
|| jweInHeaders.getAlgorithm() != null
-
!getContentAlgorithm().equals(jweInHeaders.getAlgorithm())) {
+
!getContentAlgorithm().equals(jweInHeaders.getContentEncryptionAlgorithm())) {
throw new SecurityException();
}
theHeaders.asMap().putAll(jweInHeaders.asMap());
http://git-wip-us.apache.org/repos/asf/cxf/blob/76e1cd86/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index 8879e24..ede3a0a 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -50,22 +50,27 @@ public class JweJsonProducer {
this(protectedHeader, content, aad);
this.unprotectedHeader = unprotectedHeader;
}
-
+public String encryptWith(JweEncryptionProvider encryptor) {
+return encryptWith(Collections.singletonList(encryptor), null);
+}
+public String encryptWith(JweEncryptionProvider encryptor, JweHeaders
recipientUnprotected) {
+return encryptWith(Collections.singletonList(encryptor),
+ Collections.singletonList(recipientUnprotected));
+}
public String encryptWith(ListJweEncryptionProvider encryptors) {
return encryptWith(encryptors, null);
}
public String encryptWith(ListJweEncryptionProvider encryptors,
- ListJweHeaders recepientUnprotected) {
+ ListJweHeaders recipientUnprotected) {
checkAndGetContentAlgorithm(encryptors);
-if (recepientUnprotected != null
- recepientUnprotected.size() != encryptors.size()) {
+if (recipientUnprotected != null
+ recipientUnprotected.size() != encryptors.size()) {
throw new IllegalArgumentException();
}
//TODO: determine the actual cek and iv length based on the algo
byte[] cek = CryptoUtils.generateSecureRandomBytes(32);
byte[] iv = CryptoUtils.generateSecureRandomBytes(16);
JweHeaders unionHeaders = new JweHeaders();
-unionHeaders.setProtectedHeaders(protectedHeader);
if (protectedHeader != null) {
unionHeaders.asMap().putAll(protectedHeader.asMap());
}
@@ -91,9 +96,9 @@ public class JweJsonProducer {
for (int i = 0; i encryptors.size(); i++) {
JweEncryptionProvider encryptor = encryptors.get(i);
JweHeaders perRecipientUnprotected =
-recepientUnprotected == null ? null :
cxf git commit: [CXF-6085] Just prototyping JweJsonProducerTest and fixing few typos
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ec9805a47 - bd9c0fd1d
[CXF-6085] Just prototyping JweJsonProducerTest and fixing few typos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bd9c0fd1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bd9c0fd1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bd9c0fd1
Branch: refs/heads/3.0.x-fixes
Commit: bd9c0fd1dcb6c637f1069b48a2c4e4042c127a18
Parents: ec9805a
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 17:41:09 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 17:44:39 2015 +
--
.../jose/jwe/AbstractJweEncryption.java | 2 +-
.../rs/security/jose/jwe/JweJsonProducer.java | 28 ++---
.../jose/jwe/JweCompactReaderWriterTest.java| 6 +-
.../security/jose/jwe/JweJsonProducerTest.java | 66
4 files changed, 88 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bd9c0fd1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index e0d7cf6..ba805938 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -143,7 +143,7 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
(getKeyAlgorithm() == null
||
!getKeyAlgorithm().equals(jweInHeaders.getKeyEncryptionAlgorithm()))
|| jweInHeaders.getAlgorithm() != null
-
!getContentAlgorithm().equals(jweInHeaders.getAlgorithm())) {
+
!getContentAlgorithm().equals(jweInHeaders.getContentEncryptionAlgorithm())) {
throw new SecurityException();
}
theHeaders.asMap().putAll(jweInHeaders.asMap());
http://git-wip-us.apache.org/repos/asf/cxf/blob/bd9c0fd1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index 8879e24..ede3a0a 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -50,22 +50,27 @@ public class JweJsonProducer {
this(protectedHeader, content, aad);
this.unprotectedHeader = unprotectedHeader;
}
-
+public String encryptWith(JweEncryptionProvider encryptor) {
+return encryptWith(Collections.singletonList(encryptor), null);
+}
+public String encryptWith(JweEncryptionProvider encryptor, JweHeaders
recipientUnprotected) {
+return encryptWith(Collections.singletonList(encryptor),
+ Collections.singletonList(recipientUnprotected));
+}
public String encryptWith(ListJweEncryptionProvider encryptors) {
return encryptWith(encryptors, null);
}
public String encryptWith(ListJweEncryptionProvider encryptors,
- ListJweHeaders recepientUnprotected) {
+ ListJweHeaders recipientUnprotected) {
checkAndGetContentAlgorithm(encryptors);
-if (recepientUnprotected != null
- recepientUnprotected.size() != encryptors.size()) {
+if (recipientUnprotected != null
+ recipientUnprotected.size() != encryptors.size()) {
throw new IllegalArgumentException();
}
//TODO: determine the actual cek and iv length based on the algo
byte[] cek = CryptoUtils.generateSecureRandomBytes(32);
byte[] iv = CryptoUtils.generateSecureRandomBytes(16);
JweHeaders unionHeaders = new JweHeaders();
-unionHeaders.setProtectedHeaders(protectedHeader);
if (protectedHeader != null) {
unionHeaders.asMap().putAll(protectedHeader.asMap());
}
@@ -91,9 +96,9 @@ public class JweJsonProducer {
for (int i = 0; i encryptors.size(); i++) {
JweEncryptionProvider encryptor = encryptors.get(i);
JweHeaders perRecipientUnprotected =
-recepientUnprotected == null ? null :
cxf git commit: Adding hostname verification tests for http-hc
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a4bd82361 - ec9805a47
Adding hostname verification tests for http-hc
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec9805a4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec9805a4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec9805a4
Branch: refs/heads/3.0.x-fixes
Commit: ec9805a4792c1bdbf486e4ba18acb91046514e4b
Parents: a4bd823
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Feb 11 13:36:08 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Feb 11 13:48:35 2015 +
--
.../http/asyncclient/AsyncHTTPConduit.java | 8 -
.../hostname/HostnameVerificationTest.java | 32
2 files changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec9805a4/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 47bf717..6d9ff3d 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -519,6 +519,8 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
tlsClientParameters = new TLSClientParameters();
}
final SSLContext sslcontext =
getSSLContext(tlsClientParameters);
+final HostnameVerifier verifier =
org.apache.cxf.transport.https.SSLUtils
+.getHostnameVerifier(tlsClientParameters);
regBuilder
.register(https,
new SSLIOSessionStrategy(sslcontext) {
@@ -530,6 +532,10 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
protected void verifySession(final HttpHost
host,
final IOSession
iosession,
final SSLSession
sslsession) throws SSLException {
+if (!verifier.verify(host.getHostName(),
sslsession)) {
+throw new SSLException(Could not
verify host + host.getHostName());
+}
+
iosession.setAttribute(cxf.handshake.done, Boolean.TRUE);
setSSLSession(sslsession);
}
@@ -873,7 +879,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
ctx.init(keyManagers, tlsClientParameters.getTrustManagers(),
tlsClientParameters.getSecureRandom());
-
+
sslContext = ctx;
lastTlsHash = hash;
sslState = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec9805a4/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
index 3769ecb..9ab2752 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.systest.https.hostname;
import java.net.URL;
+import javax.xml.ws.BindingProvider;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -78,6 +80,11 @@ public class HostnameVerificationTest extends
AbstractBusClientServerTestBase {
assertEquals(port.greetMe(Kitty), Hello Kitty);
+// Enable Async
+
((BindingProvider)port).getRequestContext().put(use.async.http.conduit, true);
+
+assertEquals(port.greetMe(Kitty), Hello Kitty);
+
((java.io.Closeable)port).close();
bus.shutdown(true);
}
@@ -107,6 +114,16 @@ public class HostnameVerificationTest extends
AbstractBusClientServerTestBase {
// expected
[2/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/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 98c316c..b303e67 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.15/version
+version2.7.16-SNAPSHOT/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15/version
+version2.7.16-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.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-addr/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-policy/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf.services.wsn/groupId
artifactIdcxf-services-wsn-core/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
/dependencies
/project
http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/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 44215e5..6c0c6d8 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.15/version
+version2.7.16-SNAPSHOT/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/parent
properties
@@ -124,17 +124,17 @@
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/dependency
dependency
groupIdorg.springframework/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/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 ed7dc4f..69c9ff6 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.15/version
+version2.7.16-SNAPSHOT/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15/version
+version2.7.16-SNAPSHOT/version
/parent
properties
cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-frontend-jaxws/artifactId
-
[2/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.15
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/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 00787e2..98c316c 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.15-SNAPSHOT/version
+version2.7.15/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/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.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-addr/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-policy/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf.services.wsn/groupId
artifactIdcxf-services-wsn-core/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
/dependencies
/project
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/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 d5dabe8..44215e5 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.15-SNAPSHOT/version
+version2.7.15/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/parent
properties
@@ -124,17 +124,17 @@
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-frontend-jaxws/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-transports-http-jetty/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/dependency
dependency
groupIdorg.springframework/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/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 0e14193..ed7dc4f 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.15-SNAPSHOT/version
+version2.7.15/version
parent
groupIdorg.apache.cxf.samples/groupId
artifactIdcxf-samples/artifactId
-version2.7.15-SNAPSHOT/version
+version2.7.15/version
/parent
properties
cxf.version${project.version}/cxf.version
@@ -118,23 +118,23 @@
dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-frontend-jaxws/artifactId
-
[1/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.15
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 9272d8985 - 4b006fecc http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/services/ws-discovery/pom.xml -- diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml index a4aba5f..e925e68 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.15-SNAPSHOT/version +version2.7.15/version nameApache CXF WS-Discovery/name urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf.services/groupId artifactIdcxf-services/artifactId -version2.7.15-SNAPSHOT/version +version2.7.15/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/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 569d528..fc9d656 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.15-SNAPSHOT/version +version2.7.15/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.15-SNAPSHOT/version +version2.7.15/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/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 86e85e2..e94c14c 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.15-SNAPSHOT/version +version2.7.15/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.15-SNAPSHOT/version +version2.7.15/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/services/wsn/pom.xml -- diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml index 52419f1..8176c6f 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.15-SNAPSHOT/version +version2.7.15/version nameApache CXF WSN service/name urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf.services/groupId artifactIdcxf-services/artifactId -version2.7.15-SNAPSHOT/version +version2.7.15/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/services/wsn/wsn-api/pom.xml -- diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index 2a9cd03..e5a75c8 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.15-SNAPSHOT/version +version2.7.15/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.15-SNAPSHOT/version +version2.7.15/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/4b006fec/services/wsn/wsn-core/pom.xml -- diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index
[1/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 4b006fecc - 680a90094 http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/services/ws-discovery/pom.xml -- diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml index e925e68..be03249 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.15/version +version2.7.16-SNAPSHOT/version nameApache CXF WS-Discovery/name urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf.services/groupId artifactIdcxf-services/artifactId -version2.7.15/version +version2.7.16-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/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 fc9d656..6c80e9e 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.15/version +version2.7.16-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.15/version +version2.7.16-SNAPSHOT/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/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 e94c14c..2eb0d7c 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.15/version +version2.7.16-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.15/version +version2.7.16-SNAPSHOT/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/services/wsn/pom.xml -- diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml index 8176c6f..01b6f37 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.15/version +version2.7.16-SNAPSHOT/version nameApache CXF WSN service/name urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf.services/groupId artifactIdcxf-services/artifactId -version2.7.15/version +version2.7.16-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/services/wsn/wsn-api/pom.xml -- diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index e5a75c8..32530a7 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.15/version +version2.7.16-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.15/version +version2.7.16-SNAPSHOT/version relativePath../../../parent/pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/cxf/blob/680a9009/services/wsn/wsn-core/pom.xml -- diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index
[3/3] cxf git commit: [maven-release-plugin] prepare release cxf-2.7.15
[maven-release-plugin] prepare release cxf-2.7.15 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4b006fec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b006fec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b006fec Branch: refs/heads/2.7.x-fixes Commit: 4b006fecc58c917b4804bba270f798bef8361ada Parents: 9272d89 Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 16:27:45 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 16:27:45 2015 -0500 -- 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
Repository: cxf Updated Tags: refs/tags/cxf-2.7.15 [created] ad0e985de
[3/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
[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/680a9009 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/680a9009 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/680a9009 Branch: refs/heads/2.7.x-fixes Commit: 680a900946740987f185b003ff91aed6bfcb5788 Parents: 4b006fe Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 16:27:54 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 16:27:54 2015 -0500 -- 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/2] cxf git commit: Update release notes
Update release notes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9272d898 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9272d898 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9272d898 Branch: refs/heads/2.7.x-fixes Commit: 9272d8985a10be799c02b3a9b0af052cf8ea2f0d Parents: 769e4bd Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 16:12:33 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 16:12:33 2015 -0500 -- distribution/src/main/release/release_notes.txt | 85 +--- 1 file changed, 40 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9272d898/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 fb8dc83..2bf28aa 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.14 Release Notes +Apache CXF 2.7.15 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.14 fixes over 35 JIRA issues reported by users and the community. +2.7.15 fixes over 25 JIRA issues reported by users and the community. @@ -72,56 +72,51 @@ for caveats when upgrading from CXF 2.6.x to 2.7.x. 7. Specific issues, features, and improvements fixed in this version - ** Bug -* [CXF-6030] - javax.xml.ws.soap.SOAPFaultException: Fault string, and possibly fault code, not set for cxf. -* [CXF-6034] - Wrong schemaLocation if jax-ws-catalog is used -* [CXF-6038] - Repeatedly invoking setHandlerChain() can cause a build up of handler interceptors on the chain -* [CXF-6041] - Corba Binding is throwing a ObjectNotActive Corba exception being thrown back to application code on endpoint/bus shutdown -* [CXF-6045] - Setting an entity from ClientRequestFilter has no effect if no entity is already set -* [CXF-6055] - WebClient adds Content-Type to GET requests -* [CXF-6057] - WADL to Java code generator does not support the documented encoding flag -* [CXF-6058] - NPE in cxf-rt-transports-http org.apache.cxf.transport.http.Headers line 280 -* [CXF-6059] - wsdl:fault wsdl2java fails with IllegalArgumentException -* [CXF-6061] - The publish attribute on jaxws:endpoint doesn't support placeholder in spring configuration -* [CXF-6067] - ProviderFactory fails to analyze generic types correctly with some class hierachies -* [CXF-6072] - jaxrs securityContext.getUserPrincipal is broken if login is done during the request -* [CXF-6073] - cxf-wsn installation in Karaf fails -* [CXF-6076] - MediaType parameter not parsed correctly -* [CXF-6078] - AnnotationUtils.getAnnotatedMethod for abstract classes not inherit from interface -* [CXF-6080] - Headers.logProtocolHeaders raise NPE on null header value -* [CXF-6089] - XmlAccessorOrder.ALPHABETICAL, Exception.getMessage() duplicate WSDL elements generated -* [CXF-6090] - java.lang.NullPointerException when running wsdl2java -* [CXF-6091] - Server is not properly stopped with MultipleEndpointObserver -* [CXF-6092] - When there is bad connection/timeout, ClientImpl throws NullPointerException -* [CXF-6094] - wsdl2java - Default key managers cannot be initialized -* [CXF-6103] - Nillable field, in a json payload, was sent as @nil:true instead of an empty string -* [CXF-6104] - Support case insensitive mime types -* [CXF-6106] - ClientResponseFilterInterceptor wraps client response exchange message into ClientRequestContextImpl - as a result code can't access client request context -* [CXF-6109] - Incorrect TrustException constructor in AbstractSTSClient -* [CXF-6115] - Transferable.transferTo can cause infinite loop or stack overflow -* [CXF-6118] - Schema Validation refinements -* [CXF-6122] - JAX-RS proxy client with @QueryParam is not encoding the parameter value +* [CXF-6127] - Check thrown Exception's cause for SOAPFaultException +* [CXF-6136] - Change JMS Destination to not rollback on checked exception +* [CXF-6137] - WADL generation does not correctly support query parameters +* [CXF-6138] - JAXB unmarshaller Properties can't be configured +* [CXF-6143] - SSL/TLS hostname verification does not strictly follow HTTPS RFC2818 +* [CXF-6147] - Part of demo wsdl_first_soap12 doesnt work +* [CXF-6151] - Apache-cxf wsdlvalidator returns error in mime:part +* [CXF-6152] - WSDLValidator may throw ClassCastException under verbose mode +*
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 97dc66811 - 9272d8985 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/769e4bde Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/769e4bde Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/769e4bde Branch: refs/heads/2.7.x-fixes Commit: 769e4bdebcc9312e745c7c787e516e6ef2dc4367 Parents: 97dc668 Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 16:11:22 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 16:11:22 2015 -0500 -- .gitmergeinfo | 23 +++ 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/769e4bde/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index c98c94a..a79f745 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -22,6 +22,7 @@ B 013abc6cc200b44a5cb4db78b7ba35295795380a B 0146d65aa1aa2681d358928f8e4ac918bf2b0305 B 0189ff6cbe2be511b1940e4dfa6ab90d92f23113 B 01ad820abd4d4dd172c1c6b19bf5a93f828decfe +B 01c77bd95a0b302b98f5dc8dc649d78d78afb56f B 01c79cfc4f335477d3460729782cc243d6f55196 B 01f06dc19334b42c83efa839643a99c9502b3e5a B 0213b00013706d9e7fa0418a035819ab8e5af5f1 @@ -303,6 +304,7 @@ B 26efeeae05ffd54051458f30583fc516e5712a03 B 271e3bd0e8a1728204e3d8be1f00232cf7c40d66 B 2726988981605b1bf4cb96cfdfcdd8ff57eec6cd B 2727d82a555c5cbc63e57c7c831dfa8500d20b28 +B 272b8533f84653a9da0d462600d64dd3c44829f3 B 2747744322eb4c285ce6ab6d1c8c80a2f4f186d5 B 278e8a9d6fe6979623258be58d1ed2b89edc5da4 B 27bb1f5f1426fc1a6bad091a36cb552a6c095644 @@ -315,6 +317,7 @@ B 2816469014ec116559cd405720271457f13432b9 B 28244858cadc3596f760b37c1e1f9331441364d2 B 28b53b095af7e53e9bf6f4265ca39ff405619eee B 28dc0430fdf141960668570037b862acb1a520e9 +B 28e7c51cfa9e2548600151669f8896af20bce293 B 29186b625df55a641a139310e2133dcceee66f56 B 292bcb08bcb865a21929af20947beab032ff8889 B 2932201285b61c4e267a906485000c00f2edb1ee @@ -366,6 +369,7 @@ B 2f3446fe69f51156b324e081d5f2cb2ba5275069 B 2f747962cc385de426f29544c7625c1565c4a013 B 2fd68d8b34ed0eb1c0a24cab6055497998ca46d7 B 300105443ed39e3bcaf1b2f7ea0062d4e4b21ba6 +B 3013b681ec60e670c5e862d34bb060fc2e3b0732 B 30a6fee4cefe0831c98d569f2eb7e8a3572ff8a8 B 30a9e0570a5c649e25a5212ab075f46c391496a5 B 30ddf1c899a7153a82790f78db3747472563721e @@ -419,6 +423,7 @@ B 374c8ad502993e87763fe6dcef0f132714431d76 B 37a9b1f838670705504221aa0d7bac15957f0529 B 37c01ad36716f51935588b5f3c9a670a1dfff6c7 B 382d6f75aec9c5fd2ba69870bbc1c2916b4a6ceb +B 3832db055cbc8b7341bdb6fe4ba8ef5efb6be105 B 38420ba6ed76fd59da08ac23886dfca5d9dd1c1f B 38670427fe972560402e70037d8f874136e94050 B 38777cce211205f04ce2006373356af9ab96da7e @@ -490,6 +495,7 @@ B 3fae604e2ab638a5fbce479078245c75675b5e72 B 3fc5b8571d2454fc7a93e9a65a09b4c58968e74a B 4008219f8f4052ca1e0a8c904cc89a7dca8032f3 B 405db9402430a6cf81601ae5aed9bfaa8830969e +B 40618c9c7e6b4314279f6582a73bae7b42657b31 B 40a2c68f02fc3f33ab3ca897879c91970382048b B 40a67be30f406ab11f28aefb6636fd8895054b75 B 40b898684f18b5e4f0873d133a9deae618c576fa @@ -554,6 +560,7 @@ B 4765a07b3df5b94859d5be42410957f5231c805d B 47a0908a8a90a00029e859a21feb9fd4b9512563 B 47b80b935f2fa1f70af71ba58baef4e2d9b226a5 B 47d9548557c352b7ddf0468c322678b901d20ab9 +B 48084ffd0625178e758c52ffcf2b695206ef8015 B 48144f06a9779320b7d8537899b2f3b9ecacdb43 B 4843806921c665a3a2fecb5826ae2d20ec563ab2 B 485bbc4a07137ec51faf22ecc32a22b2343d9317 @@ -563,6 +570,7 @@ B 4887c83e4ee7b15cbc2064f81d108b6d7bd9ae7d B 48ac8d63f70a36b5d192648d347dabfd28293ab8 B 48b00b30b712a55a0e7e5348dead3d666f2309d8 B 48bba92a45b9f9df90f4a01507f5497d93604df6 +B 491424b20127a2147aa78c5657ec542fdf786e8b B 49f968cb9aba476220c38e2c6baa7ca00a25dacb B 4a32e60fe9ebeb752a79b3f5dab89baf152d0243 B 4a4f76523dcb32d406a2838fd0162326c6aef8d1 @@ -659,6 +667,7 @@ B 5885d6be3fdb3b9b38a4d9d753e927424f20096c B 588ab66d81542398b1ec54cf30884ce3a3742a29 B 589ee44b9282db826b22a89f005b966bef124694 B 58b7407570c2dc0321ab004e41cfd6dbd461e38d +B 58c15ecdf524bc8818c07c2ffbe0b96d95c209ac B 58f273883d2e605f090626dcabb0c0520d786428 B 592cd43b2bf0a1ae4483a1a72798e4ab238ffa9e B 5934b2e83315c1ccfe1f26d21e3f62d190bab380 @@ -671,6 +680,7 @@ B 5ad015a408a9a04405f25ae45f9f08a250fd4bf4 B 5ae190595f03bab2c9d9e41c7d7d6c4cad59086e B 5ae70f42be238e5c4947d2cefc93dad1773ba0c8 B 5b82381fb9958c43c7b196d514abd3cc3f40a15e +B 5ba12e480ef8e9e09b8e512f53fb0aa603d0ad66 B 5bd695d0df1535a1859a72db1fd85922873f02a4 B 5c6e0e2ba83fa048405f5c2143c064434f4cc203 B 5cc5b0e7efa51cf7f280bf43fafa9f2beea411c5 @@ -697,6 +707,7 @@ B 5f321f0a2c77e84381f3489501bf7c0eee91b5a8 B 5f49a3e06a2745d8bfa554639e8229bd36c8ebf1 B 5f517813253189b1ee2d57be24e0b1a56a1dfce3 B
cxf git commit: Minor update to JAXRS AbstractClient
Repository: cxf
Updated Branches:
refs/heads/master 76e1cd86b - 1b91b6e63
Minor update to JAXRS AbstractClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1b91b6e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1b91b6e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1b91b6e6
Branch: refs/heads/master
Commit: 1b91b6e630bec0980d94bd04b016748af525d9bd
Parents: 76e1cd8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 21:29:48 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 21:29:48 2015 +
--
.../java/org/apache/cxf/jaxrs/client/AbstractClient.java| 4 +---
.../org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 9 -
.../apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1b91b6e6/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index f87498d..62d725b 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
-import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.text.SimpleDateFormat;
@@ -1065,8 +1064,7 @@ public abstract class AbstractClient implements Client {
public void handleMessage(Message message) throws Fault {
Exception ex = message.getContent(Exception.class);
-if (!message.getExchange().isSynchronous()
- ex instanceof ConnectException) {
+if (!message.getExchange().isSynchronous()) {
//TODO: make sure it works with the failover feature
JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
cb.handleException(message, new ProcessingException(ex));
http://git-wip-us.apache.org/repos/asf/cxf/blob/1b91b6e6/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index b3ae13c..5ab42e2 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -133,7 +132,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
@Test
public void testNonExistent() throws Exception {
-String address = http://localhost/bookstore;;
+String address = http://localhostt/bookstore;;
ListObject providers = new ArrayListObject();
providers.add(new TestResponseFilter());
WebClient wc = WebClient.create(address, providers);
@@ -144,14 +143,14 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
} catch (ExecutionException ex) {
Throwable cause = ex.getCause();
assertTrue(cause instanceof ProcessingException);
-assertTrue(ex.getCause().getCause() instanceof ConnectException);
+assertTrue(ex.getCause().getCause() instanceof IOException);
} finally {
wc.close();
}
}
@Test
public void testNonExistentJaxrs20() throws Exception {
-String address = http://localhost/bookstore;;
+String address = http://localhostt/bookstore;;
Client c = ClientBuilder.newClient();
c.register(new TestResponseFilter());
WebTarget t1 = c.target(address);
@@ -162,7 +161,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
} catch (ExecutionException ex) {
Throwable cause = ex.getCause();
assertTrue(cause instanceof ProcessingException);
-assertTrue(ex.getCause().getCause() instanceof ConnectException);
+
[2/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml index 79d39d1..9d3374b 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../relativePath /parent properties @@ -173,38 +173,38 @@ dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-frontend-jaxws/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency !-- Jetty is needed if you're using the CXFServlet -- dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http-jetty/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-rm/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-security/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-addr/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-policy/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.springframework/groupId http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/distribution/src/main/release/samples/ws_security/ut/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/ut/pom.xml b/distribution/src/main/release/samples/ws_security/ut/pom.xml index 5d5c61d..1cd2943 100644 --- a/distribution/src/main/release/samples/ws_security/ut/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../relativePath /parent properties @@ -162,23 +162,23 @@ dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-frontend-jaxws/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency !-- Jetty is needed if you're using the CXFServlet -- dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http-jetty/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-security/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version /dependency dependency groupIdorg.springframework/groupId http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml index c90267f..deac258 100644 --- a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../relativePath /parent build
[2/3] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.4
http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml index ddbf7ef..79d39d1 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../relativePath /parent properties @@ -173,38 +173,38 @@ dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-frontend-jaxws/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency !-- Jetty is needed if you're using the CXFServlet -- dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http-jetty/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-rm/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-security/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-addr/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-policy/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.springframework/groupId http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/distribution/src/main/release/samples/ws_security/ut/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/ut/pom.xml b/distribution/src/main/release/samples/ws_security/ut/pom.xml index 2ca1d15..5d5c61d 100644 --- a/distribution/src/main/release/samples/ws_security/ut/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../relativePath /parent properties @@ -162,23 +162,23 @@ dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-frontend-jaxws/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency !-- Jetty is needed if you're using the CXFServlet -- dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-transports-http-jetty/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.apache.cxf/groupId artifactIdcxf-rt-ws-security/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version /dependency dependency groupIdorg.springframework/groupId http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml -- diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml index 0bc188f..c90267f 100644 --- a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml @@ -25,7 +25,7 @@ parent groupIdorg.apache.cxf.samples/groupId artifactIdcxf-samples/artifactId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../relativePath /parent build
Git Push Summary
Repository: cxf Updated Tags: refs/tags/cxf-3.0.4 [created] 3bbc187f3
[1/3] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.4
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e96857e35 - ccb5aadd3 http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/rs-security/pom.xml -- diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index caf8db3..b5f493b 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/transport-jms/pom.xml -- diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index d9ceee7..e1a65a2 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/transports/pom.xml -- diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index a0be985..4408708 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/uncategorized/pom.xml -- diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index 05c4e7d..dd9104a 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/ws-rm/pom.xml -- diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml index 8294df0..fa1f7bf 100644 --- a/systests/ws-rm/pom.xml +++ b/systests/ws-rm/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/ws-security-examples/pom.xml -- diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml index 0101455..aab4ec9 100644 --- a/systests/ws-security-examples/pom.xml +++ b/systests/ws-security-examples/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/ws-security/pom.xml -- diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml index 666e285..5759c2b 100644 --- a/systests/ws-security/pom.xml +++ b/systests/ws-security/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/ccb5aadd/systests/ws-specs/pom.xml -- diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml index 0b95363..79809dc 100644 --- a/systests/ws-specs/pom.xml +++ b/systests/ws-specs/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4-SNAPSHOT/version +version3.0.4/version relativePath../../parent/pom.xml/relativePath /parent
[3/3] cxf git commit: [maven-release-plugin] prepare release cxf-3.0.4
[maven-release-plugin] prepare release cxf-3.0.4 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ccb5aadd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ccb5aadd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ccb5aadd Branch: refs/heads/3.0.x-fixes Commit: ccb5aadd38ca375fb66086f5909f05f35dcdc18c Parents: e96857e Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 18:29:07 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 18:29:07 2015 -0500 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../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 | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8 .../main/release/samples/wsdl_first_soap12/pom.xml | 8 .../release/samples/wsdl_first_xml_wrapped/pom.xml | 8 .../release/samples/wsdl_first_xmlbeans/pom.xml | 10 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +-
[1/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ccb5aadd3 - 76996bab5 http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/rs-security/pom.xml -- diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index b5f493b..0e3d1ad 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/transport-jms/pom.xml -- diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index e1a65a2..63cda31 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/transports/pom.xml -- diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index 4408708..b20f9a0 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/uncategorized/pom.xml -- diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index dd9104a..69248e9 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/ws-rm/pom.xml -- diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml index fa1f7bf..be2f3b7 100644 --- a/systests/ws-rm/pom.xml +++ b/systests/ws-rm/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/ws-security-examples/pom.xml -- diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml index aab4ec9..3d360ba 100644 --- a/systests/ws-security-examples/pom.xml +++ b/systests/ws-security-examples/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/ws-security/pom.xml -- diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml index 5759c2b..2a23581 100644 --- a/systests/ws-security/pom.xml +++ b/systests/ws-security/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/cxf/blob/76996bab/systests/ws-specs/pom.xml -- diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml index 79809dc..f001d06 100644 --- a/systests/ws-specs/pom.xml +++ b/systests/ws-specs/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.0.4/version +version3.0.5-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent
[3/3] cxf git commit: [maven-release-plugin] prepare for next development iteration
[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/76996bab Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76996bab Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76996bab Branch: refs/heads/3.0.x-fixes Commit: 76996bab569a769217519b1689055037462c3a80 Parents: ccb5aad Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 18:29:20 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 18:29:20 2015 -0500 -- core/pom.xml| 2 +- distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 ++-- .../src/main/release/samples/callback/pom.xml | 8 .../samples/configuration_interceptor/pom.xml | 10 +- .../src/main/release/samples/corba/bank/pom.xml | 8 .../samples/corba/bank_ws_addressing/pom.xml| 8 .../main/release/samples/corba/hello_world/pom.xml | 8 .../release/samples/groovy_spring_support/pom.xml | 8 .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +++--- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../main/release/samples/java_first_pojo/pom.xml| 8 .../samples/java_first_spring_support/pom.xml | 8 .../src/main/release/samples/jax_rs/basic/pom.xml | 8 .../main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml| 10 +- .../release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jms_pubsub/pom.xml | 8 .../src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../main/release/samples/jms_spring_config/pom.xml | 6 +++--- .../samples/js_browser_client_java_first/pom.xml| 10 +- .../samples/js_browser_client_simple/pom.xml| 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml| 8 .../release/samples/logbrowser-blueprint/pom.xml| 2 +- .../src/main/release/samples/logbrowser/pom.xml | 2 +- distribution/src/main/release/samples/mtom/pom.xml | 8 .../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 | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 .../src/main/release/samples/soap_header/pom.xml| 8 distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/ws_addressing/pom.xml | 8 .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml| 2 +- .../main/release/samples/ws_notification/pom.xml| 14 +++--- .../src/main/release/samples/ws_policy/pom.xml | 8 distribution/src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml| 16 .../src/main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 6 +++--- .../samples/wsdl_first_dynamic_client/pom.xml | 8 .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 .../main/release/samples/wsdl_first_rpclit/pom.xml | 8 .../main/release/samples/wsdl_first_soap12/pom.xml | 8 .../release/samples/wsdl_first_xml_wrapped/pom.xml | 8 .../release/samples/wsdl_first_xmlbeans/pom.xml | 10 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +-
cxf git commit: One more minor update to AbstractClient
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ffab0b893 - 8d56c8819
One more minor update to AbstractClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8d56c881
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8d56c881
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8d56c881
Branch: refs/heads/3.0.x-fixes
Commit: 8d56c88199211e4b72faa95f304e7d83433a44c0
Parents: ffab0b8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 21:59:28 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 22:01:41 2015 +
--
.../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8d56c881/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 62d725b..56f6318 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -1064,7 +1064,7 @@ public abstract class AbstractClient implements Client {
public void handleMessage(Message message) throws Fault {
Exception ex = message.getContent(Exception.class);
-if (!message.getExchange().isSynchronous()) {
+if (!message.getExchange().isSynchronous() ex != null) {
//TODO: make sure it works with the failover feature
JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
cb.handleException(message, new ProcessingException(ex));
[2/2] cxf git commit: Update release notes
Update release notes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e96857e3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e96857e3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e96857e3 Branch: refs/heads/3.0.x-fixes Commit: e96857e358f70563a47a9c4c94a41f165b12bb48 Parents: 7ac1b2d Author: Daniel Kulp dk...@apache.org Authored: Wed Feb 11 18:16:42 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 18:16:42 2015 -0500 -- distribution/src/main/release/release_notes.txt | 145 +++ 1 file changed, 81 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e96857e3/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 15aa1a1..658c021 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,8 +1,8 @@ -Apache CXF 3.0.3 Release Notes +Apache CXF 3.0.4 Release Notes 1. Overview -The 3.0.3 version of Apache CXF is a significant new version of CXF +The 3.0.x series of Apache CXF is a significant new version of CXF that provides several new features and enhancements. New features include: @@ -22,7 +22,7 @@ Users are encourage to review the migration guide at: http://cxf.apache.org/docs/30-migration-guide.html for further information and requirements for upgrading from 2.7.x. -3.0.3 fixes over 55 JIRA issues reported by users and the community. +3.0.4 fixes over 70 JIRA issues reported by users and the community. @@ -66,74 +66,91 @@ for caveats when upgrading from CXF 2.7.x to 3.0.0 7. Specific issues, features, and improvements fixed in this version - ** Bug -* [CXF-6030] - javax.xml.ws.soap.SOAPFaultException: Fault string, and possibly fault code, not set for cxf. -* [CXF-6034] - Wrong schemaLocation if jax-ws-catalog is used -* [CXF-6038] - Repeatedly invoking setHandlerChain() can cause a build up of handler interceptors on the chain -* [CXF-6041] - Corba Binding is throwing a ObjectNotActive Corba exception being thrown back to application code on endpoint/bus shutdown -* [CXF-6045] - Setting an entity from ClientRequestFilter has no effect if no entity is already set -* [CXF-6057] - WADL to Java code generator does not support the documented encoding flag -* [CXF-6058] - NPE in cxf-rt-transports-http org.apache.cxf.transport.http.Headers line 280 -* [CXF-6059] - wsdl:fault wsdl2java fails with IllegalArgumentException -* [CXF-6060] - Calling readEntity() on Response created by Response.build() causes NullPointerException -* [CXF-6061] - The publish attribute on jaxws:endpoint doesn't support placeholder in spring configuration -* [CXF-6062] - Interceptors added in Spring Bus configuration are ignored -* [CXF-6066] - JAX-RS 2.0 Client implementation is OOM prone due to its strongly referencing WebTargets -* [CXF-6067] - ProviderFactory fails to analyze generic types correctly with some class hierachies -* [CXF-6071] - CXF's WSDL2Java tool can generate impl classes that jdk compiler will refuse to compile -* [CXF-6072] - jaxrs securityContext.getUserPrincipal is broken if login is done during the request -* [CXF-6073] - cxf-wsn installation in Karaf fails -* [CXF-6075] - NPE may occur at websocket destination under high load -* [CXF-6076] - MediaType parameter not parsed correctly -* [CXF-6077] - In OSGi, the wsdl extensor loaders may not be able to generate their special ExtensibilityELements -* [CXF-6078] - AnnotationUtils.getAnnotatedMethod for abstract classes not inherit from interface -* [CXF-6080] - Headers.logProtocolHeaders raise NPE on null header value -* [CXF-6089] - XmlAccessorOrder.ALPHABETICAL, Exception.getMessage() duplicate WSDL elements generated -* [CXF-6090] - java.lang.NullPointerException when running wsdl2java -* [CXF-6091] - Server is not properly stopped with MultipleEndpointObserver -* [CXF-6092] - When there is bad connection/timeout, ClientImpl throws NullPointerException -* [CXF-6094] - wsdl2java - Default key managers cannot be initialized -* [CXF-6101] - Accept Header not Respected with Response from Custom MessageReader -* [CXF-6103] - Nillable field, in a json payload, was sent as @nil:true instead of an empty string -* [CXF-6104] - Support case insensitive mime types -* [CXF-6105] - CXF 3.x does not use the older WS-SecurityPolicy 1.1 namespace -* [CXF-6106] - ClientResponseFilterInterceptor wraps client response exchange message into ClientRequestContextImpl - as a result
[1/2] cxf git commit: avoid fetching web-app DTDs from java.sun.com in systests/transports
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 8d56c8819 - e96857e35 avoid fetching web-app DTDs from java.sun.com in systests/transports Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7ac1b2df Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7ac1b2df Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7ac1b2df Branch: refs/heads/3.0.x-fixes Commit: 7ac1b2df50d2396c27f05340f7a0ba912a565e18 Parents: 8d56c88 Author: Akitoshi Yoshida a...@apache.org Authored: Tue Feb 10 13:29:51 2015 +0100 Committer: Daniel Kulp dk...@apache.org Committed: Wed Feb 11 18:13:53 2015 -0500 -- systests/transports/pom.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7ac1b2df/systests/transports/pom.xml -- diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index e2b671c..a0be985 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -285,6 +285,12 @@ groupIdorg.apache.geronimo.specs/groupId artifactIdgeronimo-j2ee-connector_1.5_spec/artifactId /dependency +!-- make http://java.sun.com/dtd/web-app_2_3.dtd et al locally available during the tests -- +dependency +groupIdorg.apache.geronimo.specs/groupId +artifactIdgeronimo-servlet_3.0_spec/artifactId +scopetest/scope +/dependency dependency groupIdcom.sun.xml.fastinfoset/groupId artifactIdFastInfoset/artifactId
cxf git commit: Minor update to JAXRS AbstractClient
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes bd9c0fd1d - ffab0b893
Minor update to JAXRS AbstractClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffab0b89
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffab0b89
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffab0b89
Branch: refs/heads/3.0.x-fixes
Commit: ffab0b89327c381a539dc2618ee850135c99d9aa
Parents: bd9c0fd
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 21:29:48 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 21:39:17 2015 +
--
.../apache/cxf/jaxrs/client/AbstractClient.java | 4 +--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 9 +++
.../jaxrs/JAXRSClientServerBookTest.java| 26
3 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffab0b89/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index f87498d..62d725b 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
-import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.text.SimpleDateFormat;
@@ -1065,8 +1064,7 @@ public abstract class AbstractClient implements Client {
public void handleMessage(Message message) throws Fault {
Exception ex = message.getContent(Exception.class);
-if (!message.getExchange().isSynchronous()
- ex instanceof ConnectException) {
+if (!message.getExchange().isSynchronous()) {
//TODO: make sure it works with the failover feature
JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
cb.handleException(message, new ProcessingException(ex));
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffab0b89/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index b671056..4cf617e 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -134,7 +133,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
@Test
public void testNonExistent() throws Exception {
-String address = http://localhost/bookstore;;
+String address = http://localhostt/bookstore;;
ListObject providers = new ArrayListObject();
providers.add(new TestResponseFilter());
WebClient wc = WebClient.create(address, providers);
@@ -145,14 +144,14 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
} catch (ExecutionException ex) {
Throwable cause = ex.getCause();
assertTrue(cause instanceof ProcessingException);
-assertTrue(ex.getCause().getCause() instanceof ConnectException);
+assertTrue(ex.getCause().getCause() instanceof IOException);
} finally {
wc.close();
}
}
@Test
public void testNonExistentJaxrs20() throws Exception {
-String address = http://localhost/bookstore;;
+String address = http://localhostt/bookstore;;
Client c = ClientBuilder.newClient();
c.register(new TestResponseFilter());
WebTarget t1 = c.target(address);
@@ -163,7 +162,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
} catch (ExecutionException ex) {
Throwable cause = ex.getCause();
assertTrue(cause instanceof ProcessingException);
-assertTrue(ex.getCause().getCause() instanceof ConnectException);
+
cxf git commit: One more minor update to AbstractClient
Repository: cxf
Updated Branches:
refs/heads/master 1b91b6e63 - 74bff9b1d
One more minor update to AbstractClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74bff9b1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/74bff9b1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/74bff9b1
Branch: refs/heads/master
Commit: 74bff9b1dd1eea96a02ce11e2d32efaed0d7cd65
Parents: 1b91b6e
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 21:59:28 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 21:59:28 2015 +
--
.../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/74bff9b1/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 62d725b..56f6318 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -1064,7 +1064,7 @@ public abstract class AbstractClient implements Client {
public void handleMessage(Message message) throws Fault {
Exception ex = message.getContent(Exception.class);
-if (!message.getExchange().isSynchronous()) {
+if (!message.getExchange().isSynchronous() ex != null) {
//TODO: make sure it works with the failover feature
JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
cb.handleException(message, new ProcessingException(ex));
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.0.5 (Java 1.6.0_65; Mac OS X 10.10.2)""userId" = "dkulp""ip" = "66.30.110.50"Details:The orgapachecxf-1035 staging repository has been dropped.Action performed by Daniel Kulp (dkulp)
cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes a94b303ed - 3832db055
CXF-6132: Provide JAX-RS ServletContextInitializer. Initial implementation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3832db05
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3832db05
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3832db05
Branch: refs/heads/3.0.x-fixes
Commit: 3832db055cbc8b7341bdb6fe4ba8ef5efb6be105
Parents: a94b303
Author: reta drr...@gmail.com
Authored: Mon Jan 26 20:58:01 2015 -0500
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:24:26 2015 +
--
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +-
rt/pom.xml | 1 +
.../javax.servlet.ServletContainerInitializer | 1 +
rt/rs/http-sci/pom.xml | 59 +
.../JaxrsServletContainerInitializer.java | 89
5 files changed, 151 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index db9ff27..8329de5 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -514,7 +514,7 @@ public class CXFNonSpringJaxrsServlet extends
CXFNonSpringServlet {
protected boolean isIgnoreApplicationPath(ServletConfig servletConfig) {
String ignoreParam =
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
-return ignoreParam == null || MessageUtils.isTrue(ignoreParam);
+return ignoreParam != null MessageUtils.isTrue(ignoreParam);
}
protected void createServerFromApplication(ServletConfig servletConfig)
http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/pom.xml
--
diff --git a/rt/pom.xml b/rt/pom.xml
index 11c71c5..d25cb57 100644
--- a/rt/pom.xml
+++ b/rt/pom.xml
@@ -58,6 +58,7 @@
modulews/mex/module
modulews/eventing/module
modulers/client/module
+modulers/http-sci/module
modulers/description/module
modulers/extensions/providers/module
modulers/extensions/search/module
http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
--
diff --git
a/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
new file mode 100644
index 000..3d22cbc
--- /dev/null
+++
b/rt/rs/http-sci/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -0,0 +1 @@
+org.apache.cxf.jaxrs.servlet.JaxrsServletContainerInitializer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/3832db05/rt/rs/http-sci/pom.xml
--
diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml
new file mode 100644
index 000..9886ed4
--- /dev/null
+++ b/rt/rs/http-sci/pom.xml
@@ -0,0 +1,59 @@
+?xml version=1.0?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ License); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+modelVersion4.0.0/modelVersion
+artifactIdcxf-rt-rs-http-sci/artifactId
+packagingbundle/packaging
+nameApache CXF JAX-RS Service
cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Adding more @HandlesTypes classes.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 3832db055 - 8a06e66a3
CXF-6132: Provide JAX-RS ServletContextInitializer. Adding more @HandlesTypes
classes.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8a06e66a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8a06e66a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8a06e66a
Branch: refs/heads/3.0.x-fixes
Commit: 8a06e66a346c974b73bc07f9eca3c7fcd8ac8df3
Parents: 3832db0
Author: reta drr...@gmail.com
Authored: Tue Jan 27 19:58:52 2015 -0500
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:25:57 2015 +
--
.../JaxrsServletContainerInitializer.java | 59 ++--
1 file changed, 43 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a06e66a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index 7be0198..4eb3575 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -18,10 +18,10 @@
*/
package org.apache.cxf.jaxrs.servlet;
-import java.io.IOException;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
@@ -36,11 +36,16 @@ import javax.ws.rs.core.Application;
import javax.ws.rs.ext.Provider;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.ClasspathScanner;
-@HandlesTypes(Application.class)
-public class JaxrsServletContainerInitializer implements
ServletContainerInitializer {
+@HandlesTypes({ Application.class, Provider.class, Path.class })
+public class JaxrsServletContainerInitializer implements
ServletContainerInitializer {
private static final Logger LOG =
LogUtils.getL7dLogger(JaxrsServletContainerInitializer.class);
+private static final String IGNORE_PACKAGE = org.apache.cxf;
+
+private static final String IGNORE_APP_PATH_PARAM =
jaxrs.application.address.ignore;
+private static final String SERVICE_CLASSES_PARAM = jaxrs.serviceClasses;
+private static final String PROVIDERS_PARAM = jaxrs.providers;
+private static final String JAXRS_APPLICATION_PARAM =
javax.ws.rs.Application;
@Override
public void onStartup(final Set Class ? classes, final
ServletContext ctx) throws ServletException {
@@ -49,19 +54,41 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
final Class ? application = findCandidate(classes);
if (application != null) {
-servlet.setInitParameter(javax.ws.rs.Application,
application.getName());
+servlet.setInitParameter(JAXRS_APPLICATION_PARAM,
application.getName());
+servlet.setInitParameter(IGNORE_APP_PATH_PARAM, false);
} else {
-try {
-final Map Class ? extends Annotation , Collection Class ?
providersAndResources =
-
ClasspathScanner.findClasses(Arrays.asList(ClasspathScanner.WILDCARD),
-Arrays.asList(Provider.class, Path.class));
-
-servlet.setInitParameter(jaxrs.providers,
getClassNames(providersAndResources.get(Provider.class)));
-servlet.setInitParameter(jaxrs.serviceClasses,
getClassNames(providersAndResources.get(Path.class)));
-} catch (final ClassNotFoundException | IOException ex) {
-throw new ServletException(Unabled to perform classpath
scan, ex);
+final Map Class ? extends Annotation , Collection Class ?
providersAndResources =
+groupByAnnotations(classes);
+
+servlet.setInitParameter(PROVIDERS_PARAM,
getClassNames(providersAndResources.get(Provider.class)));
+servlet.setInitParameter(SERVICE_CLASSES_PARAM,
getClassNames(providersAndResources.get(Path.class)));
+}
+}
+
+private Map Class ? extends Annotation , Collection Class ?
groupByAnnotations(
+final Set Class ? classes) {
+
+final Map Class ? extends Annotation , Collection Class ?
grouped =
+new HashMap Class ? extends Annotation , Collection Class ?
();
+
+
cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Adding Jetty-based test cases. Minor fixes.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 94fd3cfdf - bb7d0d8ce
CXF-6132: Provide JAX-RS ServletContextInitializer. Adding Jetty-based test
cases. Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb7d0d8c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb7d0d8c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb7d0d8c
Branch: refs/heads/3.0.x-fixes
Commit: bb7d0d8ce35c3c021f3e1a6efba2e03360428d79
Parents: 94fd3cf
Author: reta drr...@gmail.com
Authored: Mon Feb 2 19:39:16 2015 -0500
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:27:56 2015 +
--
.../JaxrsServletContainerInitializer.java | 5 +-
systests/pom.xml| 1 +
systests/rs-http-sci/pom.xml| 156 +++
.../cxf/jaxrs/servlet/AbstractSciTest.java | 61
.../servlet/jetty/AbstractJettyServer.java | 84 ++
.../servlet/jetty/JettyNoApplicationTest.java | 68
.../JettySingleApplicationOnlyClassesTest.java | 60 +++
...ettySingleApplicationOnlySingletonsTest.java | 60 +++
.../jetty/JettySingleApplicationTest.java | 60 +++
.../applications/classes/BookApplication.java | 40 +
.../applications/complete/BookApplication.java | 44 ++
.../singletons/BookApplication.java | 39 +
.../java/org/apache/demo/resources/Book.java| 52 +++
.../org/apache/demo/resources/BookStore.java| 35 +
.../javax.servlet.ServletContainerInitializer | 1 +
.../src/test/resources/WEB-INF/web.xml | 10 ++
16 files changed, 774 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb7d0d8c/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index 4f7f42b..89c6b39 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -45,6 +45,7 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
private static final Logger LOG =
LogUtils.getL7dLogger(JaxrsServletContainerInitializer.class);
private static final String IGNORE_PACKAGE = org.apache.cxf;
+private static final String JAXRS_APPLICATION_SERVLET_NAME =
javax.ws.rs.core.Application;
private static final String JAXRS_APPLICATION_PARAM =
javax.ws.rs.Application;
private static final String CXF_JAXRS_APPLICATION_PARAM =
jaxrs.application;
private static final String CXF_JAXRS_CLASSES_PARAM = jaxrs.classes;
@@ -93,10 +94,10 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
|| !providersAndResources.get(Provider.class).isEmpty()) {
if (app == null) {
// Servlet name is a JAX-RS Application class name
-servletName = JAXRS_APPLICATION_PARAM;
+servletName = JAXRS_APPLICATION_SERVLET_NAME;
// Servlet mapping is obtained from a servlet registration
// with a JAX-RS Application class name
-servletMapping = getServletMapping(ctx,
JAXRS_APPLICATION_PARAM);
+servletMapping = getServletMapping(ctx, servletName);
}
app = new Application() {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb7d0d8c/systests/pom.xml
--
diff --git a/systests/pom.xml b/systests/pom.xml
index 56a94c3..6113fc0 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -46,6 +46,7 @@
modulers-security/module
modulewsdl_maven/module
modulecdi/module
+modulers-http-sci/module
/modules
profiles
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb7d0d8c/systests/rs-http-sci/pom.xml
--
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
new file mode 100644
index 000..1214d41
--- /dev/null
+++ b/systests/rs-http-sci/pom.xml
@@ -0,0 +1,156 @@
+?xml version=1.0?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright
cxf git commit: [CXF-6252] Adding one more test
Repository: cxf
Updated Branches:
refs/heads/master 1d07267bc - 52598eb9b
[CXF-6252] Adding one more test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/52598eb9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/52598eb9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/52598eb9
Branch: refs/heads/master
Commit: 52598eb9b31ea7dfc7b4b87048e4ded459fbeb87
Parents: 1d07267
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 10:00:58 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:00:58 2015 +
--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 21
1 file changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/52598eb9/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index fe9a81b..b3ae13c 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -33,12 +33,15 @@ import java.util.concurrent.Future;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -146,6 +149,24 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
}
+@Test
+public void testNonExistentJaxrs20() throws Exception {
+String address = http://localhost/bookstore;;
+Client c = ClientBuilder.newClient();
+c.register(new TestResponseFilter());
+WebTarget t1 = c.target(address);
+FutureResponse future = t1.request().async().get();
+try {
+future.get();
+fail(Exception expected);
+} catch (ExecutionException ex) {
+Throwable cause = ex.getCause();
+assertTrue(cause instanceof ProcessingException);
+assertTrue(ex.getCause().getCause() instanceof ConnectException);
+} finally {
+c.close();
+}
+}
@Test
public void testPostBookProcessingException() throws Exception {
cxf git commit: [CXF-6252] Adding one more test
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 28e7c51cf - a94b303ed
[CXF-6252] Adding one more test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a94b303e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a94b303e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a94b303e
Branch: refs/heads/3.0.x-fixes
Commit: a94b303ed95772b5bb49d2d04511bc02c576e2c8
Parents: 28e7c51
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 10:00:58 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:12:12 2015 +
--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 35
1 file changed, 35 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a94b303e/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index b46d054..b671056 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -32,9 +33,15 @@ import java.util.concurrent.Future;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -143,6 +150,24 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
}
+@Test
+public void testNonExistentJaxrs20() throws Exception {
+String address = http://localhost/bookstore;;
+Client c = ClientBuilder.newClient();
+c.register(new TestResponseFilter());
+WebTarget t1 = c.target(address);
+FutureResponse future = t1.request().async().get();
+try {
+future.get();
+fail(Exception expected);
+} catch (ExecutionException ex) {
+Throwable cause = ex.getCause();
+assertTrue(cause instanceof ProcessingException);
+assertTrue(ex.getCause().getCause() instanceof ConnectException);
+} finally {
+c.close();
+}
+}
@Test
public void testPostBookProcessingException() throws Exception {
@@ -250,4 +275,14 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
+public static class TestResponseFilter implements ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext requestContext,
ClientResponseContext responseContext)
+throws IOException {
+// TODO Auto-generated method stub
+
+}
+
+}
}
cxf git commit: [CXF-6132] More changes to JaxrsServletContainerInitializer
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 8a06e66a3 - 94fd3cfdf
[CXF-6132] More changes to JaxrsServletContainerInitializer
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/94fd3cfd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/94fd3cfd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/94fd3cfd
Branch: refs/heads/3.0.x-fixes
Commit: 94fd3cfdf6c6896482ae48a8e90006f214967fa3
Parents: 8a06e66
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Jan 28 13:32:51 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:26:55 2015 +
--
.../JaxrsServletContainerInitializer.java | 125 +++
1 file changed, 99 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/94fd3cfd/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index 4eb3575..4f7f42b 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -22,6 +22,7 @@ import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
@@ -29,8 +30,10 @@ import java.util.logging.Logger;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
import javax.servlet.ServletRegistration.Dynamic;
import javax.servlet.annotation.HandlesTypes;
+import javax.ws.rs.ApplicationPath;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
import javax.ws.rs.ext.Provider;
@@ -42,29 +45,111 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
private static final Logger LOG =
LogUtils.getL7dLogger(JaxrsServletContainerInitializer.class);
private static final String IGNORE_PACKAGE = org.apache.cxf;
-private static final String IGNORE_APP_PATH_PARAM =
jaxrs.application.address.ignore;
-private static final String SERVICE_CLASSES_PARAM = jaxrs.serviceClasses;
-private static final String PROVIDERS_PARAM = jaxrs.providers;
private static final String JAXRS_APPLICATION_PARAM =
javax.ws.rs.Application;
-
+private static final String CXF_JAXRS_APPLICATION_PARAM =
jaxrs.application;
+private static final String CXF_JAXRS_CLASSES_PARAM = jaxrs.classes;
+
@Override
public void onStartup(final Set Class ? classes, final
ServletContext ctx) throws ServletException {
-final Dynamic servlet = ctx.addServlet(CXFServlet,
CXFNonSpringJaxrsServlet.class);
-servlet.addMapping(/*);
+Application app = null;
+String servletName = null;
+String servletMapping = null;
-final Class ? application = findCandidate(classes);
-if (application != null) {
-servlet.setInitParameter(JAXRS_APPLICATION_PARAM,
application.getName());
-servlet.setInitParameter(IGNORE_APP_PATH_PARAM, false);
-} else {
+final Class ? appClass = findCandidate(classes);
+if (appClass != null) {
+// The best effort at detecting a CXFNonSpringJaxrsServlet
handling this application.
+// Custom servlets using non-standard mechanisms to create
Application will not be detected
+if (isApplicationServletAvailable(ctx, appClass)) {
+return;
+}
+try {
+app = (Application)appClass.newInstance();
+} catch (Throwable t) {
+throw new ServletException(t);
+}
+// Servlet name is the application class name
+servletName = appClass.getName();
+ApplicationPath appPath =
appClass.getAnnotation(ApplicationPath.class);
+// If ApplicationPath is available - use its value as a mapping
otherwise get it from
+// a servlet registration with an application implementation class
name
+if (appPath != null) {
+servletMapping = appPath.value() + /*;
+} else {
+servletMapping = getServletMapping(ctx, servletName);
+}
+}
+// If application is null or empty then try to create a new
cxf git commit: CXF-6132: Provide JAX-RS ServletContextInitializer. Adding more test cases.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes bb7d0d8ce - 8e5bae551
CXF-6132: Provide JAX-RS ServletContextInitializer. Adding more test cases.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e5bae55
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e5bae55
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e5bae55
Branch: refs/heads/3.0.x-fixes
Commit: 8e5bae551334d9af2d28f11b336b24ceea6b5fe5
Parents: bb7d0d8
Author: reta drr...@gmail.com
Authored: Wed Feb 4 22:04:12 2015 -0500
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:29:03 2015 +
--
.../JaxrsServletContainerInitializer.java | 5 +-
.../jetty/JettyEmptyApplicationTest.java| 64 ++
.../jetty/JettyEmptyPathApplicationTest.java| 71
.../applications/empty/BookApplication.java | 26 +++
.../applications/emptypath/BookApplication.java | 24 +++
.../src/test/resources/WEB-INF/web-subclass.xml | 10 +++
6 files changed, 198 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e5bae55/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index 89c6b39..c872926 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -82,7 +82,7 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
// If application is null or empty then try to create a new
application from available
// resource and provider classes
if (app == null
-|| app.getClasses().isEmpty() app.getSingletons().isEmpty()) {
+|| (app.getClasses().isEmpty() app.getSingletons().isEmpty())) {
// The best effort at detecting a CXFNonSpringJaxrsServlet
// Custom servlets using non-standard mechanisms to create
Application will not be detected
if (isCxfServletAvailable(ctx)) {
@@ -98,7 +98,8 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
// Servlet mapping is obtained from a servlet registration
// with a JAX-RS Application class name
servletMapping = getServletMapping(ctx, servletName);
-}
+}
+
app = new Application() {
@Override
public SetClass? getClasses() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e5bae55/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
--
diff --git
a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
new file mode 100644
index 000..af8a5be
--- /dev/null
+++
b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
@@ -0,0 +1,64 @@
+/**
+ * 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.jaxrs.servlet.jetty;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.jaxrs.servlet.AbstractSciTest;
+import org.eclipse.jetty.util.resource.Resource;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+
+public class JettyEmptyApplicationTest extends AbstractSciTest {
+@Ignore
+public static class EmbeddedJettyServer extends
cxf git commit: Minor fixes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 8e5bae551 - 40618c9c7
Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40618c9c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40618c9c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40618c9c
Branch: refs/heads/3.0.x-fixes
Commit: 40618c9c7e6b4314279f6582a73bae7b42657b31
Parents: 8e5bae5
Author: reta drr...@gmail.com
Authored: Mon Feb 9 19:01:09 2015 -0500
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 10:43:30 2015 +
--
.../JaxrsServletContainerInitializer.java | 22
systests/rs-http-sci/pom.xml| 13 ++--
2 files changed, 15 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index c872926..18473f2 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -161,11 +161,13 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
grouped.put(Provider.class, new ArrayList Class ? ());
grouped.put(Path.class, new ArrayList Class ? ());
-for (final Class ? clazz: classes) {
-if (!classShouldBeIgnored(clazz)) {
-for (final Class ? extends Annotation annotation:
grouped.keySet()) {
-if (clazz.isAnnotationPresent(annotation)) {
-grouped.get(annotation).add(clazz);
+if (classes != null) {
+for (final Class ? clazz: classes) {
+if (!classShouldBeIgnored(clazz)) {
+for (final Class ? extends Annotation annotation:
grouped.keySet()) {
+if (clazz.isAnnotationPresent(annotation)) {
+grouped.get(annotation).add(clazz);
+}
}
}
}
@@ -179,10 +181,12 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
}
private static Class ? findCandidate(final Set Class ? classes) {
-for (final Class ? clazz: classes) {
-if (Application.class.isAssignableFrom(clazz)
!classShouldBeIgnored(clazz)) {
-LOG.fine(Found JAX-RS application to initialize: +
clazz.getName());
-return clazz;
+if (classes != null) {
+for (final Class ? clazz: classes) {
+if (Application.class.isAssignableFrom(clazz)
!classShouldBeIgnored(clazz)) {
+LOG.fine(Found JAX-RS application to initialize: +
clazz.getName());
+return clazz;
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/systests/rs-http-sci/pom.xml
--
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index 1214d41..b0644bf 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -34,6 +34,7 @@
cxf.surefire.fork.vmargs-XX:MaxPermSize=192m/cxf.surefire.fork.vmargs
cxf.server.launcher.vmargs-XX:MaxPermSize=192m/cxf.server.launcher.vmargs
cxf.tomcat.version7.0.52/cxf.tomcat.version
+cxf.jetty.version9.2.3.v20140905/cxf.jetty.version
/properties
dependencies
dependency
@@ -114,17 +115,7 @@
groupIdorg.apache.httpcomponents/groupId
artifactIdhttpclient/artifactId
scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.tomcat.embed/groupId
-artifactIdtomcat-embed-core/artifactId
-version${cxf.tomcat.version}/version
-/dependency
-dependency
-groupIdorg.apache.tomcat.embed/groupId
-artifactIdtomcat-embed-logging-juli/artifactId
-version${cxf.tomcat.version}/version
-/dependency
+/dependency
dependency
groupIdcom.ning/groupId
artifactIdasync-http-client/artifactId
cxf git commit: [CXF-6253]Upgrade async-http-client to latest 1.9.8 instead of the 1.9.0
Repository: cxf Updated Branches: refs/heads/master 431ade6fe - 1d07267bc [CXF-6253]Upgrade async-http-client to latest 1.9.8 instead of the 1.9.0 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1d07267b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1d07267b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1d07267b Branch: refs/heads/master Commit: 1d07267bc4464e50dc9b5e81606958e3252873cd Parents: 431ade6 Author: Freeman Fang freeman.f...@gmail.com Authored: Wed Feb 11 15:59:18 2015 +0800 Committer: Freeman Fang freeman.f...@gmail.com Committed: Wed Feb 11 15:59:18 2015 +0800 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/1d07267b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4e86697..04b7b6e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,7 +69,7 @@ !-- please maintain alphabetical order here -- cxf.abdera.version1.1.3/cxf.abdera.version cxf.activemq.version5.10.0/cxf.activemq.version -cxf.ahc.version1.9.0/cxf.ahc.version +cxf.ahc.version1.9.8/cxf.ahc.version cxf.apacheds.version2.0.0-M19/cxf.apacheds.version cxf.atmosphere.version2.2.5/cxf.atmosphere.version cxf.atmosphere.version.range[2.0,3.0)/cxf.atmosphere.version.range
cxf git commit: Updating rs-http-sc parent versions
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 40618c9c7 - 6c59df946 Updating rs-http-sc parent versions Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c59df94 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c59df94 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c59df94 Branch: refs/heads/3.0.x-fixes Commit: 6c59df94605a89a0c1fe714ab6b41f4d35abc065 Parents: 40618c9 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Feb 11 11:02:05 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Feb 11 11:02:05 2015 + -- rt/rs/http-sci/pom.xml | 2 +- systests/rs-http-sci/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/6c59df94/rt/rs/http-sci/pom.xml -- diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml index 9886ed4..b144c3b 100644 --- a/rt/rs/http-sci/pom.xml +++ b/rt/rs/http-sci/pom.xml @@ -27,7 +27,7 @@ parent groupIdorg.apache.cxf/groupId artifactIdcxf-parent/artifactId -version3.1.0-SNAPSHOT/version +version3.0.4-SNAPSHOT/version relativePath../../../parent/pom.xml/relativePath /parent properties http://git-wip-us.apache.org/repos/asf/cxf/blob/6c59df94/systests/rs-http-sci/pom.xml -- diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml index b0644bf..2c7ce89 100644 --- a/systests/rs-http-sci/pom.xml +++ b/systests/rs-http-sci/pom.xml @@ -21,7 +21,7 @@ parent artifactIdcxf-parent/artifactId groupIdorg.apache.cxf/groupId -version3.1.0-SNAPSHOT/version +version3.0.4-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion
cxf git commit: [CXF-6132] Updating the module description
Repository: cxf Updated Branches: refs/heads/master 52598eb9b - 41a5659e8 [CXF-6132] Updating the module description Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41a5659e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41a5659e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41a5659e Branch: refs/heads/master Commit: 41a5659e89f8e43c4ccae855ac2dd94d80d17475 Parents: 52598eb Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Feb 11 11:06:48 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Feb 11 11:06:48 2015 + -- rt/rs/http-sci/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/41a5659e/rt/rs/http-sci/pom.xml -- diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml index 9886ed4..8910538 100644 --- a/rt/rs/http-sci/pom.xml +++ b/rt/rs/http-sci/pom.xml @@ -21,8 +21,8 @@ modelVersion4.0.0/modelVersion artifactIdcxf-rt-rs-http-sci/artifactId packagingbundle/packaging -nameApache CXF JAX-RS Service Description/name -descriptionApache CXF JAX-RS Service Description/description +nameApache CXF JAX-RS Servlet Container Initializer/name +descriptionApache CXF JAX-RS Servlet Container Initializer/description urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf/groupId
cxf git commit: [CXF-6132] Updating the module description
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 6c59df946 - 7aa84abd4 [CXF-6132] Updating the module description Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7aa84abd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7aa84abd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7aa84abd Branch: refs/heads/3.0.x-fixes Commit: 7aa84abd4385996d32f0c5cd945843c7ca1e35c6 Parents: 6c59df9 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Feb 11 11:06:48 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Feb 11 11:08:06 2015 + -- rt/rs/http-sci/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7aa84abd/rt/rs/http-sci/pom.xml -- diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml index b144c3b..f8814a4 100644 --- a/rt/rs/http-sci/pom.xml +++ b/rt/rs/http-sci/pom.xml @@ -21,8 +21,8 @@ modelVersion4.0.0/modelVersion artifactIdcxf-rt-rs-http-sci/artifactId packagingbundle/packaging -nameApache CXF JAX-RS Service Description/name -descriptionApache CXF JAX-RS Service Description/description +nameApache CXF JAX-RS Servlet Container Initializer/name +descriptionApache CXF JAX-RS Servlet Container Initializer/description urlhttp://cxf.apache.org/url parent groupIdorg.apache.cxf/groupId
cxf git commit: [CXF-6132] Updating CXFNonSpringJaxrsServlet on 3.0.x to be in sync with the master
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 7aa84abd4 - c15bc1bba
[CXF-6132] Updating CXFNonSpringJaxrsServlet on 3.0.x to be in sync with the
master
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c15bc1bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c15bc1bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c15bc1bb
Branch: refs/heads/3.0.x-fixes
Commit: c15bc1bba2de108dd543365af33a9f4b59a0339e
Parents: 7aa84ab
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 12:23:16 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 12:23:16 2015 +
--
.../org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c15bc1bb/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index 8329de5..db9ff27 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -514,7 +514,7 @@ public class CXFNonSpringJaxrsServlet extends
CXFNonSpringServlet {
protected boolean isIgnoreApplicationPath(ServletConfig servletConfig) {
String ignoreParam =
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
-return ignoreParam != null MessageUtils.isTrue(ignoreParam);
+return ignoreParam == null || MessageUtils.isTrue(ignoreParam);
}
protected void createServerFromApplication(ServletConfig servletConfig)
cxf git commit: Avoiding setting a wildcard if AsyncConduit is used
Repository: cxf
Updated Branches:
refs/heads/master 41a5659e8 - 46f271b69
Avoiding setting a wildcard if AsyncConduit is used
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46f271b6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46f271b6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46f271b6
Branch: refs/heads/master
Commit: 46f271b6977bac1fde92647aab51f3aa6a9f11f2
Parents: 41a5659
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 13:15:43 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 13:15:43 2015 +
--
.../java/org/apache/cxf/transport/http/Headers.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/46f271b6/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 83f31e1..5507f40 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -68,6 +68,7 @@ public class Headers {
public static final String HTTP_HEADERS_SETCOOKIE = Set-Cookie;
public static final String HTTP_HEADERS_LINK = Link;
public static final String EMPTY_REQUEST_PROPERTY =
org.apache.cxf.empty.request;
+private static final String USE_ASYNC_PROPERTY = use.async.http.conduit;
private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone(GMT);
private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
@@ -298,10 +299,13 @@ public class Headers {
*/
public void setProtocolHeadersInConnection(HttpURLConnection connection)
throws IOException {
boolean emptyRequest =
PropertyUtils.isTrue(message.get(EMPTY_REQUEST_PROPERTY));
-// Apparently HttpUrlConnection sets a form Content-Type
-// if no Content-Type is set even for empty requests
-String ct = emptyRequest ? */* : determineContentType();
-connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+// HttpUrlConnection sets a form Content-Type and completely loses
custom Accept
+// if HTTP proxies are used if no Content-Type is set for empty
requests
+boolean asyncConduitUsed =
PropertyUtils.isTrue(message.get(USE_ASYNC_PROPERTY));
+if (!asyncConduitUsed || !emptyRequest) {
+String ct = emptyRequest ? */* : determineContentType();
+connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+}
transferProtocolHeadersToURLConnection(connection);
logProtocolHeaders(Level.FINE);
cxf git commit: Avoiding setting a wildcard if AsyncConduit is used
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 5fffe1882 - 5ba12e480
Avoiding setting a wildcard if AsyncConduit is used
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ba12e48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ba12e48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ba12e48
Branch: refs/heads/3.0.x-fixes
Commit: 5ba12e480ef8e9e09b8e512f53fb0aa603d0ad66
Parents: 5fffe18
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Feb 11 13:15:43 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Feb 11 13:16:46 2015 +
--
.../java/org/apache/cxf/transport/http/Headers.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ba12e48/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 83f31e1..5507f40 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -68,6 +68,7 @@ public class Headers {
public static final String HTTP_HEADERS_SETCOOKIE = Set-Cookie;
public static final String HTTP_HEADERS_LINK = Link;
public static final String EMPTY_REQUEST_PROPERTY =
org.apache.cxf.empty.request;
+private static final String USE_ASYNC_PROPERTY = use.async.http.conduit;
private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone(GMT);
private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
@@ -298,10 +299,13 @@ public class Headers {
*/
public void setProtocolHeadersInConnection(HttpURLConnection connection)
throws IOException {
boolean emptyRequest =
PropertyUtils.isTrue(message.get(EMPTY_REQUEST_PROPERTY));
-// Apparently HttpUrlConnection sets a form Content-Type
-// if no Content-Type is set even for empty requests
-String ct = emptyRequest ? */* : determineContentType();
-connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+// HttpUrlConnection sets a form Content-Type and completely loses
custom Accept
+// if HTTP proxies are used if no Content-Type is set for empty
requests
+boolean asyncConduitUsed =
PropertyUtils.isTrue(message.get(USE_ASYNC_PROPERTY));
+if (!asyncConduitUsed || !emptyRequest) {
+String ct = emptyRequest ? */* : determineContentType();
+connection.setRequestProperty(HttpHeaderHelper.CONTENT_TYPE, ct);
+}
transferProtocolHeadersToURLConnection(connection);
logProtocolHeaders(Level.FINE);
cxf git commit: Few minor improvements
Repository: cxf
Updated Branches:
refs/heads/master 46f271b69 - 71a1d1425
Few minor improvements
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71a1d142
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71a1d142
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71a1d142
Branch: refs/heads/master
Commit: 71a1d1425c7cbfb6d410e6655f3579131d1fab3e
Parents: 46f271b
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Feb 11 14:27:14 2015 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Feb 11 14:28:37 2015 +0100
--
.../org/apache/cxf/transport/AbstractObservable.java | 11 +--
.../cxf/jaxws/handler/AnnotationHandlerChainBuilder.java | 8 +---
.../main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 5 +++--
3 files changed, 17 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/71a1d142/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
--
diff --git
a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
index fdda914..35a2f16 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
@@ -19,6 +19,7 @@
package org.apache.cxf.transport;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
@@ -43,7 +44,10 @@ public abstract class AbstractObservable implements
Observable {
// the observer switch must take place before activation or after
deactivation
if (observer != null) {
incomingObserver = observer;
-getLogger().fine(registering incoming observer: + observer);
+final Logger logger = getLogger();
+if (logger.isLoggable(Level.FINE)) {
+logger.fine(registering incoming observer: + observer);
+}
if (old == null) {
try {
activate();
@@ -54,7 +58,10 @@ public abstract class AbstractObservable implements
Observable {
}
} else {
if (old != null) {
-getLogger().fine(unregistering incoming observer: +
old);
+final Logger logger = getLogger();
+if (logger.isLoggable(Level.FINE)) {
+logger.fine(unregistering incoming observer: + old);
+}
deactivate();
}
incomingObserver = observer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/71a1d142/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 4319373..914db9e 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
@@ -77,7 +77,9 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
HandlerChainAnnotation hcAnn = findHandlerChainAnnotation(clz, true);
ListHandler chain = null;
if (hcAnn == null) {
-LOG.fine(no HandlerChain annotation on + clz);
+if (LOG.isLoggable(Level.FINE)) {
+LOG.fine(no HandlerChain annotation on + clz);
+}
chain = new ArrayListHandler();
} else {
hcAnn.validate();
@@ -215,8 +217,6 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
NOT_A_QNAME_PATTER,
namePattern, xml));
}
-String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
- namePattern.length());
String pfx = namePattern.substring(0, namePattern.indexOf(':'));
String ns = el.lookupNamespaceURI(pfx);
if (ns == null) {
@@ -225,6 +225,8 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
if (!ns.equals(comp.getNamespaceURI())) {
return false;
}
+String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
+
cxf git commit: Few minor improvements
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 5ba12e480 - 6d367428b
Few minor improvements
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d367428
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d367428
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d367428
Branch: refs/heads/3.0.x-fixes
Commit: 6d367428bc9e5a7792e14391c16a1a7d66d1b227
Parents: 5ba12e4
Author: Alessio Soldano asold...@redhat.com
Authored: Wed Feb 11 14:27:14 2015 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Wed Feb 11 14:30:52 2015 +0100
--
.../org/apache/cxf/transport/AbstractObservable.java | 11 +--
.../cxf/jaxws/handler/AnnotationHandlerChainBuilder.java | 8 +---
.../main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 5 +++--
3 files changed, 17 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d367428/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
--
diff --git
a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
index fdda914..35a2f16 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
@@ -19,6 +19,7 @@
package org.apache.cxf.transport;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
@@ -43,7 +44,10 @@ public abstract class AbstractObservable implements
Observable {
// the observer switch must take place before activation or after
deactivation
if (observer != null) {
incomingObserver = observer;
-getLogger().fine(registering incoming observer: + observer);
+final Logger logger = getLogger();
+if (logger.isLoggable(Level.FINE)) {
+logger.fine(registering incoming observer: + observer);
+}
if (old == null) {
try {
activate();
@@ -54,7 +58,10 @@ public abstract class AbstractObservable implements
Observable {
}
} else {
if (old != null) {
-getLogger().fine(unregistering incoming observer: +
old);
+final Logger logger = getLogger();
+if (logger.isLoggable(Level.FINE)) {
+logger.fine(unregistering incoming observer: + old);
+}
deactivate();
}
incomingObserver = observer;
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d367428/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 4319373..914db9e 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
@@ -77,7 +77,9 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
HandlerChainAnnotation hcAnn = findHandlerChainAnnotation(clz, true);
ListHandler chain = null;
if (hcAnn == null) {
-LOG.fine(no HandlerChain annotation on + clz);
+if (LOG.isLoggable(Level.FINE)) {
+LOG.fine(no HandlerChain annotation on + clz);
+}
chain = new ArrayListHandler();
} else {
hcAnn.validate();
@@ -215,8 +217,6 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
NOT_A_QNAME_PATTER,
namePattern, xml));
}
-String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
- namePattern.length());
String pfx = namePattern.substring(0, namePattern.indexOf(':'));
String ns = el.lookupNamespaceURI(pfx);
if (ns == null) {
@@ -225,6 +225,8 @@ public class AnnotationHandlerChainBuilder extends
HandlerChainBuilder {
if (!ns.equals(comp.getNamespaceURI())) {
return false;
}
+String localPart = namePattern.substring(namePattern.indexOf(':') + 1,
+
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 6d367428b - a4bd82361 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/a4bd8236 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4bd8236 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4bd8236 Branch: refs/heads/3.0.x-fixes Commit: a4bd823619a70e472fcb93e2490d3dc629d088b2 Parents: 6d36742 Author: Alessio Soldano asold...@redhat.com Authored: Wed Feb 11 14:32:08 2015 +0100 Committer: Alessio Soldano asold...@redhat.com Committed: Wed Feb 11 14:32:08 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a4bd8236/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index d6c344a..2015ce9 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -223,6 +223,7 @@ M 6292346fb110f0517b791f91d03fd2515d575388 M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594 M 67201fdde69488e511deb3d24794984afc01fe2d M 717018e84f3ed41f0c9ca5ca550593c6c3352866 +M 71a1d1425c7cbfb6d410e6655f3579131d1fab3e M 7431af236a19b5b5f899bad317a548a4c5c9cd49 M 76c4df1bce5e71b439fb37fa5d9e1af12615786b M 79156d8a23497b9ed9bd912b64f684e610d49863
cxf git commit: Adding hostname verification tests for http-hc
Repository: cxf
Updated Branches:
refs/heads/master 71a1d1425 - 69da964ce
Adding hostname verification tests for http-hc
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69da964c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69da964c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69da964c
Branch: refs/heads/master
Commit: 69da964cee97052c5fe78cbdf23674a911919f5d
Parents: 71a1d14
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Feb 11 13:36:08 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Feb 11 13:36:29 2015 +
--
.../http/asyncclient/AsyncHTTPConduit.java | 8 -
.../hostname/HostnameVerificationTest.java | 32
2 files changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/69da964c/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 47bf717..6d9ff3d 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -519,6 +519,8 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
tlsClientParameters = new TLSClientParameters();
}
final SSLContext sslcontext =
getSSLContext(tlsClientParameters);
+final HostnameVerifier verifier =
org.apache.cxf.transport.https.SSLUtils
+.getHostnameVerifier(tlsClientParameters);
regBuilder
.register(https,
new SSLIOSessionStrategy(sslcontext) {
@@ -530,6 +532,10 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
protected void verifySession(final HttpHost
host,
final IOSession
iosession,
final SSLSession
sslsession) throws SSLException {
+if (!verifier.verify(host.getHostName(),
sslsession)) {
+throw new SSLException(Could not
verify host + host.getHostName());
+}
+
iosession.setAttribute(cxf.handshake.done, Boolean.TRUE);
setSSLSession(sslsession);
}
@@ -873,7 +879,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
ctx.init(keyManagers, tlsClientParameters.getTrustManagers(),
tlsClientParameters.getSecureRandom());
-
+
sslContext = ctx;
lastTlsHash = hash;
sslState = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/69da964c/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
index 3769ecb..9ab2752 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
@@ -21,6 +21,8 @@ package org.apache.cxf.systest.https.hostname;
import java.net.URL;
+import javax.xml.ws.BindingProvider;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -78,6 +80,11 @@ public class HostnameVerificationTest extends
AbstractBusClientServerTestBase {
assertEquals(port.greetMe(Kitty), Hello Kitty);
+// Enable Async
+
((BindingProvider)port).getRequestContext().put(use.async.http.conduit, true);
+
+assertEquals(port.greetMe(Kitty), Hello Kitty);
+
((java.io.Closeable)port).close();
bus.shutdown(true);
}
@@ -107,6 +114,16 @@ public class HostnameVerificationTest extends
AbstractBusClientServerTestBase {
// expected
}
