Author: rmannibucau
Date: Mon Aug 20 23:08:25 2012
New Revision: 1375299
URL: http://svn.apache.org/viewvc?rev=1375299&view=rev
Log:
reseting to previous code and config
Modified:
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-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1375299&r1=1375298&r2=1375299&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:08:25 2012
@@ -149,7 +149,7 @@
<version>2.12</version>
<executions>
<execution>
- <id>test-tomee-remote</id>
+ <id>test-tomee-embedded</id>
<phase>test</phase>
<goals>
<goal>test</goal>
@@ -158,14 +158,13 @@
<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>
<execution>
- <id>test-tomee-embedded</id>
+ <id>test-tomee-remote</id>
<phase>test</phase>
<goals>
<goal>test</goal>
@@ -174,8 +173,9 @@
<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>
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=1375299&r1=1375298&r2=1375299&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:08:25 2012
@@ -17,17 +17,14 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.Options;
import org.apache.openejb.util.Join;
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;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -286,6 +283,7 @@ public class RemoteServer {
}
// tmp
+ /*
Thread t = new Thread() {
@Override
public void run() {
@@ -312,21 +310,6 @@ public class RemoteServer {
} 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;
}
}
@@ -335,6 +318,7 @@ public class RemoteServer {
};
t.setDaemon(true);
t.start();
+ */
// end tmp
server = Runtime.getRuntime().exec(args);
