xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1809 - update for yajsw compatibility

Browse source 
Former-commit-id: 67f2ca23e7 [formerly 2411a400f4] [formerly dd8d462790] [formerly 67f2ca23e7 [formerly 2411a400f4] [formerly dd8d462790] [formerly 0e46dc35e2 [formerly dd8d462790 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]]]]
Former-commit-id: 0e46dc35e2
Former-commit-id: 5d1cab4bdb [formerly 1f5e019852] [formerly a5e7ec737f85d935d5bf1bfc470224d8f5ad6ec6 [formerly 585f7858bd]]
Former-commit-id: 1ddb23df4009765335471aaf048f382ffe5d8a1d [formerly 5933b30f81]
Former-commit-id: ecf8436e50
This commit is contained in:
Bryan Kowal 2013-03-20 16:45:34 -05:00
parent 2b05476c98
commit 9aba2c43d0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
View file

@ -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) {