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 21:30:37 UTC
svn commit: r1244691 - in /openejb/trunk/openejb:
arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
arquillian-tomee/a...
Author: rmannibucau
Date: Wed Feb 15 20:30:36 2012
New Revision: 1244691
URL: http://svn.apache.org/viewvc?rev=1244691&view=rev
Log:
adding ajp config (not so useful but can avoid port conflicts)
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
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/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-webapp-remote/src/test/resources/arquillian.xml
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1244691&r1=1244690&r2=1244691&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Wed Feb 15 20:30:36 2012
@@ -40,6 +40,7 @@ import java.util.Map;
public class Setup {
public static void exportProperties(File openejbHome, TomEEConfiguration c) {
System.setProperty("tomee.http.port", String.valueOf(c.getHttpPort()));
+ System.setProperty("tomee.ajp.port", String.valueOf(c.getAjpPort()));
System.setProperty("tomee.shutdown.port", String.valueOf(c.getStopPort()));
System.setProperty("java.naming.provider.url", "http://localhost:" + c.getHttpPort() + "/tomee/ejb");
System.setProperty("connect.tries", "90");
@@ -53,6 +54,7 @@ public class Setup {
final Map<String, String> replacements = new HashMap<String, String>();
replacements.put("8080", String.valueOf(c.getHttpPort()));
replacements.put("8005", String.valueOf(c.getStopPort()));
+ replacements.put("8009", String.valueOf(c.getAjpPort()));
final String s = File.separator;
replace(replacements, new File(openejbHome, "conf" + s + "server.xml"));
}
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1244691&r1=1244690&r2=1244691&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Wed Feb 15 20:30:36 2012
@@ -29,6 +29,7 @@ import java.util.Properties;
public class TomEEConfiguration implements ContainerConfiguration {
private int httpPort = 8080;
+ private int ajpPort = 8009;
private int stopPort = 8005;
private String dir = System.getProperty("java.io.tmpdir") + "/arquillian-apache-tomee";
private String systemProperties = "";
@@ -49,6 +50,14 @@ public class TomEEConfiguration implemen
this.stopPort = stopPort;
}
+ public int getAjpPort() {
+ return ajpPort;
+ }
+
+ public void setAjpPort(int ajpPort) {
+ this.ajpPort = ajpPort;
+ }
+
public String getDir() {
return dir;
}
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=1244691&r1=1244690&r2=1244691&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 20:30:36 2012
@@ -76,6 +76,14 @@ public abstract class TomEEContainer<Con
}
}
+ // only for remote cases
+ if (configuration.getAjpPort() <= 0) {
+ configuration.setAjpPort(NetworkUtil.getNextAvailablePort());
+ if (configuration.getAjpPort() == configuration.getStopPort() || configuration.getAjpPort() == configuration.getHttpPort()) {
+ configuration.setAjpPort(Math.max(configuration.getHttpPort(), configuration.getStopPort()) + 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/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1244691&r1=1244690&r2=1244691&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Wed Feb 15 20:30:36 2012
@@ -46,6 +46,10 @@ public class RemoteTomEEContainer extend
configuration.setStopPort(Integer.parseInt(System.getProperty("tomee.shutdown.port")));
}
+ if (System.getProperty("tomee.ajp.port") != null) {
+ configuration.setStopPort(Integer.parseInt(System.getProperty("tomee.ajp.port")));
+ }
+
// see if TomEE is already running by checking the http port
if (Setup.isRunning(configuration.getHttpPort())) {
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=1244691&r1=1244690&r2=1244691&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 20:30:36 2012
@@ -24,6 +24,7 @@
<configuration>
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
+ <property name="ajpPort">-1</property>
<property name="version">1.0.0-beta-3-SNAPSHOT</property>
</configuration>
</container>
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=1244691&r1=1244690&r2=1244691&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 20:30:36 2012
@@ -23,6 +23,7 @@
<configuration>
<property name="dir">/tmp/arquillian-apache-tomee</property>
<property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
</configuration>
</container>
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=1244691&r1=1244690&r2=1244691&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 20:30:36 2012
@@ -23,6 +23,7 @@
<container qualifier="tomee" default="true">
<configuration>
<property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="tomcatVersion">7.0.21</property>
<property name="version">4.0.0-beta-3-SNAPSHOT</property>
Modified: openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java?rev=1244691&r1=1244690&r2=1244691&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Configuration.java Wed Feb 15 20:30:36 2012
@@ -22,6 +22,7 @@ package org.apache.tomee.embedded;
public class Configuration {
private int httpPort = 8080;
+ private int ajpPort = 8009;
private int stopPort = 8005;
protected String dir;
@@ -41,6 +42,14 @@ public class Configuration {
this.stopPort = stopPort;
}
+ public int getAjpPort() {
+ return ajpPort;
+ }
+
+ public void setAjpPort(int ajpPort) {
+ this.ajpPort = ajpPort;
+ }
+
public String getDir() {
return dir;
}