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/02/15 08:21:07 UTC
svn commit: r1244382 - in /openejb/trunk/openejb:
arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/
arquillian-tomee/arquillian-tomee-tests/src/test/resources/
tck/tck-common/src/main/java/org/apache/opene...
Author: rmannibucau
Date: Wed Feb 15 07:21:07 2012
New Revision: 1244382
URL: http://svn.apache.org/viewvc?rev=1244382&view=rev
Log:
some hack to try to use random port with arquillian and uniformize a bit system properties between adapters
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-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.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=1244382&r1=1244381&r2=1244382&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 Wed Feb 15 07:21:07 2012
@@ -75,16 +75,19 @@ public class EmbeddedTomEEContainer exte
configuration.setDir(tomeeConfiguration.getDir());
configuration.setHttpPort(getPortAndShare(TOMEE_ARQUILLIAN_HTTP_PORT, tomeeConfiguration.getHttpPort()));
configuration.setStopPort(getPortAndShare(TOMEE_ARQUILLIAN_STOP_PORT, tomeeConfiguration.getStopPort()));
-
return configuration;
}
- private int getPortAndShare(String systemPropName, int value) {
+ private static int getPortAndShare(String systemPropName, int value) {
int port = value;
if (port <= 0) {
port = NetworkUtil.getNextAvailablePort();
}
System.setProperty(systemPropName, Integer.toString(port));
+
+ // some hack to simply be able to use the same system property than other adapters
+ System.setProperty(systemPropName.replace(".arquillian", "") + ".port", Integer.toString(port));
+
return port;
}
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=1244382&r1=1244381&r2=1244382&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 Feb 15 07:21:07 2012
@@ -19,12 +19,13 @@
<arquillian
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
<container qualifier="tomee" default="true">
<configuration>
<property name="dir">/tmp/arquillian-apache-tomee</property>
+ <!-- please let them be random and use the system property to get them
<property name="httpPort">11080</property>
<property name="stopPort">11005</property>
+ -->
</configuration>
</container>
</arquillian>
\ No newline at end of file
Modified: openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java?rev=1244382&r1=1244381&r2=1244382&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java (original)
+++ openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/FullRestartContainer.java Wed Feb 15 07:21:07 2012
@@ -27,10 +27,8 @@ import org.jboss.testharness.spi.Contain
import javax.naming.Context;
import javax.naming.InitialContext;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.Properties;
/**