You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/20 19:18:45 UTC
svn commit: r1328453 - in
/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src:
main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
Author: rmannibucau
Date: Fri Apr 20 17:18:45 2012
New Revision: 1328453
URL: http://svn.apache.org/viewvc?rev=1328453&view=rev
Log:
don't use 0.0.0.0 but localhost for embedded tomee container
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1328453&r1=1328452&r2=1328453&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Fri Apr 20 17:18:45 2012
@@ -19,7 +19,6 @@ package org.apache.openejb.arquillian.em
import org.apache.openejb.AppContext;
import org.apache.openejb.arquillian.common.Files;
import org.apache.openejb.arquillian.common.TomEEContainer;
-import org.apache.openejb.util.NetworkUtil;
import org.apache.tomee.embedded.Configuration;
import org.apache.tomee.embedded.Container;
import org.jboss.arquillian.container.spi.client.container.DeploymentException;
@@ -46,6 +45,7 @@ public class EmbeddedTomEEContainer exte
public static final String TOMEE_ARQUILLIAN_HTTP_PORT = "tomee.arquillian.http";
public static final String TOMEE_ARQUILLIAN_STOP_PORT = "tomee.arquillian.stop";
+ private static final String LOCALHOST = "localhost";
@Inject
@ContainerScoped
@@ -115,7 +115,7 @@ public class EmbeddedTomEEContainer exte
AppContext appContext = container.deploy(name, file);
- HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
+ HTTPContext httpContext = new HTTPContext(LOCALHOST, configuration.getHttpPort());
httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
beanManagerInstance.set(appContext.getBeanManager());
return new ProtocolMetaData().addContext(httpContext);
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1328453&r1=1328452&r2=1328453&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java Fri Apr 20 17:18:45 2012
@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
import javax.ejb.EJB;
import java.net.URL;
+import java.util.concurrent.CountDownLatch;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
@@ -62,7 +63,7 @@ public class EmbeddedTomEEContainerTest
@Test
public void restServiceIsDeployed() throws Exception {
- final String read = IOUtils.toString(new URL("http://localhost:" + System.getProperty("tomee.httpPort", "8080") + "/test/rest/foo").openStream());
+ final String read = IOUtils.toString(new URL(url.toExternalForm() + "rest/foo").openStream());
assertEquals("foo", read);
}
}