Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a5ca88f23 -> 62c0947ad
Fixing build Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/62c0947a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/62c0947a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/62c0947a Branch: refs/heads/3.0.x-fixes Commit: 62c0947ad2b25e9b673710037589bccc00327a54 Parents: a5ca88f Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Jun 21 15:38:02 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Jun 21 15:38:56 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 2 +- .../org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java | 1 + .../test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/62c0947a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java index a3c94e7..a586f88 100644 --- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java +++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java @@ -65,7 +65,7 @@ public class DOM4JProviderTest extends Assert { private org.dom4j.Document readXMLBom() throws Exception { byte[] bom = new byte[]{(byte)239, (byte)187, (byte)191}; assertEquals("efbbbf", StringUtils.toHexString(bom)); - byte[] strBytes = "<a/>".getBytes(StandardCharsets.UTF_8); + byte[] strBytes = "<a/>".getBytes("UTF-8"); InputStream is = new SequenceInputStream(new ByteArrayInputStream(bom), new ByteArrayInputStream(strBytes)); DOM4JProvider p = new DOM4JProvider(); http://git-wip-us.apache.org/repos/asf/cxf/blob/62c0947a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java index b89b993..8eafd17 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java @@ -60,6 +60,7 @@ public class BaseGreeterTimeoutImpl extends Assert implements Greeter { Thread.sleep(ms + 1000); } } catch (InterruptedException ignore) { + // expected } } return "Hello " + me; http://git-wip-us.apache.org/repos/asf/cxf/blob/62c0947a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java index 55ad459..4df8cce 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java @@ -77,8 +77,8 @@ public class CorbaTimeoutTest extends AbstractBusClientServerTestBase { new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_client.xml"); GreeterCORBAService gcs = new GreeterCORBAService(wsdlUrl, SERVICE_NAME); - Greeter port = gcs.getPort(new QName("http://cxf.apache.org/hello_world_corba";, "GreeterTimeoutCORBAPort"), - GreeterCORBAService.GreeterProxy.class); + Greeter port = gcs.getPort(new QName("http://cxf.apache.org/hello_world_corba";, "GreeterTimeoutCORBAPort"), + Greeter.class); try { port.greetMe("Betty");
