You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/22 04:30:06 UTC

svn commit: r1328777 - in /openejb/branches/openejb-4.0.0: arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/ container/openejb-core/src/main/java/org/apache/openejb/config/ maven/tomee-maven-plugin/src/mai...

Author: dblevins
Date: Sun Apr 22 02:30:06 2012
New Revision: 1328777

URL: http://svn.apache.org/viewvc?rev=1328777&view=rev
Log:
Reduces Arquillian complications on windows due to forking and 0.0.0.0 usage

Modified:
    openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
    openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
    openejb/branches/openejb-4.0.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1328777&r1=1328776&r2=1328777&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Sun Apr 22 02:30:06 2012
@@ -112,7 +112,7 @@ public class EmbeddedTomEEContainer exte
 
             AppContext appContext = container.deploy(name, file);
 
-            HTTPContext httpContext = new HTTPContext("0.0.0.0", configuration.getHttpPort());
+            HTTPContext httpContext = new HTTPContext("localhost", configuration.getHttpPort());
             httpContext.add(new Servlet("ArquillianServletRunner", "/" + getArchiveNameWithoutExtension(archive)));
             beanManagerInstance.set(appContext.getBeanManager());
             return new ProtocolMetaData().addContext(httpContext);

Modified: openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1328777&r1=1328776&r2=1328777&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/branches/openejb-4.0.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Sun Apr 22 02:30:06 2012
@@ -271,7 +271,7 @@ public class RemoteServer {
                 }
 
                 final boolean isWindows = System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");
-                if (isWindows && "start".equals(cmd)) {
+                if (isWindows && "start".equals(cmd) && options.get("server.windows.fork", false)) {
                     // to fork
                     final List<String> winList = new ArrayList<String>();
                     winList.add("cmd");

Modified: openejb/branches/openejb-4.0.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1328777&r1=1328776&r2=1328777&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/branches/openejb-4.0.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Sun Apr 22 02:30:06 2012
@@ -375,6 +375,8 @@ public abstract class AbstractTomEEMojo 
             System.setProperty("server.debug.port", Integer.toString(debugPort));
         }
 
+        System.setProperty("server.windows.fork", "true");
+
         final List<String> strings = new ArrayList<String>();
         if (systemVariables != null) {
             for (Map.Entry<String, String> entry : systemVariables.entrySet()) {