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

Merge "Issue #1809 - update for yajsw compatibility" into omaha_13.3.1

Browse source 
Former-commit-id: 655d80f004cfcdb5de6ba46d3d6272e6e5373abe
This commit is contained in:
Richard Peter 2013-03-20 17:27:20 -05:00 • committed by Gerrit Code Review
commit 13d063234a
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) {