Issue #1809 - update for yajsw compatibility

Former-commit-id: 0e46dc35e2 [formerly dd8d462790 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]]
Former-commit-id: dd8d462790
Former-commit-id: 2411a400f4
This commit is contained in:
Bryan Kowal 2013-03-20 16:45:34 -05:00
parent ea052b14bb
commit 67f2ca23e7

View file

@ -191,8 +191,8 @@ public class Wes2BridgeManager {
/* Disable JMX. */ /* Disable JMX. */
private void updateEdexWrapper(String srcEdexDirectory, String edexDirectory) private void updateEdexWrapper(String srcEdexDirectory, String edexDirectory)
throws FileNotFoundException, IOException { throws FileNotFoundException, IOException {
String srcwrapper_conf = srcEdexDirectory + "/bin/wrapper.conf"; String srcwrapper_conf = srcEdexDirectory + "/conf/wrapper.conf";
String wrapper_conf = edexDirectory + "/bin/wrapper.conf"; String wrapper_conf = edexDirectory + "/conf/wrapper.conf";
BufferedReader br = this.getBufferedReader(srcwrapper_conf); BufferedReader br = this.getBufferedReader(srcwrapper_conf);
BufferedWriter bw = this.getBufferedWriter(wrapper_conf); BufferedWriter bw = this.getBufferedWriter(wrapper_conf);
@ -269,7 +269,7 @@ public class Wes2BridgeManager {
final String line1 = "EDEX_INSTALL="; final String line1 = "EDEX_INSTALL=";
final String line2 = "export DATA_ARCHIVE_ROOT="; final String line2 = "export DATA_ARCHIVE_ROOT=";
final String line3 = "CAMELPROCESS=`ps -ef | grep \"edex.dev.mode\"|grep -c \"edex.run.mode=${1} \" `"; final String line3 = "CAMELPROCESS=`ps -ef | grep \"aw.site.identifier\"|grep -c \"edex.run.mode=${1} \" `";
String line = StringUtils.EMPTY; String line = StringUtils.EMPTY;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {