Merge branch 'omaha_14.1.1' into development_on_RHEL6

Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9

edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py

@@ -0,0 +1,75 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+#
+# Globally import and sets up instances of the scripts.
+# Designed to be used as a master controller for inspecting and running
+# python scripts from Java. Differs from base MasterInterface class because
+# it utilizes the rollback importer.
+#
+# This class should remain purely python.  For Java interactions, extend this class.
+#   
+#
+#    
+#    SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    01/17/13                      dgilling       Initial Creation.
+#    10/09/13         16614   njensen      Fixed reloadModules()
+#    
+# 
+#
+
+import MasterInterface
+
+class RollbackMasterInterface(MasterInterface.MasterInterface):
+    
+    def __init__(self, scriptPath):
+        super(RollbackMasterInterface, self).__init__()
+        self._scriptPath = scriptPath
+        
+    def importModules(self):
+        super(RollbackMasterInterface, self).importModules(self._scriptPath)
+                
+    def getStartupErrors(self):
+        from java.util import ArrayList
+        errorList = ArrayList()
+        for err in self.getImportErrors():
+            errorList.add(str(err))
+        return errorList
+    
+    def addModule(self, moduleName):        
+        super(RollbackMasterInterface, self).addModule(moduleName)
+        self.reloadModules()
+        
+    def reloadModule(self, moduleName):
+        super(RollbackMasterInterface, self).reloadModule(moduleName)
+        self.reloadModules()
+        
+    def removeModule(self, moduleName):
+        super(RollbackMasterInterface, self).removeModule(moduleName)
+        self.reloadModules()
+    
+    def reloadModules(self):
+        for script in self.scripts:
+            super(RollbackMasterInterface, self).reloadModule(script)        
+        
+        

edexOsgi/com.raytheon.messaging.mhs/src/com/raytheon/messaging/mhs/MhsMessage.java

