You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/04/23 02:12:40 UTC
[cxf] branch 3.4.x-fixes updated: Fixing post-merge issues
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new f0eebca Fixing post-merge issues
f0eebca is described below
commit f0eebca02189794f5001d81f078353ba7080e999
Author: reta <dr...@gmail.com>
AuthorDate: Thu Apr 22 22:12:14 2021 -0400
Fixing post-merge issues
---
.../cxf/systest/jaxrs/provider/JAXBContextResolverTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
index 2046e37..ca66636 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
@@ -26,12 +26,11 @@ import javax.ws.rs.core.Response;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractServerTestServerBase;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,14 +42,14 @@ import static org.junit.Assert.assertTrue;
public class JAXBContextResolverTest extends AbstractClientServerTestBase {
public static final String PORT = allocatePort(JAXBContextResolverTest.class);
- public static class Server extends AbstractServerTestServerBase {
+ public static class Server extends AbstractBusTestServerBase {
@Override
- protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
+ protected void run() {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CXFResource.class);
sf.setProvider(new CXFJaxbContextResolver());
sf.setAddress("http://localhost:" + PORT + "/");
- return sf.create();
+ sf.create();
}
public static void main(String[] args) throws Exception {