Merge branch 'master_13.4.1' into omaha_13.4.1

Former-commit-id: f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDataManager.java

@@ -59,6 +59,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * May 29, 2009 2476       mpduff      Initial creation.
  * Jan 28, 2010 4415       mpduff      Fixed problem with column 
  *                                       header creation.
+ * May 20, 2013 15962      lbousaidi   Added a new routine getRadarIdsTrue()
+ *                                     for Radar Sites dialog.                                    
  * 
  * </pre>
  * 
@@ -252,6 +254,30 @@ public class GageTableDataManager {
 
         return radarIds;
     }
+    
+    /**
+     * Get the list of Radar Ids from radarloc.
+     * only the one with use_radar= T
+     * @return the radarIds
+     * @throws VizException
+     */
+    public String[] getRadarIdsTrue() throws VizException {
+
+        if (radarIds == null) {
+            String query = "select radid from radarloc where use_radar='T' " +
+                                        "order by radid asc";
+            List<Object[]> rs = DirectDbQuery.executeQuery(query,
+                    HydroConstants.IHFS, QueryLanguage.SQL);
+
+            radarIds = new String[rs.size()];
+            for (int i = 0; i < rs.size(); i++) {
+                Object[] oa = rs.get(i);
+                radarIds[i] = (String) oa[0];
+            }
+        }
+
+        return radarIds;
+    }
 
     /**
      * Lookup the Radar Id for the gage.

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/hourlyradar/RadarSiteSelectionDlg.java

@@ -48,7 +48,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 21, 2009            mpduff     Initial creation
- * 
+ * May 20, 2013  15962     lbousaidi  changed getActiveRadarIds() call to
+ *                                    getRadarIdsTrue(). 
  * </pre>
  * 
  * @author mpduff
@@ -180,7 +181,7 @@ public class RadarSiteSelectionDlg extends CaveSWTDialog {
     private void populateBox() {
         String[] radarIds = null;
         try {
-            radarIds = GageTableDataManager.getInstance().getActiveRadarIds();
+            radarIds = GageTableDataManager.getInstance().getRadarIdsTrue();
             for (String s : radarIds) {
                 radarListBox.add(s);
             }

rpms/awips2.core/Installer.ldm/component.spec

@@ -21,6 +21,7 @@ Packager: Bryan Kowal
 
 AutoReq: no
 Requires: awips2-notification
+Requires: qpid-cpp-client-devel
 Requires: zlib-devel
 provides: awips2-ldm
 provides: awips2-base-component
@@ -178,6 +179,52 @@ rm -f %{_ldm_src_tar}
 if [ $? -ne 0 ]; then
    exit 1
 fi
+
+# create .bash_profile
+if [ ! -f /usr/local/ldm/.bash_profile ]; then
+   echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' > \
+      /usr/local/ldm/.bash_profile
+   echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \
+      /usr/local/ldm/.bash_profile
+   /bin/chown ldm:fxalpha /usr/local/ldm/.bash_profile
+fi
+
+pushd . > /dev/null 2>&1
+# build ldm
+rm -f ~ldm/runtime
+cd ${_ldm_root_dir}/src
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+export _current_dir=`pwd`
+su ldm -lc "cd ${_current_dir}; ./configure --disable-max-size --with-noaaport --disable-root-actions --prefix=${_ldm_root_dir} CFLAGS='-g -O0'" \
+   > configure.log 2>&1
+if [ $? -ne 0 ]; then
+   echo "FATAL: ldm configure has failed!"
+   exit 1
+fi
+export _current_dir=`pwd`
+su ldm -lc "cd ${_current_dir}; make install" > install.log 2>&1
+if [ $? -ne 0 ]; then
+   echo "FATAL: make install has failed!"
+   exit 1
+fi
+
+su ldm -lc "cd ${_current_dir}; /bin/bash my-install" > my-install.log 2>&1
+if [ $? -ne 0 ]; then
+   echo "FATAL: my-install has failed!"
+   exit 1
+fi
+popd > /dev/null 2>&1
+pushd . > /dev/null 2>&1
+cd ${_ldm_root_dir}/src
+make root-actions > root-actions.log 2>&1
+if [ $? -ne 0 ]; then
+   echo "FATAL: root-actions has failed!"
+   exit 1
+fi
+popd > /dev/null 2>&1
+
 # unpack bin, decoders, and etc.
 _PATCH_DIRS=( 'bin' 'decoders' 'etc' )
 for patchDir in ${_PATCH_DIRS[*]};
@@ -191,21 +238,10 @@ do
       exit 1
    fi
 done
-/bin/chown -R ldm:fxalpha ${_ldm_dir}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
+/bin/chmod a+x ${_ldm_dir}/bin/*
+/bin/chown -R ldm:fxalpha ${_ldm_dir}/etc ${_ldm_dir}/decoders
 popd > /dev/null 2>&1
 
-# create .bash_profile
-if [ ! -f /usr/local/ldm/.bash_profile ]; then
-   echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' > \
-      /usr/local/ldm/.bash_profile
-   echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \
-      /usr/local/ldm/.bash_profile
-   /bin/chown ldm:fxalpha /usr/local/ldm/.bash_profile
-fi
-
 # construct pqact
 pushd . > /dev/null 2>&1
 cd ${_ldm_dir}/etc
@@ -235,47 +271,6 @@ if [ ${_myHost} != "cpsbn1" -a ${_myHost} != "cpsbn2" -a ${_myHost} != "dx1" -a
 fi
 popd > /dev/null 2>&1
 
-pushd . > /dev/null 2>&1
-# build ldm
-cd ${_ldm_root_dir}/src
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-export _current_dir=`pwd`
-su ldm -lc "cd ${_current_dir}; ./configure --disable-max-size --with-noaaport --disable-root-actions --prefix=${_ldm_dir}" \
-   > configure.log 2>&1
-if [ $? -ne 0 ]; then
-   echo "FATAL: ldm configure has failed!"
-   exit 1
-fi
-export _current_dir=`pwd`
-su ldm -lc "cd ${_current_dir}; make install" > install.log 2>&1
-if [ $? -ne 0 ]; then
-   echo "FATAL: make install has failed!"
-   exit 1
-fi
-popd > /dev/null 2>&1
-pushd . > /dev/null 2>&1
-cd ${_ldm_root_dir}/src/noaaport
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-export _current_dir=`pwd`
-su ldm -lc "cd ${_current_dir}; /bin/bash my-make" > my-make.log 2>&1
-if [ $? -ne 0 ]; then
-   echo "FATAL: my-make has failed!"
-   exit 1
-fi
-popd > /dev/null 2>&1
-pushd . > /dev/null 2>&1
-cd ${_ldm_root_dir}/src
-make root-actions > root-actions.log 2>&1
-if [ $? -ne 0 ]; then
-   echo "FATAL: root-actions has failed!"
-   exit 1
-fi
-popd > /dev/null 2>&1
-
 # build decrypt_file & edexBridge
 pushd . > /dev/null 2>&1
 cd ${_ldm_dir}/SOURCES
@@ -349,7 +344,7 @@ fi
 for _file in $( ls /tmp/ldm/etc/pqact.conf.* | grep -wE "pqact.conf.[a-z]{3,4}" | grep -v pqact.conf.dev | xargs ) ;
 do
    if [[ ! -f /usr/local/ldm/etc/${_file} ]]; then
-      scp -qp /tmp/ldm/etc/${_file} /usr/local/ldm/etc/
+      scp -qp ${_file} /usr/local/ldm/etc/
    fi
 done
 #if a remote CP site, copy over the filtered data configuration
@@ -432,5 +427,5 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %attr(755,root,root) /etc/profile.d/awipsLDM.csh
 %attr(755,root,root) /etc/ld.so.conf.d/awips2-ldm-i386.conf
-%attr(755,root,root) /etc/ld.so.conf.d/ldm.log
+%attr(755,root,root) /etc/logrotate.d/ldm.log
 %attr(755,root,root) /etc/init.d/ldmcp