Author: rmannibucau
Date: Mon Aug 20 23:06:46 2012
New Revision: 1375298
URL: http://svn.apache.org/viewvc?rev=1375298&view=rev
Log:
quick and very dirty hack to try to get some info on buildbot
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1375298&r1=1375297&r2=1375298&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Mon Aug 20 23:06:46 2012
@@ -336,18 +336,13 @@ public abstract class TomEEContainer<Con
e.printStackTrace();
throw new DeploymentException("Unable to undeploy " +
archive.getName(), e);
} finally {
- try {
- LOGGER.info("cleaning " + deployed.file.getAbsolutePath());
- Files.delete(deployed.file); // "i" folder
-
- final File pathFile = new File(deployed.path);
- if (!deployed.path.equals(deployed.file.getAbsolutePath()) &&
pathFile.exists()) {
- LOGGER.info("cleaning " + pathFile);
- Files.delete(pathFile);
- }
- } catch (Throwable t) {
- t.printStackTrace();
- System.out.println(">>>>> here it is");
+ LOGGER.info("cleaning " + deployed.file.getAbsolutePath());
+ Files.delete(deployed.file); // "i" folder
+
+ final File pathFile = new File(deployed.path);
+ if (!deployed.path.equals(deployed.file.getAbsolutePath()) &&
pathFile.exists()) {
+ LOGGER.info("cleaning " + pathFile);
+ Files.delete(pathFile);
}
}
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1375298&r1=1375297&r2=1375298&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Mon Aug 20
23:06:46 2012
@@ -149,7 +149,7 @@
<version>2.12</version>
<executions>
<execution>
- <id>test-tomee-embedded</id>
+ <id>test-tomee-remote</id>
<phase>test</phase>
<goals>
<goal>test</goal>
@@ -158,13 +158,14 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
- <arquillian.launch>tomee-embedded</arquillian.launch>
-
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
+ <tomee.classifier>${distribution.under.test}</tomee.classifier>
+ <arquillian.launch>tomee-remote</arquillian.launch>
+
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
- <id>test-tomee-remote</id>
+ <id>test-tomee-embedded</id>
<phase>test</phase>
<goals>
<goal>test</goal>
@@ -173,9 +174,8 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<tomee.version>${tomee.version}</tomee.version>
- <tomee.classifier>${distribution.under.test}</tomee.classifier>
- <arquillian.launch>tomee-remote</arquillian.launch>
-
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
+ <arquillian.launch>tomee-embedded</arquillian.launch>
+
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
</configuration>
</execution>
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=1375298&r1=1375297&r2=1375298&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
Mon Aug 20 23:06:46 2012
@@ -24,6 +24,7 @@ import org.apache.openejb.util.Pipe;
import java.io.File;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
@@ -284,6 +285,58 @@ public class RemoteServer {
System.out.println(Join.join("\n", args));
}
+ // tmp
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ setName("[DEBUG] Dump Observer");
+
+ boolean end = false;
+ int i = 0;
+ while (!end) {
+ try {
+ if (server == null) {
+ throw new IllegalThreadStateException();
+ }
+ server.exitValue();
+ end = true;
+ } catch (IllegalThreadStateException e) {
+ i++;
+ if (i == 5) {
+ try {
+
Thread.sleep(Integer.getInteger("sleep", 5000 * 60));
+ final Field f =
server.getClass().getDeclaredField("pid");
+ f.setAccessible(true);
+ int pid = (Integer) f.get(server);
+
Pipe.pipe(Runtime.getRuntime().exec("kill -3 " + pid));
+ } catch (Exception e1) {
+ e1.printStackTrace(); //To change
body of catch statement use File | Settings | File Templates.
+ }
+ /*
+ // continue ;)
+ try {
+ int n = Thread.activeCount();
+ Thread[] th = new Thread[n];
+ int nb = Thread.enumerate(th);
+ for (int i = 0; i < nb; i++) {
+ for (StackTraceElement elt :
th[nb].getStackTrace()) {
+ System.out.println("\tat " +
elt);
+ }
+ }
+ } catch (InterruptedException e1) {
+ // stop
+ }
+ */
+ i = 0;
+ }
+ }
+ }
+ }
+ };
+ t.setDaemon(true);
+ t.start();
+ // end tmp
+
server = Runtime.getRuntime().exec(args);
Pipe.pipe(server);
