Repository: tomee Updated Branches: refs/heads/master e18a92244 -> cd1433e0e
TOMEE-1700 johnwon 0.9.2-incubating Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cd1433e0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cd1433e0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cd1433e0 Branch: refs/heads/master Commit: cd1433e0e690553d5525ecffe5588be1590a897e Parents: e18a922 Author: Romain Manni-Bucau <rmannibu...@gmail.org> Authored: Fri Jan 29 09:23:13 2016 +0100 Committer: Romain Manni-Bucau <rmannibu...@gmail.org> Committed: Fri Jan 29 09:23:13 2016 +0100 ---------------------------------------------------------------------- server/openejb-cxf-rs/pom.xml | 2 +- .../server/cxf/rs/CxfRsHttpListener.java | 2 +- .../server/cxf/rs/JndiForPojoEndpointsTest.java | 21 ++++++-------------- 3 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml index a6794d2..acd3fd6 100644 --- a/server/openejb-cxf-rs/pom.xml +++ b/server/openejb-cxf-rs/pom.xml @@ -117,7 +117,7 @@ <dependency> <!-- JohnzonProvider, WadlDocumentMessageBodyWriter and JsrProvider --> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jaxrs</artifactId> - <version>0.8-incubating</version> + <version>0.9.2-incubating</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java index ec7555f..f279f09 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java @@ -1104,7 +1104,7 @@ public class CxfRsHttpListener implements RsHttpListener { } @Override - protected void setProviders(final boolean custom, final boolean bus, final Object... providers) { + protected void setProviders(final boolean b, final boolean b1, final Object... objects) { throw new UnsupportedOperationException("not a real inheritance"); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/cd1433e0/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java index fabd64e..019dda6 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java @@ -24,6 +24,7 @@ import org.apache.openejb.testing.Classes; import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.EnableServices; import org.apache.openejb.testing.Module; +import org.apache.openejb.testing.RandomPort; import org.apache.openejb.testng.PropertiesBuilder; import org.apache.openejb.util.NetworkUtil; import org.junit.BeforeClass; @@ -35,7 +36,9 @@ import javax.validation.Validator; import javax.validation.constraints.NotNull; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -43,21 +46,8 @@ import static org.junit.Assert.assertEquals; @EnableServices("jax-rs") @RunWith(ApplicationComposer.class) public class JndiForPojoEndpointsTest { - - private static int port = -1; - - @BeforeClass - public static void beforeClass() { - port = NetworkUtil.getNextAvailablePort(); - } - - @Configuration - public Properties props() { - return new PropertiesBuilder() - .p("httpejbd.port", Integer.toString(port)) - .p(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true") - .build(); - } + @RandomPort("http") + private int port; @Module @Classes(cdi = true, value = {JndiEndpoint.class}) @@ -78,6 +68,7 @@ public class JndiForPojoEndpointsTest { private Validator val; @GET + @Produces(MediaType.TEXT_PLAIN) public int doIt() { return val.validate(new ToVal()).size(); }