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 2011/12/28 13:00:48 UTC
svn commit: r1225164 - in /openejb/trunk/openejb/arquillian-tomee:
arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/
arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/
arquillian-tomee-tests/ arquillian-tome...
Author: rmannibucau
Date: Wed Dec 28 12:00:47 2011
New Revision: 1225164
URL: http://svn.apache.org/viewvc?rev=1225164&view=rev
Log:
updating arquillian tests to use another port
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Wed Dec 28 12:00:47 2011
@@ -53,7 +53,7 @@ public class TomEEContainerTest {
@Test
public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
- InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port") + "/test/Test").openStream();
+ InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "10080") + "/test/Test").openStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java Wed Dec 28 12:00:47 2011
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNot
@RunWith(Arquillian.class)
public class SessionScopeTest {
- public static final String TEST_SESSION_URL = "http://127.0.0.1:" + System.getProperty("tomee.http.port") + "/test/session";
+ public static final String TEST_SESSION_URL = "http://127.0.0.1:" + System.getProperty("tomee.http.port", "10080") + "/test/session";
@Deployment
public static WebArchive createDeployment() {
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml Wed Dec 28 12:00:47 2011
@@ -65,6 +65,26 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <configuration>
+ <portNames>
+ <portName>tomee.http.port</portName>
+ <portName>tomee.shutdown.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java Wed Dec 28 12:00:47 2011
@@ -80,7 +80,7 @@ public abstract class TestSetup {
}
protected void validateTest(String servlet, String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + getTestContextName() + "/" + servlet).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + getTestContextName() + "/" + servlet).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -67,7 +67,7 @@ public class ServletCdiConstructorInject
}
private void validateTest(String expectedOutput) throws IOException {
- Tests.assertOutput("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
+ Tests.assertOutput("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
}
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -72,7 +72,7 @@ public class ServletCdiInjectionTest {
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java Wed Dec 28 12:00:47 2011
@@ -71,7 +71,7 @@ public class ServletCdiProducerTest {
}
private void validateTest(String expectedOutput) throws IOException {
- Tests.assertOutput("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
+ Tests.assertOutput("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
}
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -148,7 +148,7 @@ public class ServletEnvEntryInjectionTes
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java Wed Dec 28 12:00:47 2011
@@ -85,7 +85,7 @@ public class StratocasterTest {
}
private void validateTest(String expectedOutput) throws IOException {
- Tests.assertOutput("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
+ Tests.assertOutput("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME, expectedOutput);
}
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -165,7 +165,7 @@ public class ServletFilterEnvEntryInject
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java Wed Dec 28 12:00:47 2011
@@ -38,7 +38,7 @@ import static org.apache.openejb.arquill
}
@Test public void check() throws IOException {
- assertOutput("http://localhost:9080/" + TEST_NAME + "/get-resources", "foundFromListener=1");
- assertOutput("http://localhost:9080/" + TEST_NAME + "/get-resources", "servletContextGetResource=ok");
+ assertOutput("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/get-resources", "foundFromListener=1");
+ assertOutput("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/get-resources", "servletContextGetResource=ok");
}
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -242,7 +242,7 @@ public class ServletListenerEnvEntryInje
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -242,7 +242,7 @@ public class ServletListenerEjbLocalInje
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -101,7 +101,7 @@ public class ServletListenerPersistenceI
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java Wed Dec 28 12:00:47 2011
@@ -77,7 +77,7 @@ public class ServletListenerEjbRemoteTes
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -68,7 +68,7 @@ public class ServletEjbLocalInjectionTes
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java Wed Dec 28 12:00:47 2011
@@ -82,7 +82,7 @@ public class ServletPersistenceInjection
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java Wed Dec 28 12:00:47 2011
@@ -63,7 +63,7 @@ public class ServletEjbRemoteTest {
}
private void validateTest(String expectedOutput) throws IOException {
- final InputStream is = new URL("http://localhost:9080/" + TEST_NAME + "/" + TEST_NAME).openStream();
+ final InputStream is = new URL("http://localhost:" + System.getProperty("tomee.http.port", "11080") + "/" + TEST_NAME + "/" + TEST_NAME).openStream();
final ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead;
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml?rev=1225164&r1=1225163&r2=1225164&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml Wed Dec 28 12:00:47 2011
@@ -23,8 +23,8 @@
<container qualifier="tomee" default="true">
<configuration>
<property name="dir">/tmp/arquillian-apache-tomee</property>
- <property name="httpPort">9080</property>
- <property name="stopPort">9005</property>
+ <property name="httpPort">11080</property>
+ <property name="stopPort">11005</property>
<property name="tomcatVersion"></property>
<property name="openejbVersion">1.0.0-beta-2-SNAPSHOT</property>
</configuration>