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/09/27 18:37:08 UTC
svn commit: r1391090 - in /openejb/branches/openejb-4.5.0:
arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/
container/openejb-cor...
Author: dblevins
Date: Thu Sep 27 16:37:07 2012
New Revision: 1391090
URL: http://svn.apache.org/viewvc?rev=1391090&view=rev
Log:
svn merge -r 1390993:1390994 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1390994
------------------------------------------------------------------------
r1390994 | rmannibucau | 2012-09-27 08:16:57 -0500 (Thu, 27 Sep 2012) | 1 line
integrating stophost and stopcommand in remote tomee arquillian adapter
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Modified: openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java?rev=1391090&r1=1391089&r2=1391090&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java (original)
+++ openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java Thu Sep 27 16:37:07 2012
@@ -153,7 +153,7 @@ public class TomEEConfiguration implemen
}
public String getStopCommand() {
- return stopCommand + Character.toString((char) -1); // last char to avoid warning/error log message
+ return stopCommand + Character.toString((char) 0); // last char to avoid warning/error log message
}
public void setStopCommand(String stopCommand) {
Modified: openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java?rev=1391090&r1=1391089&r2=1391090&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java (original)
+++ openejb/branches/openejb-4.5.0/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java Thu Sep 27 16:37:07 2012
@@ -56,6 +56,7 @@ public class RemoteTomEEContainer extend
final String shutdownPort = System.getProperty(RemoteServer.SERVER_SHUTDOWN_PORT);
final String shutdownHost = System.getProperty(RemoteServer.SERVER_SHUTDOWN_HOST);
+ final String shutdownCommand = System.getProperty(RemoteServer.SERVER_SHUTDOWN_COMMAND);
final String debug = System.getProperty(RemoteServer.OPENEJB_SERVER_DEBUG);
final String debugPort = System.getProperty(RemoteServer.SERVER_DEBUG_PORT);
@@ -64,7 +65,8 @@ public class RemoteTomEEContainer extend
configure();
System.setProperty(RemoteServer.SERVER_SHUTDOWN_PORT, Integer.toString(configuration.getStopPort()));
- System.setProperty(RemoteServer.SERVER_SHUTDOWN_HOST, configuration.getHost());
+ System.setProperty(RemoteServer.SERVER_SHUTDOWN_COMMAND, configuration.getStopCommand());
+ System.setProperty(RemoteServer.SERVER_SHUTDOWN_HOST, configuration.getStopHost());
if (configuration.isDebug()) {
System.setProperty(RemoteServer.OPENEJB_SERVER_DEBUG, "true");
System.setProperty(RemoteServer.SERVER_DEBUG_PORT, Integer.toString(configuration.getDebugPort()));
@@ -78,6 +80,7 @@ public class RemoteTomEEContainer extend
} finally {
resetSystemProperty(RemoteServer.SERVER_SHUTDOWN_PORT, shutdownPort);
resetSystemProperty(RemoteServer.SERVER_SHUTDOWN_HOST, shutdownHost);
+ resetSystemProperty(RemoteServer.SERVER_SHUTDOWN_COMMAND, shutdownCommand);
resetSystemProperty(RemoteServer.OPENEJB_SERVER_DEBUG, debug);
resetSystemProperty(RemoteServer.SERVER_DEBUG_PORT, debugPort);
}
Modified: openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1391090&r1=1391089&r2=1391090&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/branches/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Thu Sep 27 16:37:07 2012
@@ -40,6 +40,7 @@ public class RemoteServer {
public static final String SERVER_DEBUG_PORT = "server.debug.port";
public static final String SERVER_SHUTDOWN_PORT = "server.shutdown.port";
public static final String SERVER_SHUTDOWN_HOST = "server.shutdown.host";
+ public static final String SERVER_SHUTDOWN_COMMAND = "server.shutdown.command";
public static final String OPENEJB_SERVER_DEBUG = "openejb.server.debug";
private final boolean debug = options.get(OPENEJB_SERVER_DEBUG, false);
@@ -58,6 +59,7 @@ public class RemoteServer {
private final boolean verbose;
private final int shutdownPort;
private final String host;
+ private final String command;
public RemoteServer() {
this(options.get("connect.tries", 60), options.get("verbose", false));
@@ -70,6 +72,7 @@ public class RemoteServer {
tomcat = (home != null) && (new File(new File(home, "bin"), "catalina.sh").exists());
shutdownPort = options.get(SERVER_SHUTDOWN_PORT, tomcat ? 8005 : 4200);
+ command = options.get(SERVER_SHUTDOWN_COMMAND, "SHUTDOWN");
host = options.get(SERVER_SHUTDOWN_HOST, "localhost");
}
@@ -417,13 +420,13 @@ public class RemoteServer {
System.out.println("[] STOP SERVER");
}
- String command = "SHUTDOWN" + Character.toString((char) 0); // SHUTDOWN + EOF
+ String fcommand = command + Character.toString((char) 0); // SHUTDOWN + EOF
Socket socket = null;
try {
socket= new Socket(host, shutdownPort);
OutputStream out = socket.getOutputStream();
- out.write(command.getBytes());
+ out.write(fcommand.getBytes());
} finally {
if (socket != null) {
socket.close();