Author: rmannibucau
Date: Sun Sep 14 10:52:17 2014
New Revision: 1624830
URL: http://svn.apache.org/r1624830
Log:
s/fleece/johnzon/ in examples + correct owb version (was changed today)
Modified:
tomee/tomee/trunk/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java
tomee/tomee/trunk/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
tomee/tomee/trunk/pom.xml
Modified:
tomee/tomee/trunk/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java?rev=1624830&r1=1624829&r2=1624830&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java
(original)
+++
tomee/tomee/trunk/examples/rest-cdi/src/main/java/org/superbiz/rest/GreetingService.java
Sun Sep 14 10:52:17 2014
@@ -43,7 +43,7 @@ public class GreetingService {
return new Greet(greeting.doSomething(message.getValue()));
}
- @XmlRootElement // for xml only, useless for json (fleece is the default)
+ @XmlRootElement // for xml only, useless for json (johnzon is the default)
public static class Greet {
private String message;
Modified:
tomee/tomee/trunk/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java?rev=1624830&r1=1624829&r2=1624830&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
(original)
+++
tomee/tomee/trunk/examples/rest-cdi/src/test/java/org/superbiz/rest/GreetingServiceTest.java
Sun Sep 14 10:52:17 2014
@@ -17,17 +17,21 @@
package org.superbiz.rest;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.fleece.jaxrs.FleeceProvider;
+import org.apache.johnzon.jaxrs.JohnzonProvider;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
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.testng.PropertiesBuilder;
+import org.apache.openejb.util.NetworkUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
+import java.util.Properties;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
@@ -35,6 +39,13 @@ import static org.junit.Assert.assertEqu
@EnableServices(value = "jaxrs", httpDebug = true)
@RunWith(ApplicationComposer.class)
public class GreetingServiceTest {
+ private int port;
+
+ @Configuration
+ public Properties randomPort() {
+ port = NetworkUtil.getNextAvailablePort();
+ return new PropertiesBuilder().p("httpejbd.port",
Integer.toString(port)).build();
+ }
@Module
@Classes(value = {GreetingService.class, Greeting.class}, cdi = true) //
This enables the CDI magic
@@ -44,7 +55,7 @@ public class GreetingServiceTest {
@Test
public void getXml() throws IOException {
- final String message =
WebClient.create("http://localhost:4204";).path("/test/greeting/")
+ final String message = WebClient.create("http://localhost:"; +
port).path("/test/greeting/")
.accept(MediaType.APPLICATION_XML_TYPE)
.get(GreetingService.Greet.class).getMessage();
assertEquals("Hi REST!", message);
@@ -52,7 +63,7 @@ public class GreetingServiceTest {
@Test
public void postXml() throws IOException {
- final String message =
WebClient.create("http://localhost:4204";).path("/test/greeting/")
+ final String message = WebClient.create("http://localhost:"; +
port).path("/test/greeting/")
.accept(MediaType.APPLICATION_XML_TYPE)
.post(new Request("Hi REST!"),
GreetingService.Greet.class).getMessage();
assertEquals("hi rest!", message);
@@ -60,7 +71,7 @@ public class GreetingServiceTest {
@Test
public void getJson() throws IOException {
- final String message = WebClient.create("http://localhost:4204";,
asList(new FleeceProvider<GreetingService.Greet>())).path("/test/greeting/")
+ final String message = WebClient.create("http://localhost:"; + port,
asList(new JohnzonProvider<GreetingService.Greet>())).path("/test/greeting/")
.accept(MediaType.APPLICATION_JSON_TYPE)
.get(GreetingService.Greet.class).getMessage();
assertEquals("Hi REST!", message);
@@ -68,7 +79,7 @@ public class GreetingServiceTest {
@Test
public void postJson() throws IOException {
- final String message = WebClient.create("http://localhost:4204";,
asList(new FleeceProvider<GreetingService.Greet>())).path("/test/greeting/")
+ final String message = WebClient.create("http://localhost:"; + port,
asList(new JohnzonProvider<GreetingService.Greet>())).path("/test/greeting/")
.accept(MediaType.APPLICATION_JSON_TYPE)
.post(new Request("Hi REST!"),
GreetingService.Greet.class).getMessage();
assertEquals("hi rest!", message);
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1624830&r1=1624829&r2=1624830&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Sun Sep 14 10:52:17 2014
@@ -97,7 +97,7 @@
<tomee.version>2.0.0-SNAPSHOT</tomee.version>
<openjpa.version>2.4.0-nonfinal-1598334</openjpa.version>
-
<org.apache.openwebbeans.version>2.0.0-SNAPSHOT</org.apache.openwebbeans.version>
+
<org.apache.openwebbeans.version>1.5.0-SNAPSHOT</org.apache.openwebbeans.version>
<jcs.version>2.0-SNAPSHOT</jcs.version>
<!-- Maven module versions -->