@@ -81,15 +81,6 @@ public class MhsMessage {
      */
     static public final String EnvMhsTrace = "MHS_SHOW_TRACE";
 
-    /**
-     * Environment variable to determine the MHS interface to use. If undefined,
-     * it is the same as defining it to "NO" or "FALSE". If set to "YES" or
-     * "TRUE", then the JNI interface to the MHS DWB functions is used to submit
-     * messages. Any other value results in message submission occurring via the
-     * command line utility msg_send.
-     */
-    static public final String EnvMhsUseNative = "MHS_USE_NATIVE_INTERFACE";
-
     /**
      * Minimum message code value
      */
@@ -194,7 +185,6 @@ public class MhsMessage {
      * Valid time parameter formatted as a string (mm/dd/yyyy:HHMM). This value
      * is derived from {@link #validTime} during message submission.
      */
-    @SuppressWarnings("unused")
     private String validTimeString;
 
     /**
@@ -207,7 +197,6 @@ public class MhsMessage {
      * Timeout time parameter formatted as a string (mm/dd/yyyy:HHMM). This
      * value is derived from {@link #timeoutTime} during message submission.
      */
-    @SuppressWarnings("unused")
     private String timeoutTimeString;
 
     /**
@@ -259,11 +248,6 @@ public class MhsMessage {
      */
     private String resultText;
 
-    /**
-          * 
-          */
-    private boolean useNativeInterface;
-
     /**
      * Sole constructor. Provides reasonable default values for a message
      * object's fields as follows:
@@ -286,14 +270,10 @@ public class MhsMessage {
      */
     public MhsMessage(int code) {
         String traceString = System.getenv(EnvMhsTrace);
-        String interfaceString = System.getenv(EnvMhsUseNative);
 
         showTrace = (traceString != null)
-                && ((traceString.equalsIgnoreCase("yes") || traceString
+                && ((traceString.equalsIgnoreCase("yes") 
-                        .equalsIgnoreCase("true")));
+                || traceString.equalsIgnoreCase("true")));
-        useNativeInterface = (interfaceString != null)
-                && ((interfaceString.equalsIgnoreCase("yes")) || interfaceString
-                        .equalsIgnoreCase("true"));
 
         actionCode = code;
         setRetryCount(0);
@@ -313,21 +293,6 @@ public class MhsMessage {
         submitted = false;
     }
 
-    /**
-     * Submits a message to the message request server daemon. This is JNI code
-     * to translate a Java message object to a C MHS message object.
-     * 
-     * @return 0 if successful; a positive integer if a MHS error is detected;
-     *         -1 if an error occurs in a JNI call, which will usually result in
-     *         a Java exception when control is returned toe the JVM.
-     * @see MhsMessage
-     */
-    private native String submitMessage() throws MhsSubmitException;
-
-    static {
-        System.loadLibrary("coDDM_msg_send");
-    }
-
     /**
      * Gets the action code for this message object.
      * 
@@ -839,30 +804,6 @@ public class MhsMessage {
         return retryCount;
     }
 
-    /**
-     * Call to force the MHS interface to be used for this message. The default
-     * value is determined by the environment variable MHS_USE_NATIVE_INTERFACE.
-     * Set to true to use the native C DWB functions. Set to false to use the
-     * command line utility msg_send.
-     * 
-     * @param useNativeInterface
-     *            the useNativeInterface to set
-     */
-    public void setUseNativeInterface(boolean useNativeInterface) {
-        this.useNativeInterface = useNativeInterface;
-    }
-
-    /**
-     * Returns the MHS interface that will be used to submit this message. A
-     * true value indicates that the native C DWB functions will be used. False
-     * indicates that the command line utility msg_send will be used.
-     * 
-     * @return the useNativeInterface
-     */
-    public boolean isUseNativeInterface() {
-        return useNativeInterface;
-    }
-
     /**
      * Retrieves the message Id of this message.
      * 
@@ -1153,147 +1094,136 @@ public class MhsMessage {
         String timeStamp = timeStampFormat.format(System.currentTimeMillis());
         System.out.println(timeStamp + ": Message submitted");
 
-        if (useNativeInterface) { // Submit the message using the MHS and DWB
+        LinkedList<String> command = new LinkedList<String>();
-                                  // native libraries.
-            try {
-                messageId = submitMessage();
-            } catch (MhsSubmitException e) {
-                resultText = e.toString();
-                throw new MhsSubmitException(resultText);
-            }
-        } else { // Submit the message by constructing a command line and
-                 // execing a new msg_send process
-            LinkedList<String> command = new LinkedList<String>();
 
-            command.add("msg_send");
+        command.add("msg_send");
-            command.add("-c" + actionCode);
+        command.add("-c" + actionCode);
-            String addrStr = "";
+        String addrStr = "";
-            String ackAddrStr = "";
+        String ackAddrStr = "";
-            String encList = "";
+        String encList = "";
 
-            for (int i = 0; i < addressees.getCount(); i++) {
+        for (int i = 0; i < addressees.getCount(); i++) {
-                Addressee addr = addressees.get(i);
+            Addressee addr = addressees.get(i);
-                if (addr.isAckRequired()) {
+            if (addr.isAckRequired()) {
-                    if (ackAddrStr.isEmpty()) {
+                if (ackAddrStr.isEmpty()) {
-                        ackAddrStr = addr.getAddress();
+                    ackAddrStr = addr.getAddress();
-                    } else {
-                        ackAddrStr += "," + addr.getAddress();
-                    }
                 } else {
-                    if (addrStr.isEmpty()) {
+                    ackAddrStr += "," + addr.getAddress();
-                        addrStr = addr.getAddress();
-                    } else {
-                        addrStr += "," + addr.getAddress();
-                    }
                 }
-            }
+            } else {
-
+                if (addrStr.isEmpty()) {
-            if (!addrStr.isEmpty()) {
+                    addrStr = addr.getAddress();
-                command.add("-a" + addrStr);
-            }
-
-            if (!ackAddrStr.isEmpty()) {
-                command.add("-A" + ackAddrStr);
-            }
-
-            if (retryCount != 0) {
-                command.add("-R" + retryCount);
-            }
-
-            for (int i = 0; i < enclosures.getCount(); i++) {
-                Enclosure enc = enclosures.get(i);
-                if (encList.isEmpty()) {
-                    encList = enc.getEnclosureName();
                 } else {
-                    encList += "," + enc.getEnclosureName();
+                    addrStr += "," + addr.getAddress();
-                }
-            }
-
-            if (!encList.isEmpty()) {
-                command.add("-e" + encList);
-            }
-
-            if (!timeoutTimeString.isEmpty()) {
-                command.add("-T" + timeoutTimeString);
-            }
-
-            if (!validTimeString.isEmpty()) {
-                command.add("-v" + validTimeString);
-            }
-
-            if (!bodyFile.isEmpty()) {
-                command.add("-b" + bodyFile);
-            }
-
-            if (!productId.isEmpty()) {
-                command.add("-i" + productId);
-            }
-
-            if (!subject.isEmpty()) {
-                command.add("-s" + subject);
-            }
-
-            if (priority != MhsMessagePriority.Default) {
-                command.add("-p" + priority.value());
-            }
-
-            if (type != MhsMessageType.Routine) {
-                command.add("-t" + type.text());
-            }
-
-            if (verifyAddressees) {
-                command.add("-C");
-            }
-
-            if (showTrace) {
-                System.out.print("Executing command: ");
-                for (int i = 0; i < command.size(); i++) {
-                    System.out.print(command.get(i) + " ");
-                }
-                System.out.println();
-            }
-
-            Process proc = null;
-            try {
-                ProcessBuilder procDesc = new ProcessBuilder(command);
-                procDesc.redirectErrorStream(true);
-
-                proc = procDesc.start();
-                InputStream stdout = proc.getInputStream();
-                InputStreamReader isr = new InputStreamReader(stdout);
-                BufferedReader br = new BufferedReader(isr);
-                String outp;
-
-                while ((outp = br.readLine()) != null) {
-                    if (outp.length() > 0) {
-                        // System.out.println(outp);
-                        messageId = outp;
-                    }
-                }
-                // System.out.println(line);
-                int exitVal = proc.waitFor();
-                if (exitVal != 0) {
-                    // System.out.println("Abnormal exit code " + exitVal);
-                    // resultText = messageId;
-                    throw new MhsSubmitException(messageId);
-                }
-
-                if (showTrace) {
-                    System.out
-                            .println("Message successfully submitted.  Message ID: "
-                                    + messageId);
-                }
-            } catch (Throwable t) {
-                resultText = t.getMessage();
-                // System.out.println("Exception thrown: " + resultText);
-                throw new MhsSubmitException(resultText);
-            } finally {
-                // DR #10955
-                if (proc != null) {
-                    proc.destroy();
                 }
             }
         }
+
+        if (!addrStr.isEmpty()) {
+            command.add("-a" + addrStr);
+        }
+
+        if (!ackAddrStr.isEmpty()) {
+            command.add("-A" + ackAddrStr);
+        }
+
+        if (retryCount != 0) {
+            command.add("-R" + retryCount);
+        }
+
+        for (int i = 0; i < enclosures.getCount(); i++) {
+            Enclosure enc = enclosures.get(i);
+            if (encList.isEmpty()) {
+                encList = enc.getEnclosureName();
+            } else {
+                encList += "," + enc.getEnclosureName();
+            }
+        }
+
+        if (!encList.isEmpty()) {
+            command.add("-e" + encList);
+        }
+
+        if (!timeoutTimeString.isEmpty()) {
+            command.add("-T" + timeoutTimeString);
+        }
+
+        if (!validTimeString.isEmpty()) {
+            command.add("-v" + validTimeString);
+        }
+
+        if (!bodyFile.isEmpty()) {
+            command.add("-b" + bodyFile);
+        }
+
+        if (!productId.isEmpty()) {
+            command.add("-i" + productId);
+        }
+
+        if (!subject.isEmpty()) {
+            command.add("-s" + subject);
+        }
+
+        if (priority != MhsMessagePriority.Default) {
+            command.add("-p" + priority.value());
+        }
+
+        if (type != MhsMessageType.Routine) {
+            command.add("-t" + type.text());
+        }
+
+        if (verifyAddressees) {
+            command.add("-C");
+        }
+
+        if (showTrace) {
+            System.out.print("Executing command: ");
+            for (int i = 0; i < command.size(); i++) {
+                System.out.print(command.get(i) + " ");
+            }
+            System.out.println();
+        }
+
+        Process proc = null;
+        try {
+            ProcessBuilder procDesc = new ProcessBuilder(command);
+            procDesc.redirectErrorStream(true);
+
+            proc = procDesc.start();
+            InputStream stdout = proc.getInputStream();
+            InputStreamReader isr = new InputStreamReader(stdout);
+            BufferedReader br = new BufferedReader(isr);
+            String outp;
+
+            while ((outp = br.readLine()) != null) {
+                if (outp.length() > 0) {
+                    // System.out.println(outp);
+                    messageId = outp;
+                }
+            }
+            // System.out.println(line);
+            int exitVal = proc.waitFor();
+            if (exitVal != 0) {
+                // System.out.println("Abnormal exit code " + exitVal);
+                // resultText = messageId;
+                throw new MhsSubmitException(messageId);
+            }
+
+            if (showTrace) {
+                System.out.println("Message successfully submitted.  Message ID: "
+                                    + messageId);
+            }
+        } catch (Throwable t) {
+            resultText = t.getMessage();
+            // System.out.println("Exception thrown: " + resultText);
+            throw new MhsSubmitException(resultText);
+        } finally {
+            // DR #10955
+            if (proc != null) {
+                proc.destroy();
+            }
+        }
+
         return messageId;
     }
 }

edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

@@ -118,7 +118,6 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Sept23, 2013 2399       dhladky     Changed logging of duplicate records.
  * Oct 07, 2013 2392       rjpeter     Updated to pass null productKeys as actual null instead of string null.
- * 
  * </pre>
  * 
  * @author bphillip