modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
| 45 +++-------
1 file changed, 16 insertions(+), 29 deletions(-)
New commits:
commit 5d4cbc74c9b0519e79359b5a269b4516f6587773
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Oct 31 22:14:34 2013 +0100
Bug 1024331 - Storage node does not start in console mode on windows
CommandLine object was incorrectly created
diff --git
a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
index d9fc6d1..46d4d9a 100644
---
a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
+++
b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java
@@ -1,26 +1,20 @@
/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2013 Red Hat, Inc.
+ * All rights reserved.
*
- * * RHQ Management Platform
- * * Copyright (C) 2005-2012 Red Hat, Inc.
- * * All rights reserved.
- * *
- * * This program is free software; you can redistribute it and/or modify
- * * it under the terms of the GNU General Public License, version 2, as
- * * published by the Free Software Foundation, and/or the GNU Lesser
- * * General Public License, version 2.1, also as published by the Free
- * * Software Foundation.
- * *
- * * This program is distributed in the hope that it will be useful,
- * * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * * GNU General Public License and the GNU Lesser General Public License
- * * for more details.
- * *
- * * You should have received a copy of the GNU General Public License
- * * and the GNU Lesser General Public License along with this program;
- * * if not, write to the Free Software Foundation, Inc.,
- * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
package org.rhq.server.control.command;
@@ -112,15 +106,8 @@ public class Console extends ControlCommand {
File storageBinDir = new File(getStorageBasedir(), "bin");
- String startScript;
- if (isWindows()) {
- startScript = "./cassandra.bat";
- } else {
- startScript = "./cassandra";
- }
-
- org.apache.commons.exec.CommandLine commandLine = new
org.apache.commons.exec.CommandLine(startScript)
- .addArgument("-f");
+ org.apache.commons.exec.CommandLine commandLine = new
org.apache.commons.exec.CommandLine(getCommandLine(false,
+ "cassandra", "-f"));
Executor exeuctor = new DefaultExecutor();
exeuctor.setWorkingDirectory(storageBinDir);
exeuctor.setStreamHandler(new PumpStreamHandler());
Show replies by date