buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/33032 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/33028 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/33027 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[cxf] branch 3.2.x-fixes updated: [CXF-8055]AsyncHTTPConduit should also consider jaxws spec timeout properties
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new f727ca3 [CXF-8055]AsyncHTTPConduit should also consider jaxws spec
timeout properties
f727ca3 is described below
commit f727ca3ffa5f4b2d9859d1308bd346669cdd1585
Author: Freeman Fang
AuthorDate: Thu Jun 13 15:25:11 2019 -0400
[CXF-8055]AsyncHTTPConduit should also consider jaxws spec timeout
properties
(cherry picked from commit 42352e7197aa965109b0562fabadbea94233e68d)
---
.../http/asyncclient/AsyncHTTPConduit.java | 12 +
.../http/asyncclient/AsyncHTTPConduitTest.java | 30 ++
2 files changed, 42 insertions(+)
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 3091051..264ac1c 100755
---
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
@@ -136,6 +136,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
super.setupConnection(message, address, csPolicy);
return;
}
+propagateJaxwsSpecTimeoutSettings(message, csPolicy);
boolean addressChanged = false;
// need to do some clean up work on the URI address
URI uri = address.getURI();
@@ -233,6 +234,17 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
message.put(CXFHttpRequest.class, e);
}
+private void propagateJaxwsSpecTimeoutSettings(Message message,
HTTPClientPolicy csPolicy) {
+int receiveTimeout = determineReceiveTimeout(message, csPolicy);
+if (csPolicy.getReceiveTimeout() == 6) {
+csPolicy.setReceiveTimeout(receiveTimeout);
+}
+int connectionTimeout = determineConnectionTimeout(message, csPolicy);
+if (csPolicy.getConnectionTimeout() == 3) {
+csPolicy.setConnectionTimeout(connectionTimeout);
+}
+}
+
protected OutputStream createOutputStream(Message message,
boolean needToCacheRequest,
diff --git
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
index e5e438e..46b1d66 100644
---
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
+++
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
@@ -152,6 +152,21 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
//expected!!!
}
}
+
+
+@Test
+public void testTimeoutWithPropertySetting() throws Exception {
+
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
+"3000");
+updateAddressPort(g, PORT);
+
+try {
+assertEquals("Hello " + request, g.greetMeLater(-5000));
+fail();
+} catch (Exception ex) {
+//expected!!!
+}
+}
@Test
public void testTimeoutAsync() throws Exception {
@@ -166,6 +181,21 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
//expected!!!
}
}
+
+@Test
+public void testTimeoutAsyncWithPropertySetting() throws Exception {
+updateAddressPort(g, PORT);
+
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
+"3000");
+try {
+Response future =
g.greetMeLaterAsync(-5000L);
+future.get();
+fail();
+} catch (Exception ex) {
+//expected!!!
+}
+}
+
@Test
public void testConnectIssue() throws Exception {
updateAddressPort(g, PORT_INV);
[cxf] branch master updated: [CXF-8055]AsyncHTTPConduit should also consider jaxws spec timeout properties
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 42352e7 [CXF-8055]AsyncHTTPConduit should also consider jaxws spec
timeout properties
42352e7 is described below
commit 42352e7197aa965109b0562fabadbea94233e68d
Author: Freeman Fang
AuthorDate: Thu Jun 13 15:25:11 2019 -0400
[CXF-8055]AsyncHTTPConduit should also consider jaxws spec timeout
properties
---
.../http/asyncclient/AsyncHTTPConduit.java | 12 +
.../http/asyncclient/AsyncHTTPConduitTest.java | 30 ++
2 files changed, 42 insertions(+)
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 b3a6186..8c738b7 100755
---
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
@@ -136,6 +136,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
super.setupConnection(message, address, csPolicy);
return;
}
+propagateJaxwsSpecTimeoutSettings(message, csPolicy);
boolean addressChanged = false;
// need to do some clean up work on the URI address
URI uri = address.getURI();
@@ -233,6 +234,17 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
message.put(CXFHttpRequest.class, e);
}
+private void propagateJaxwsSpecTimeoutSettings(Message message,
HTTPClientPolicy csPolicy) {
+int receiveTimeout = determineReceiveTimeout(message, csPolicy);
+if (csPolicy.getReceiveTimeout() == 6) {
+csPolicy.setReceiveTimeout(receiveTimeout);
+}
+int connectionTimeout = determineConnectionTimeout(message, csPolicy);
+if (csPolicy.getConnectionTimeout() == 3) {
+csPolicy.setConnectionTimeout(connectionTimeout);
+}
+}
+
protected OutputStream createOutputStream(Message message,
boolean needToCacheRequest,
diff --git
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
index ed20f7b..9ed69af 100644
---
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
+++
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
@@ -154,6 +154,21 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
//expected!!!
}
}
+
+
+@Test
+public void testTimeoutWithPropertySetting() throws Exception {
+
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
+"3000");
+updateAddressPort(g, PORT);
+
+try {
+assertEquals("Hello " + request, g.greetMeLater(-5000));
+fail();
+} catch (Exception ex) {
+//expected!!!
+}
+}
@Test
public void testTimeoutAsync() throws Exception {
@@ -168,6 +183,21 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
//expected!!!
}
}
+
+@Test
+public void testTimeoutAsyncWithPropertySetting() throws Exception {
+updateAddressPort(g, PORT);
+
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
+"3000");
+try {
+Response future =
g.greetMeLaterAsync(-5000L);
+future.get();
+fail();
+} catch (Exception ex) {
+//expected!!!
+}
+}
+
@Test
public void testConnectIssue() throws Exception {
updateAddressPort(g, PORT_INV);
[cxf] branch 3.1.x-fixes updated (0608aff -> 9e44530)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 0608aff Backport of Handle null contracts add 9e44530 Fixing failing tests due to cert expiration No new revisions were added by this update. Summary of changes: .../security/handler/UsernamePasswordCallback.java | 4 ++-- .../ws/security/handler/Client_Encrypt.properties | 23 .../ws/security/handler/Client_Sign.properties | 24 - .../ws/security/handler/Server_Decrypt.properties | 23 .../ws/security/handler/Server_SignVerf.properties | 23 .../ws/security/handler/client-keystore.jks| Bin 1344 -> 0 bytes .../ws/security/handler/client-truststore.jks | Bin 639 -> 0 bytes .../cxf/systest/ws/security/handler/client.xml | 6 +++--- .../ws/security/handler/server-keystore.jks| Bin 1345 -> 0 bytes .../ws/security/handler/server-truststore.jks | Bin 639 -> 0 bytes .../cxf/systest/ws/security/handler/server.xml | 6 +++--- 11 files changed, 8 insertions(+), 101 deletions(-) delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client-keystore.jks delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client-truststore.jks delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server-keystore.jks delete mode 100644 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server-truststore.jks
[cxf] branch 3.2.x-fixes updated: Fixing failing tests due to cert expiration
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 3ee101c Fixing failing tests due to cert expiration
3ee101c is described below
commit 3ee101c83655c24f387427d32e91c76decea4cfb
Author: Colm O hEigeartaigh
AuthorDate: Thu Jun 13 10:00:50 2019 +0100
Fixing failing tests due to cert expiration
(cherry picked from commit c5702b02e3cab88198172cf9eacc48bbd935d1b3)
---
.../security/handler/UsernamePasswordCallback.java | 4 ++--
.../ws/security/handler/Client_Encrypt.properties | 23
.../ws/security/handler/Client_Sign.properties | 24 -
.../ws/security/handler/Server_Decrypt.properties | 23
.../ws/security/handler/Server_SignVerf.properties | 23
.../ws/security/handler/client-keystore.jks| Bin 1344 -> 0 bytes
.../ws/security/handler/client-truststore.jks | Bin 639 -> 0 bytes
.../cxf/systest/ws/security/handler/client.xml | 6 +++---
.../ws/security/handler/server-keystore.jks| Bin 1345 -> 0 bytes
.../ws/security/handler/server-truststore.jks | Bin 639 -> 0 bytes
.../cxf/systest/ws/security/handler/server.xml | 6 +++---
11 files changed, 8 insertions(+), 101 deletions(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
index bef8096..d46820f 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
@@ -34,8 +34,8 @@ public class UsernamePasswordCallback implements
CallbackHandler {
public UsernamePasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
-passwords.put("clientx509v1", "storepassword");
-passwords.put("serverx509v1", "storepassword");
+passwords.put("alice", "password");
+passwords.put("bob", "password");
}
/**
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
deleted file mode 100644
index e136c61..000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements. See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership. The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing,
-#software distributed under the License is distributed on an
-#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#KIND, either express or implied. See the License for the
-#specific language governing permissions and limitations
-#under the License.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
deleted file mode 100644
index 5ea2456..000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements. See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership. The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable
[cxf] branch master updated: Fixing failing tests due to cert expiration
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new c5702b0 Fixing failing tests due to cert expiration
c5702b0 is described below
commit c5702b02e3cab88198172cf9eacc48bbd935d1b3
Author: Colm O hEigeartaigh
AuthorDate: Thu Jun 13 10:00:50 2019 +0100
Fixing failing tests due to cert expiration
---
.../security/handler/UsernamePasswordCallback.java | 4 ++--
.../ws/security/handler/Client_Encrypt.properties | 23
.../ws/security/handler/Client_Sign.properties | 24 -
.../ws/security/handler/Server_Decrypt.properties | 23
.../ws/security/handler/Server_SignVerf.properties | 23
.../ws/security/handler/client-keystore.jks| Bin 1344 -> 0 bytes
.../ws/security/handler/client-truststore.jks | Bin 639 -> 0 bytes
.../cxf/systest/ws/security/handler/client.xml | 6 +++---
.../ws/security/handler/server-keystore.jks| Bin 1345 -> 0 bytes
.../ws/security/handler/server-truststore.jks | Bin 639 -> 0 bytes
.../cxf/systest/ws/security/handler/server.xml | 6 +++---
11 files changed, 8 insertions(+), 101 deletions(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
index bef8096..d46820f 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
@@ -34,8 +34,8 @@ public class UsernamePasswordCallback implements
CallbackHandler {
public UsernamePasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
-passwords.put("clientx509v1", "storepassword");
-passwords.put("serverx509v1", "storepassword");
+passwords.put("alice", "password");
+passwords.put("bob", "password");
}
/**
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
deleted file mode 100644
index e136c61..000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements. See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership. The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing,
-#software distributed under the License is distributed on an
-#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#KIND, either express or implied. See the License for the
-#specific language governing permissions and limitations
-#under the License.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/handler/client-truststore.jks
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
deleted file mode 100644
index 5ea2456..000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements. See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership. The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing,
-#software distributed under the License is distribute
