Author: rmannibucau
Date: Fri May 4 18:02:34 2012
New Revision: 1334104
URL: http://svn.apache.org/viewvc?rev=1334104&view=rev
Log:
fixing ITTomEERunner (some API changed)
Modified:
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/ITTomEERunner.java
Modified:
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/ITTomEERunner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/ITTomEERunner.java?rev=1334104&r1=1334103&r2=1334104&view=diff
==============================================================================
---
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/ITTomEERunner.java
(original)
+++
openejb/trunk/openejb/itests/openejb-tomee-itest/src/main/java/org/apache/openejb/itest/tomee/ITTomEERunner.java
Fri May 4 18:02:34 2012
@@ -108,23 +108,17 @@ public class ITTomEERunner extends Block
Files.mkdirs(tomee);
Zips.unzip(info.server, tomee, true);
- final TomEEConfiguration config = new TomEEConfiguration();
if (info.httpPort <= 0) {
info.httpPort = NetworkUtil.getNextAvailablePort();
}
- config.setHttpPort(info.httpPort);
-
if (info.shutdownPort <= 0) {
info.shutdownPort = info.httpPort + 1;
}
- config.setStopPort(NetworkUtil.getNextAvailablePort());
-
if (info.ajpPort <= 0) {
info.ajpPort = info.shutdownPort + 1;
}
- config.setAjpPort(NetworkUtil.getNextAvailablePort());
- Setup.updateServerXml(tomee, config, 8080, 8005, 8009);
+ Setup.updateServerXml(tomee, info.httpPort, info.shutdownPort,
info.ajpPort);
if (info.clean) { // speed up a bit
Setup.removeUselessWebapps(tomee);
@@ -139,7 +133,7 @@ public class ITTomEERunner extends Block
// start the server
System.setProperty(OPENEJB_HOME, tomee.getCanonicalPath());
- System.setProperty(SERVER_SHUTDOWN_PORT,
Integer.toString(config.getStopPort()));
+ System.setProperty(SERVER_SHUTDOWN_PORT,
Integer.toString(info.shutdownPort));
remoteServers[i] = new
RemoteServer(Integer.getInteger(TOMEE_TEST_IT_RETRIES, 100), true);
remoteServers[i].start();