From f1b0e60b8e6d3b22088624cc7f417219ac0b98bb Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Mon, 25 Mar 2013 12:01:28 -0500 Subject: [PATCH] Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode. - keep a log of every source file that has been modified for AWIPS II - identify the modification with a comment Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc Former-commit-id: 0cc63cbb2184d71e867de5a41d6d22b01628c7fd [formerly 09263dbf8c302cb3890b983aa42889bd08b1c138] [formerly 9e647beded850999ea22bad19d53d9f42edd8fb9] [formerly 6758a9a50dc3d3191540d23bc03a6f2b1f8d58d6 [formerly 9e647beded850999ea22bad19d53d9f42edd8fb9 [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]] Former-commit-id: 6758a9a50dc3d3191540d23bc03a6f2b1f8d58d6 Former-commit-id: b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d9302ac1b215e0b47f9df3f8b45fcc2] Former-commit-id: 1eba8622d4d1f8d8e1dd1de9e3eadd159533631d --- edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar | Bin 793319 -> 793321 bytes .../build.edex/esb/bin/yajsw/wrapperApp.jar | Bin 38055 -> 38055 bytes javaUtilities/yajsw/modifiedSource.txt | 7 +++ .../main/java/org/rzo/yajsw/WrapperExe.java | 6 ++- .../org/rzo/yajsw/app/WrapperManagerImpl.java | 16 +++++- .../org/rzo/yajsw/os/posix/PosixProcess.java | 48 ++++++++++++++++-- .../rzo/yajsw/os/posix/bsd/AppStarter.java | 4 ++ .../rzo/yajsw/os/posix/bsd/BSDProcess.java | 16 +++++- .../yajsw/wrapper/AbstractWrappedProcess.java | 33 +++++++++--- .../rzo/yajsw/wrapper/WrappedJavaProcess.java | 28 ++++++++-- 10 files changed, 138 insertions(+), 20 deletions(-) create mode 100644 javaUtilities/yajsw/modifiedSource.txt diff --git a/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar b/edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar index 6b7c007d02475578ad33d3afd7a51dd66bba2f9d..53ea4b5f283e2f19958f85602a965cc9ef37e7fd 100644 GIT binary patch delta 22821 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 BOO^lt delta 22866 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 G9RCk9Bsw(! diff --git a/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar b/edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar index 35a55099c5eb8f5df41be9827cbfdfee490d31fa..6969da7c2660bd836cd314c55f1cb0ecd6d8a573 100644 GIT binary patch delta 525 zcmXZWJ4ixd6bEpt)hTb9d_YTyG3#1j|LiBl9rm98QA0>a9Uj_v@4BP%wpT`R($__v`+w+?v)~2k zT>7B=NaTk8e=S#O-DB*V>gAO%)zxdKGR&{+#G9abe~i{{a)w4ITybVl=WvA3%Z~y- zKMs!gY4FU?0exZ~a0xf4CVaq_Q3>v(2G8|m2)rg;K%eq}-9KJZc0}5=7i^`2pqh>W zTV@I*G7F%VSp?SX2B>8HpgTtwtmbIvQ;vT2y$T7JfNk-SoF=XZ|0NYc1QRBs6nJ-PA_e|ci&NY+b5?u73d_-gFkf1S?Gdv zEq+jbIC?|>zm}@B?lJyN_40Cr>YCM4Ip$Y(wwj=2f0Wj4B#ezvxJp<+J%J;Hp5zD! zCda^0atb^r{lLJ@f&}LQRW1PRS+(FvY4Kc3g~4me4Gd{7*!|-r?Lef<_`qf+1ge=h zuxBR$mz@K(>;kam)MC!T)x=I2p6$kRP _shutdownHooks = new ArrayList(); @@ -1019,7 +1025,11 @@ public abstract class AbstractWrappedProcess implements WrappedProcess, Constant { _controller.processStarted(); _totalRestartCount++; - postStart(); + postStart(); + /* + * bkowal + * Suppress extraneous output unless debug is enabled. + */ if (_debug) { getWrapperLogger().info("started process with pid " + _osProcess.getPid()); @@ -1918,7 +1928,11 @@ public abstract class AbstractWrappedProcess implements WrappedProcess, Constant long shutdownWaitTime = _config.getInt("wrapper.shutdown.timeout", Constants.DEFAULT_SHUTDOWN_TIMEOUT) * 1000; shutdownWaitTime += _config.getInt("wrapper.jvm_exit.timeout", Constants.DEFAULT_JVM_EXIT_TIMEOUT) * 1000; if (shutdownWaitTime > Integer.MAX_VALUE) - shutdownWaitTime = Integer.MAX_VALUE; + shutdownWaitTime = Integer.MAX_VALUE; + /* + * bkowal + * Suppress extraneous output unless debug is enabled. + */ if (_debug) { getWrapperLogger().info( @@ -2013,7 +2027,11 @@ public abstract class AbstractWrappedProcess implements WrappedProcess, Constant Thread.currentThread().interrupt(); } _osProcess.destroy(); - + + /* + * bkowal + * Suppress extraneous output unless debug is enabled. + */ if (_debug) { getWrapperLogger().info("process exit code: " + _osProcess.getExitCode()); @@ -2739,7 +2757,10 @@ public abstract class AbstractWrappedProcess implements WrappedProcess, Constant { _drainBuffer.write(line); } - + + /* + * bkowal - added logic to check for the infinite indicator + */ if (MIN_PROCESS_LINES_TO_LOG == INFINITE_PROCESS_LOGGING || k <= MIN_PROCESS_LINES_TO_LOG) { diff --git a/javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java b/javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java index 431c1934b1..dbe7472f75 100644 --- a/javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java +++ b/javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java @@ -50,7 +50,10 @@ public class WrappedJavaProcess extends AbstractWrappedProcess private static final String LAST_KEYWORD = "LAST"; private static final String _PERIOD_SEPARATOR_ = "."; - + + /* + * bkowal - define the parameter order parameter name + */ private static final String ORDER_PATTERN = "wrapper.jvm.parameter.order"; private static final String NUMERIC_ORDER_PATTERN = ORDER_PATTERN @@ -368,7 +371,10 @@ public class WrappedJavaProcess extends AbstractWrappedProcess if (port != -1) { result.add("-Xdebug"); - result.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + port); + /* + * bkowal - no longer suspend execution when debugging + */ + result.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=" + port); } String preMainScript = _config.getString("wrapper.app.pre_main.script", null); if (preMainScript != null && preMainScript.length() > 0) @@ -396,11 +402,18 @@ public class WrappedJavaProcess extends AbstractWrappedProcess return orderParameters(result, classpath); } - + + /* + * List was left as a generic to match the code that would use it. + */ private List orderParameters(List parameters, String classpath) { Map orderedParametersMap = new HashMap(); - + + /* + * bkowal - loop through the parameters and re-arrange the parameters + * in the specified order. + */ Iterator paramOrderIterator = _config.getKeys("wrapper.jvm.parameter.order"); while (paramOrderIterator.hasNext()) @@ -588,7 +601,12 @@ public class WrappedJavaProcess extends AbstractWrappedProcess sb.append(PATHSEP); } - + + /* + * bkowal - recursively search the directories specified + * using the wrapper.search.java.classpath jvm parameter and add entries + * to the classpath. + */ final String[] jarPattern = new String[] { "jar" }; List containingDirectories = new ArrayList(); Iterator searchLocationIterator = _config.getKeys("wrapper.search.java.classpath");