Author: [email protected]
Date: Wed Jun 13 16:17:32 2012
New Revision: 2492
Log:
[AMDATUCASSANDRA-209] Moved exe args to executable.args property
Modified:
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
Modified:
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
==============================================================================
---
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
(original)
+++
branches/amdatu-cassandra-0.2.5/cassandra-launcher/src/main/java/org/amdatu/cassandra/launcher/service/CassandraLauncherImpl.java
Wed Jun 13 16:17:32 2012
@@ -61,6 +61,7 @@
// Step 2. Run Cassandra
// Step 2a. Setup the configuration to deploy to the Ace process
launcher
String exe = buildExecutable(cassandraHome.getAbsolutePath());
+ String exeArgs = buildExecutableArgs(cassandraHome.getAbsolutePath());
Dictionary properties = new Hashtable();
properties.put("instance.count", "1");
@@ -73,7 +74,7 @@
String lifecycleFilter = "(objectClass=" +
CassandraProcessLifecycleListener.class.getCanonicalName() + ")";
properties.put("executable.processLifecycleListener", lifecycleFilter);
- properties.put("executable.args", "");
+ properties.put("executable.args", exeArgs);
// Step 2b. Deploy the config to Config Admin
try {
@@ -106,6 +107,12 @@
}
private String buildExecutable(String cassandraHome) {
+ String javaHome = m_configurator.getJavaHome();
+ String java = "\"" + javaHome + "/bin/java\" ";
+ return java.replace("\\", "/");
+ }
+
+ private String buildExecutableArgs(String cassandraHome) {
String javaOpts = m_configurator.getJavaOpts();
String systemProperties = m_configurator.getSystemProperties();
int jmxPort = m_configurator.getJmxPort();
@@ -117,11 +124,8 @@
}
// Prepare java executable command
- String sep = File.separator;
- String javaHome = m_configurator.getJavaHome();
StringBuffer exe = new StringBuffer();
- exe.append("\"" + javaHome + sep + "bin" + sep + "java" + "\" "); //
java executable
- exe.append("-ea -javaagent:\"" + cassandraHome + sep + "lib" + sep +
"jamm-0.2.5.jar\""); // javaagent
+ exe.append(("-ea -javaagent:\"" + cassandraHome +
"/lib/jamm-0.2.5.jar\"").replace("\\", "/")); // javaagent
// Append java options
exe.append(" " + javaOpts);
@@ -153,6 +157,6 @@
for (String jar : jars) {
cp.append(File.pathSeparator + "\"" + cassandraHome + "/lib/" +
jar + "\"");
}
- return cp.toString();
+ return cp.toString().replace("\\", "/");
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
