Merge branch 'omaha_15.1.1' into omaha_sails_15.1.1

Former-commit-id: f675caa86a6ad0a1dea8fa7a817035f12ce51a02

edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/GenericHazards.py

@@ -24,6 +24,8 @@
 #    Date            Ticket#       Engineer       Description
 #    ------------    ----------    -----------    --------------------------
 #    05/07/2015      4027          randerso       Migrated A1 OB9.16 code to A2
+#    06/17/2015      4027          dgilling       Perform case-insensitive 
+#                                                 comparisons in foundCTAs.
 #
 #-------------------------------------------------------------------------
 # Description: This product is a template for creating Hazard Products.
@@ -1148,7 +1150,9 @@ class TextProduct(TextRules.TextRules, SampleAnalysis.SampleAnalysis,
             for (ctaType, cta) in self.__procCTA:
                 ## Added following line to account for framing code issues in CTA
                 cta = re.sub("\|\*.*\*\|","",cta)
-                if para == cta and ctaType not in found:
+                # We want this comparison to be case-insensitive just in case
+                # the site is not transmitting in mixed case yet.
+                if para.upper() == cta.upper() and ctaType not in found:
                     found.append(ctaType)
         return found
 

rpms/build/common/lookupRPM.sh

@@ -33,6 +33,10 @@ function lookupRPM()
    # lookup the rpm.
 
    # foss rpms -> python rpms.
+   if [ "${1}" = "awips2-maven" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/maven-3.2.3/"
+      return 0
+   fi
    if [ "${1}" = "awips2-python" ]; then
       export RPM_SPECIFICATION="${installer_dir}/python-2.7.9/"
       return 0

rpms/build/x86_64/build.sh

@@ -187,6 +187,7 @@ if [ "${1}" = "-rh6" ]; then
    buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-shapely"
    buildRPM "awips2-ant"
+   buildRPM "awips2-maven"
    buildRPM "awips2-tools"
    buildRPM "awips2-postgres"
    buildRPM "awips2-pgadmin3"

rpms/legal/FOSS_licenses/Enthought_Inc_c_2001-2002_SciPy_Developers_c_2003-2012.txt

@@ -0,0 +1,31 @@
+Copyright (c) 2001, 2002 Enthought, Inc.
+All rights reserved.
+
+Copyright (c) 2003-2012 SciPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  a. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+  b. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  c. Neither the name of Enthought nor the names of the SciPy Developers
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+