Author: andygumbrecht
Date: Wed Sep 24 22:49:04 2014
New Revision: 1627433
URL: http://svn.apache.org/r1627433
Log:
Same fix for EmbeddedTomEEContainerTest
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
tomee/tomee/branches/tomee-1.7.x/examples/cdi-basic/ (props changed)
tomee/tomee/branches/tomee-1.7.x/examples/multiple-tomee-arquillian/pom.xml
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1627433&r1=1627432&r2=1627433&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
Wed Sep 24 22:49:04 2014
@@ -26,10 +26,12 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ejb.EJB;
+import javax.ws.rs.core.Application;
import java.net.URL;
import static org.junit.Assert.assertEquals;
@@ -41,9 +43,29 @@ public class EmbeddedTomEEContainerTest
@Deployment
public static WebArchive createDeployment() {
- return ShrinkWrap.create(WebArchive.class,
"EmbeddedTomEEContainerTest.war")
+
+ //JAXWS and JAXRS are "servlets" so if one (JAXRS here) binds to /*
then the other
+ //one is not accessible depending deployment order, this is basically
adding @ApplicationPath("/api")
+
+ final String xml = Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
+ .getOrCreateServlet()
+ .servletName("jaxrs")
+ .servletClass(Application.class.getName())
+ .createInitParam()
+ .paramName(Application.class.getName())
+ .paramValue(Application.class.getName())
+ .up()
+ .up()
+ .getOrCreateServletMapping()
+ .servletName("jaxrs")
+ .urlPattern("/api")
+ .up()
+ .exportAsString();
+
+ return ShrinkWrap.create(WebArchive.class,
EmbeddedTomEEContainerTest.class.getName().concat(".war"))
.addClasses(AnEJB.class, AServlet.class, ARestService.class)
- .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").exportAsString()));
+ .setWebXML(new StringAsset(xml));
}
@EJB
@@ -66,7 +88,7 @@ public class EmbeddedTomEEContainerTest
@Test
public void restServiceIsDeployed() throws Exception {
- final String read = IOUtils.toString(new URL(url.toExternalForm() +
"rest/foo").openStream());
+ final String read = IOUtils.toString(new URL(url.toExternalForm() +
"api/rest/foo").openStream());
assertEquals("foo", read);
}
}
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java?rev=1627433&r1=1627432&r2=1627433&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/wsrs/WsRsTest.java
Wed Sep 24 22:49:04 2014
@@ -55,25 +55,29 @@ public class WsRsTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
+
+ //JAXWS and JAXRS are "servlets" so if one (JAXRS here) binds to /*
then the other
+ //one is not accessible depending deployment order, this is basically
adding @ApplicationPath("/api")
+
+ final String xml = Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
+ .getOrCreateServlet()
+ .servletName("jaxrs")
+ .servletClass(Application.class.getName())
+ .createInitParam()
+ .paramName(Application.class.getName())
+ .paramValue(Application.class.getName())
+ .up()
+ .up()
+ .getOrCreateServletMapping()
+ .servletName("jaxrs")
+ .urlPattern("/api")
+ .up()
+ .exportAsString();
+
return ShrinkWrap.create(WebArchive.class,
WsRsTest.class.getName().concat(".war"))
- .addClasses(Bean.class)
- // jaxws and jaxrs are "servlets" so if one (jaxrs here) binds
to /* then the other one is not accessible depending deployment order
- .setWebXML(new StringAsset(
- Descriptors.create(WebAppDescriptor.class)
- .version(WebAppVersionType._3_0)
- .getOrCreateServlet()
- .servletName("jaxrs")
- .servletClass(Application.class.getName())
- .createInitParam()
- .paramName(Application.class.getName())
- .paramValue(Application.class.getName())
- .up()
- .up()
- .getOrCreateServletMapping()
- .servletName("jaxrs")
- .urlPattern("/api")
- .up()
- .exportAsString()));
+ .addClasses(Bean.class)
+ .setWebXML(new StringAsset(xml));
}
@Test
@@ -82,24 +86,24 @@ public class WsRsTest {
final HttpPost post = new HttpPost(uri);
post.setEntity(new StringEntity("" +
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>\n" +
- " <soap:Body>\n" +
- " <ns1:hello
xmlns:ns1=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\"/>\n" +
- " </soap:Body>\n" +
- "</soap:Envelope>"));
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>\n" +
+ " <soap:Body>\n" +
+ " <ns1:hello
xmlns:ns1=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\"/>\n" +
+ " </soap:Body>\n" +
+ "</soap:Envelope>"));
final HttpResponse response = client.execute(post);
final String body = asString(response);
final String expected = "" +
- "<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" +
- "<soap:Body>" +
- "<ns:helloResponse
xmlns:ns=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\";>" +
- "<return>hola</return>" +
- "</ns:helloResponse>" +
- "</soap:Body>" +
- "</soap:Envelope>";
+ "<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>" +
+ "<soap:Body>" +
+ "<ns:helloResponse
xmlns:ns=\"http://wsrs.jaxws.tests.arquillian.openejb.apache.org/\";>" +
+ "<return>hola</return>" +
+ "</ns:helloResponse>" +
+ "</soap:Body>" +
+ "</soap:Envelope>";
Assert.assertEquals(expected, body.replaceAll("ns[0-9]*", "ns"));
}
Propchange: tomee/tomee/branches/tomee-1.7.x/examples/cdi-basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 24 22:49:04 2014
@@ -7,3 +7,4 @@
.settings
out
target
+.idea
Modified:
tomee/tomee/branches/tomee-1.7.x/examples/multiple-tomee-arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/examples/multiple-tomee-arquillian/pom.xml?rev=1627433&r1=1627432&r2=1627433&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/examples/multiple-tomee-arquillian/pom.xml
(original)
+++ tomee/tomee/branches/tomee-1.7.x/examples/multiple-tomee-arquillian/pom.xml
Wed Sep 24 22:49:04 2014
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.1.1.Final</version>
+ <version>1.1.5.Final</version>
<scope>test</scope>
</dependency>
<dependency>
