Author: rmannibucau
Date: Fri Jan 4 19:03:25 2013
New Revision: 1429038
URL: http://svn.apache.org/viewvc?rev=1429038&view=rev
Log:
waiting tomee in destroy method of remoteserver
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/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.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=1429038&r1=1429037&r2=1429038&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 19:03:25 2013
@@ -224,14 +224,7 @@ public class RemoteTomEEContainer extend
// only stop the container if we started it
if (shutdown) {
Setup.removeArquillianBeanDiscoverer(tomeeHome);
- container.stop();
- if (container.getServer() != null) {
- try {
- container.getServer().waitFor();
- } catch (InterruptedException e) {
- throw new LifecycleException(e.getMessage(), e);
- }
- }
+ container.destroy();
}
}
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=1429038&r1=1429037&r2=1429038&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 19:03:25 2013
@@ -127,7 +127,7 @@ public class TomEEWebappContainer extend
}
if (logger.isLoggable(Level.FINE)) {
- Map<Object, Object> map = new TreeMap(System.getProperties());
+ Map<Object, Object> map = new TreeMap<Object,
Object>(System.getProperties());
for (Map.Entry<Object, Object> entry : map.entrySet()) {
System.out.printf("%s = %s\n", entry.getKey(),
entry.getValue());
}
@@ -138,18 +138,15 @@ public class TomEEWebappContainer extend
if (!wereOpenejbHomeSet && configuration.isUseInstallerServlet()) {
// instead of calling the Installer, let's just do like users
do
// call the servlet installer instead
- StringBuilder baseUrl = new StringBuilder("http://";)
- .append(configuration.getHost())
- .append(":")
- .append(configuration.getHttpPort())
- .append("/tomee/installer");
+ String baseUrl = "http://"; + configuration.getHost() + ":" +
configuration.getHttpPort() + "/tomee/installer";
+ assert installer != null;
installer.addTomEEAdminConfInTomcatUsers(true);
RemoteServer tmpContainer = new RemoteServer();
tmpContainer.start();
- URL url = new URL(baseUrl.toString());
+ URL url = new URL(baseUrl);
URLConnection uc = url.openConnection();
// dG9tZWU6dG9tZWU= --> Base64 of tomee:tomee
String authorizationString = "Basic dG9tZWU6dG9tZWU=";
@@ -216,12 +213,7 @@ public class TomEEWebappContainer extend
// only stop the container if we started it
if (shutdown) {
Setup.removeArquillianBeanDiscoverer(openejbHome);
- container.stop();
- try {
- container.getServer().waitFor();
- } catch (InterruptedException e) {
- throw new LifecycleException(e.getMessage(), e);
- }
+ container.destroy();
}
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1429038&r1=1429037&r2=1429038&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Fri Jan 4 19:03:25 2013
@@ -110,6 +110,13 @@ public class RemoteServer {
public void destroy() {
stop();
+ if (server != null) {
+ try {
+ server.waitFor();
+ } catch (InterruptedException e) {
+ // no-op
+ }
+ }
}
public void start() {
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=1429038&r1=1429037&r2=1429038&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 19:03:25 2013
@@ -155,13 +155,6 @@ public class ContainersImplTomEE extends
@Override
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);
- }
- }
+ server.destroy();
}
}
