From 67f2ca23e7be8b6a8714066f51966a214ad4a66a Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Wed, 20 Mar 2013 16:45:34 -0500 Subject: [PATCH] Issue #1809 - update for yajsw compatibility Former-commit-id: 0e46dc35e206251b31c67571f0ea8a0319562eaa [formerly dd8d462790ac016ae7009deb5bfb75427f7320e8 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]] Former-commit-id: dd8d462790ac016ae7009deb5bfb75427f7320e8 Former-commit-id: 2411a400f418d187dd135584f9312dbccfc87a96 --- .../com/raytheon/wes2bridge/manager/Wes2BridgeManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java index 9cb4d9b3f0..ac28e175cc 100644 --- a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java +++ b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java @@ -191,8 +191,8 @@ public class Wes2BridgeManager { /* Disable JMX. */ private void updateEdexWrapper(String srcEdexDirectory, String edexDirectory) throws FileNotFoundException, IOException { - String srcwrapper_conf = srcEdexDirectory + "/bin/wrapper.conf"; - String wrapper_conf = edexDirectory + "/bin/wrapper.conf"; + String srcwrapper_conf = srcEdexDirectory + "/conf/wrapper.conf"; + String wrapper_conf = edexDirectory + "/conf/wrapper.conf"; BufferedReader br = this.getBufferedReader(srcwrapper_conf); BufferedWriter bw = this.getBufferedWriter(wrapper_conf); @@ -269,7 +269,7 @@ public class Wes2BridgeManager { final String line1 = "EDEX_INSTALL="; 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; while ((line = br.readLine()) != null) {