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 10:16:46 UTC
svn commit: r1244407 - in /openejb/trunk/openejb/arquillian-tomee:
arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee-remote/src/test/resources/
arquillian-tomee-webapp-remote/src/main/resources/META-INF/servic...
Author: rmannibucau
Date: Wed Feb 15 09:16:46 2012
New Revision: 1244407
URL: http://svn.apache.org/viewvc?rev=1244407&view=rev
Log:
some fix on arquillian (random port conf + spi error - mea culpa)
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1244407&r1=1244406&r2=1244407&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Wed Feb 15 09:16:46 2012
@@ -20,6 +20,7 @@ import org.apache.openejb.assembler.Depl
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Info;
import org.apache.openejb.loader.Options;
+import org.apache.openejb.util.NetworkUtil;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.container.spi.client.container.DeploymentException;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
@@ -64,6 +65,17 @@ public abstract class TomEEContainer<Con
if (prefixes == null) return;
+ if (configuration.getHttpPort() <= 0) {
+ configuration.setHttpPort(NetworkUtil.getNextAvailablePort());
+ }
+
+ if (configuration.getStopPort() <= 0) {
+ configuration.setStopPort(NetworkUtil.getNextAvailablePort());
+ if (configuration.getHttpPort() == configuration.getStopPort()) {
+ configuration.setStopPort(configuration.getHttpPort() + 1);
+ }
+ }
+
final ObjectMap map = new ObjectMap(configuration);
for (String key : map.keySet()) {
for (String prefix : prefixes.value()) {
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1244407&r1=1244406&r2=1244407&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml Wed Feb 15 09:16:46 2012
@@ -22,10 +22,8 @@
<container qualifier="tomee" default="true">
<configuration>
- <!--
- <property name="httpPort">10080</property>
- <property name="stopPort">10005</property>
- -->
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
<property name="version">1.0.0-beta-3-SNAPSHOT</property>
</configuration>
</container>
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension?rev=1244407&r1=1244406&r2=1244407&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension Wed Feb 15 09:16:46 2012
@@ -1,2 +1 @@
org.apache.tomee.arquillian.webapp.TomEEWebappExtension
-org.apache.tomee.arquillian.webapp.TomEEWebappRemoteExtension
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml?rev=1244407&r1=1244406&r2=1244407&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml Wed Feb 15 09:16:46 2012
@@ -22,10 +22,8 @@
<container qualifier="tomee" default="true">
<configuration>
- <!--
- <property name="httpPort">10080</property>
- <property name="stopPort">10005</property>
- -->
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
<property name="tomcatVersion">7.0.21</property>
<property name="version">4.0.0-beta-3-SNAPSHOT</property>
</configuration>