You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/09/29 01:33:49 UTC
svn commit: r1177108 - in /openejb/trunk/sandbox/arquillian-tomee: ./
arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/
Author: jgallimore
Date: Wed Sep 28 23:33:49 2011
New Revision: 1177108
URL: http://svn.apache.org/viewvc?rev=1177108&view=rev
Log:
OPENEJB-1687 consolidate remote adapters
Removed:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/ContainersImplTomEE.java
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/sandbox/arquillian-tomee/pom.xml
Modified: openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java?rev=1177108&r1=1177107&r2=1177108&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-remote-with-zip/src/main/java/org/apache/openejb/arquillian/remote/RemoteTomEEContainer.java Wed Sep 28 23:33:49 2011
@@ -17,6 +17,8 @@
package org.apache.openejb.arquillian.remote;
import java.io.File;
+import java.io.OutputStream;
+import java.net.Socket;
import java.util.Collection;
import org.apache.openejb.arquillian.common.SimpleMavenBuilderImpl;
@@ -31,8 +33,20 @@ public class RemoteTomEEContainer extend
private static final String OPENEJB_VERSION = "4.0.0-beta-1-SNAPSHOT";
private RemoteServer container;
+ private boolean needsStart = false;
public void start() throws LifecycleException {
+ // see if TomEE is already running by checking the http port
+ try {
+ connect(configuration.getHttpPort());
+ } catch (Exception e) {
+ needsStart = true;
+ }
+
+ if (! needsStart) {
+ return;
+ }
+
File catalinaDirectory = new File(configuration.getDir());
catalinaDirectory.mkdirs();
@@ -84,6 +98,15 @@ public class RemoteTomEEContainer extend
}
public void stop() throws LifecycleException {
- container.stop();
+ // only stop the container if we started it
+ if (needsStart) {
+ container.stop();
+ }
+ }
+
+ public void connect(int port) throws Exception {
+ Socket socket = new Socket("localhost", port);
+ OutputStream out = socket.getOutputStream();
+ out.close();
}
}
Modified: openejb/trunk/sandbox/arquillian-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/pom.xml?rev=1177108&r1=1177107&r2=1177108&view=diff
==============================================================================
--- openejb/trunk/sandbox/arquillian-tomee/pom.xml (original)
+++ openejb/trunk/sandbox/arquillian-tomee/pom.xml Wed Sep 28 23:33:49 2011
@@ -54,7 +54,6 @@
<module>common</module>
<module>arquillian-tomee-embedded</module>
<module>arquillian-tomee-embedded-using-war</module>
- <module>arquillian-tomee-remote</module>
<module>arquillian-tomee-remote-with-zip</module>
<module>moviefun-example</module>
<module>tests</module>
@@ -72,4 +71,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>