Author: jgallimore
Date: Mon Oct 3 19:47:17 2011
New Revision: 1178537
URL: http://svn.apache.org/viewvc?rev=1178537&view=rev
Log:
OPENEJB-1687 configure ports when running full TomEE in remote adapter
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?rev=1178537&r1=1178536&r2=1178537&view=diff
==============================================================================
---
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
(original)
+++
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
Mon Oct 3 19:47:17 2011
@@ -80,18 +80,17 @@ public class RemoteTomEEContainer extend
Paths paths = new Paths(new
File(openejbHome.getAbsolutePath(), "/webapps/openejb"));
Installer installer = new Installer(paths, true);
installer.installAll();
-
- Map<String, String> replacements = new
HashMap<String, String>();
- replacements.put("8080",
String.valueOf(configuration.getHttpPort()));
- replacements.put("8005",
String.valueOf(configuration.getStopPort()));
- replace(replacements, new File(openejbHome,
"conf/server.xml"));
}
if (openejbHome == null || (! openejbHome.exists())) {
throw new LifecycleException("Error finding
OPENEJB_HOME");
}
- //FileUtils.deleteOnExit(openejbHome);
+ FileUtils.deleteOnExit(openejbHome);
+ Map<String, String> replacements = new HashMap<String,
String>();
+ replacements.put("8080",
String.valueOf(configuration.getHttpPort()));
+ replacements.put("8005",
String.valueOf(configuration.getStopPort()));
+ replace(replacements, new File(openejbHome,
"conf/server.xml"));
System.setProperty("tomee.http.port",
String.valueOf(configuration.getHttpPort()));
System.setProperty("tomee.shutdown.port",
String.valueOf(configuration.getStopPort()));
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1178537&r1=1178536&r2=1178537&view=diff
==============================================================================
---
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
(original)
+++
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
Mon Oct 3 19:47:17 2011
@@ -43,7 +43,7 @@ public class TomEEContainerTest {
@Test
public void testShouldBeAbleToAccessServletAndEjb() throws Exception {
- InputStream is = new
URL("http://localhost:8080/test/Test";).openStream();
+ InputStream is = new
URL("http://localhost:9080/test/Test";).openStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
int bytesRead = -1;
Modified:
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml?rev=1178537&r1=1178536&r2=1178537&view=diff
==============================================================================
---
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/arquillian-tomee/arquillian-tomee-remote/src/test/resources/arquillian.xml
Mon Oct 3 19:47:17 2011
@@ -23,8 +23,8 @@
<container qualifier="tomee" default="true">
<configuration>
<property name="dir">/tmp/arquillian-apache-tomee</property>
- <property name="httpPort">8080</property>
- <property name="stopPort">8005</property>
+ <property name="httpPort">9080</property>
+ <property name="stopPort">9005</property>
<property name="tomcatVersion"></property>
<property name="openejbVersion">1.0.0-beta-1</property>
</configuration>
