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 2013/01/04 19:58:46 UTC
svn commit: r1429031 - in /openejb/trunk/openejb:
arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/
tck/tck-common/src/main/j...
Author: rmannibucau
Date: Fri Jan 4 18:58:46 2013
New Revision: 1429031
URL: http://svn.apache.org/viewvc?rev=1429031&view=rev
Log:
waiting for tomee shutdown when stopping it
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1429031&r1=1429030&r2=1429031&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Fri Jan 4 18:58:46 2013
@@ -225,6 +225,13 @@ public class RemoteTomEEContainer extend
if (shutdown) {
Setup.removeArquillianBeanDiscoverer(tomeeHome);
container.stop();
+ if (container.getServer() != null) {
+ try {
+ container.getServer().waitFor();
+ } catch (InterruptedException e) {
+ throw new LifecycleException(e.getMessage(), e);
+ }
+ }
}
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java?rev=1429031&r1=1429030&r2=1429031&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java Fri Jan 4 18:58:46 2013
@@ -22,7 +22,6 @@ import org.apache.openejb.arquillian.com
import org.apache.openejb.arquillian.common.TomEEContainer;
import org.apache.openejb.arquillian.common.Zips;
import org.apache.openejb.config.RemoteServer;
-import org.apache.openejb.util.Base64;
import org.apache.tomee.installer.Installer;
import org.apache.tomee.installer.Paths;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
@@ -160,6 +159,7 @@ public class TomEEWebappContainer extend
is.close();
tmpContainer.stop();
+ tmpContainer.getServer().waitFor();
}
container = new RemoteServer();
@@ -217,6 +217,11 @@ public class TomEEWebappContainer extend
if (shutdown) {
Setup.removeArquillianBeanDiscoverer(openejbHome);
container.stop();
+ try {
+ container.getServer().waitFor();
+ } catch (InterruptedException e) {
+ throw new LifecycleException(e.getMessage(), e);
+ }
}
}
Modified: openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1429031&r1=1429030&r2=1429031&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java (original)
+++ openejb/trunk/openejb/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java Fri Jan 4 18:58:46 2013
@@ -156,5 +156,12 @@ public class ContainersImplTomEE extends
public void cleanup() throws IOException {
System.out.println("Cleanup called");
server.stop();
+ if (server.getServer() != null) {
+ try {
+ server.getServer().waitFor();
+ } catch (InterruptedException e) {
+ e.printStackTrace(System.err);
+ }
+ }
}
}