xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5726 commits 31 branches 40 tags 3.8 GiB
Commit graph

524 commits

Author SHA1 Message Date
Brad Gonzales
9679fb32dc Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm. 
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b

Former-commit-id: c71a842639 [formerly 982503cb41] [formerly abf6125958 [formerly 632b2cad7a328dead678026c673b001be0657394]]
Former-commit-id: abf6125958
Former-commit-id: b032306b52
 2014-05-12 11:25:16 -05:00
Brian Clements
6192ab51ae Omaha #3147 removed spring from groovy RPM component spec 
Former-commit-id: 9d67a6c30b [formerly 3bb680802a] [formerly b334038a28 [formerly 979ff20d55cc86319805f77ec53f32cb39555eb3]]
Former-commit-id: b334038a28
Former-commit-id: 3a48b2036e
 2014-05-09 10:31:28 -05:00
Brad Gonzales
6bee1ed107 Omaha #3032 updated jdk to java 1.7.0_55 
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8

Former-commit-id: ad464cc0da [formerly 91f94499aa] [formerly 35f6a5ac25 [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]
Former-commit-id: 35f6a5ac25
Former-commit-id: f7cf5741b0
 2014-05-08 16:15:42 -05:00
Greg Armendariz
9f6eff005b Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1 
Former-commit-id: 2994753636 [formerly 1e48076fb2] [formerly 58eaf444bd [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]
Former-commit-id: 58eaf444bd
Former-commit-id: e1d91769fe
 2014-04-30 19:34:43 -05:00
Brian Clements
9fc8796247 Issue #3089 fixed init.d script for collaboration dataserver RPM 
Former-commit-id: e49d150332 [formerly 57f5ac701c] [formerly 1273846844 [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]
Former-commit-id: 1273846844
Former-commit-id: a074b27951
 2014-04-30 16:41:14 -05:00
Greg Armendariz
94a55e5c31 Issue #2571 - Update maps.db snapshot and lake shapefile 
Former-commit-id: 4c245da2a2 [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 784235ab9f
 2014-04-30 15:42:42 -05:00
Richard Peter
6966b79246 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 32957285fc
Former-commit-id: 80d4153878
 2014-04-28 16:27:40 -05:00
Brian.Dyke
bf3758efa3 Merge branch 'master_14.2.2' into master_14.3.1 
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: 3524838f9f
Former-commit-id: 029f5753ad
 2014-04-25 11:06:11 -04:00
Richard Peter
608b342707 Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development 
Former-commit-id: c0656c811d [formerly b53d914640] [formerly a21a2bafe1 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]
Former-commit-id: a21a2bafe1
Former-commit-id: d08c051727
 2014-04-24 15:43:15 -05:00
Brad Gonzales
f9b04639a4 Issue #3035 Increment java component.spec revision value. 
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf

Former-commit-id: 86036c0afb [formerly 15985b9eac] [formerly 7a0694adca [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]
Former-commit-id: 7a0694adca
Former-commit-id: 5fa1165519
 2014-04-24 12:48:40 -05:00
David Gillingham
123bd80fa9 Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data. 
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec

Former-commit-id: 6186e67e5c [formerly eea20ba3ef] [formerly 16adfb2573 [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]
Former-commit-id: 16adfb2573
Former-commit-id: 9f27fa7562
 2014-04-24 11:11:06 -05:00
Brad Gonzales
c11506a0c9 Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script. 
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1

Former-commit-id: 5957c45cea [formerly fdfac581d6] [formerly 1fcffc5db8 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]
Former-commit-id: 1fcffc5db8
Former-commit-id: 679a623d87
 2014-04-22 15:39:08 -05:00
Brad Gonzales
258ddf9036 Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build. 
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca

Former-commit-id: 3a3e0be7a4 [formerly 90c7e699fa] [formerly 4c21afaa1b [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]]
Former-commit-id: 4c21afaa1b
Former-commit-id: 17ac32a672
 2014-04-22 12:23:15 -05:00
Nate Jensen
0c82511428 Merge "Issue #2984 another attempt to fix build" into development 
Former-commit-id: 7f56e20c03 [formerly 5424ffb850] [formerly 26b20a770a [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]
Former-commit-id: 26b20a770a
Former-commit-id: cf3e9e9020
 2014-04-15 13:27:29 -05:00
Nate Jensen
3186527f18 Issue #2984 another attempt to fix build 
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb

Former-commit-id: cb406ef865 [formerly a2354a1d2a] [formerly 09305d263e [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]
Former-commit-id: 09305d263e
Former-commit-id: 60b8b6e4ad
 2014-04-15 13:16:17 -05:00
Richard Peter
d40449dae9 Issue #2726: Fix context mappings for topics 
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f

Former-commit-id: f533275291 [formerly ecbd0d5720] [formerly 4ac996336e [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]
Former-commit-id: 4ac996336e
Former-commit-id: 35b8b8bc15
 2014-04-15 12:49:15 -05:00
Richard Peter
7e3e0fb984 Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files. 
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d

Former-commit-id: 45e6301b91 [formerly 4709e66b34] [formerly fa25d55384 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]
Former-commit-id: fa25d55384
Former-commit-id: fa5c0f71ad
 2014-04-15 11:50:28 -05:00
Nate Jensen
0177329d67 Issue #2984 attempt to fix build 
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d

Former-commit-id: ce585ca9e4 [formerly 4aaa7c7096] [formerly 456359ab1a [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]
Former-commit-id: 456359ab1a
Former-commit-id: f6b3c3c05f
 2014-04-15 09:57:11 -05:00
Richard Peter
f1b85f6964 Merge branch 'master_14.1.2' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: b15d288530
Former-commit-id: 73aab15d85
 2014-04-09 16:00:54 -05:00
Brian.Dyke
47d9095211 Merged 1354 -5 and -6 into 1412 based on 1411-25 
Former-commit-id: 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: dd98c213c7
Former-commit-id: 9f37f61cf8
 2014-04-04 12:57:32 -04:00
Brad Gonzales
907d09bc20 Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver 
rpm to replace it.  Changed dependency references to httpd-collaboration to refer to collab-dataserver.

Amend:  Updated call to status in init script.
        Redirect start.sh error output to an error file.
        Use macro to define ant opts in component.spec.

Change-Id: I73369dc3e9079a1732ae9d06229d3135f82ef2f4

Former-commit-id: fe8e6a1fa1 [formerly 4fa60427b4] [formerly f0189d61ca [formerly d7466d36140c94b5ef4e57fea25526231912e018]]
Former-commit-id: f0189d61ca
Former-commit-id: 3954cd6bae
 2014-04-03 17:47:58 -05:00
Ben Steffensmeier
aadc22091e Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]
Former-commit-id: 12ed72b0c0
Former-commit-id: ab8293c6a1
 2014-03-24 11:10:18 -05:00
Steve Harris
5d95d594f8 Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: b5a2d2237f
 2014-03-17 15:55:41 -05:00
Brian.Dyke
57f7e4b084 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]
Former-commit-id: 9c412e444e
Former-commit-id: 88efccf309
 2014-03-14 11:13:30 -04:00
Brian.Dyke
e78e030b7c OB_14.1.1-23 baseline 
Former-commit-id: 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]
Former-commit-id: bc6a7bf946
Former-commit-id: 8f72db144b
 2014-03-14 08:18:16 -04:00
Brad Gonzales
ec34591f08 Issue #2702 Updated openfire version in component spec. 
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498

Former-commit-id: c7d06ff946 [formerly ccb312d46f] [formerly bf0d052043 [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]
Former-commit-id: bf0d052043
Former-commit-id: dae0963531
 2014-03-12 08:48:36 -05:00
Brad Gonzales
f53845738c Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work 
with openfire 3.9.1.  Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.

Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a

Former-commit-id: cbac19d219 [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]
Former-commit-id: 48b6c75bb3
Former-commit-id: 5d5ab33db3
 2014-03-11 11:27:44 -05:00
Steve Harris
c24108e75b Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: f60aba35d6
Former-commit-id: 708485427e
 2014-03-07 15:43:40 -06:00
Brian.Dyke
2eec413d72 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]
Former-commit-id: 6414bdab57
Former-commit-id: 2f94480121
 2014-03-07 08:57:07 -05:00
Steve Harris
972fa3bee6 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]
Former-commit-id: 1c64a5c025
Former-commit-id: 7fbbc1e118
 2014-03-06 18:31:10 -06:00
Brian.Dyke
14844a10b6 ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change) 
Former-commit-id: 26fe429c4b [formerly 1778d20745] [formerly 010b7a1df5 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]
Former-commit-id: 010b7a1df5
Former-commit-id: c6dae5a81f
 2014-03-06 11:04:34 -05:00
Brian.Dyke
57a28e817d ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf) 
Former-commit-id: 6313b7af0c [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 3fdb85c62d
 2014-03-06 10:56:44 -05:00
Steve Harris
587f15a95d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 96658d8ce0
 2014-03-06 08:39:43 -06:00
Brad Gonzales
b9affa3c02 Issue #2821 Removed qpid 0.7 from the baseline. 
Amend: Removed build.sh script that builds 0.7 and 0.18.  changed rpms.sh to call 0.18 build.sh script.

Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf

Former-commit-id: f87d4ccf82 [formerly a007ffabf9] [formerly 50209c2084 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]
Former-commit-id: 50209c2084
Former-commit-id: bf3a9ef7fe
 2014-02-28 10:15:18 -06:00
Richard Peter
50a1b270c5 Merge branch 'omaha_14.2.1' (14.2.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 1c150e6e8b
Former-commit-id: f13c86bc3e
 2014-02-27 15:18:26 -06:00
Brian.Dyke
c873f20d04 OB_14.1.1-20 baseline 
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]
Former-commit-id: 2bad40cfee
Former-commit-id: 16117255f3
 2014-02-26 17:39:15 -05:00
Brad Gonzales
1df77529c3 Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz 
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz.  Updated the component.spec to the new version number.

Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3

Former-commit-id: 40a653867a [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]
Former-commit-id: cf9c22ac99
Former-commit-id: a24cbaf683
 2014-02-25 14:42:59 -06:00
Brian.Dyke
73a1c238f4 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 227131e5f1
 2014-02-24 14:51:00 -05:00
Ron Anderson
7d3af157f8 Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]
Former-commit-id: 2db5f26840
Former-commit-id: 3b2ea2d6ac
 2014-02-24 13:46:48 -06:00
Brian.Dyke
c41dd22ff2 OB_14.1.1-19 baseline 
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: 10b723647b
Former-commit-id: 64044e7ce5
 2014-02-21 06:50:59 -05:00
Brian.Dyke
9ce06f52c4 ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev) 
Former-commit-id: 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]
Former-commit-id: 916f657e04
Former-commit-id: e36ae1dd7f
 2014-02-20 15:50:50 -05:00
Ron Anderson
0135771eec Merge branch 'master_14.1.1' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 14a082a4e9
Former-commit-id: d4ba9eba94
 2014-02-18 10:45:20 -06:00
Brian Clements
08bffb26ca Issue #2755 removed subscription plugin jar from rpms 
Former-commit-id: 944a874c5b [formerly d4f3fe7629] [formerly 248db98ddf [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]
Former-commit-id: 248db98ddf
Former-commit-id: 5faad2ccca
 2014-02-18 09:00:21 -06:00
Ron Anderson
d9b82b4ebe Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]
Former-commit-id: 2f067699f2
Former-commit-id: 2d7c87ac84
 2014-02-13 10:10:34 -06:00
Brian.Dyke
d61ae6c5f4 14.1.1-18 baseline 
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 1d6a9456b7
Former-commit-id: c5857c30f2
 2014-02-11 15:52:50 -05:00
Brian.Dyke
f1cc9d6ee2 14.1.1-17 baseline 
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 23280af290
Former-commit-id: 947ec5fd96
 2014-02-04 12:33:46 -05:00
Greg Armendariz
b81825a668 Issue #2754 - Return commons logging to build for qpid 
Former-commit-id: c70e69147d [formerly 6d3e40d648] [formerly 976edd2545 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]
Former-commit-id: 976edd2545
Former-commit-id: 346d535a6c
 2014-01-28 15:06:11 -06:00
Ron Anderson
dca7f21f7b Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: 62c445d872
Former-commit-id: 624375267e
 2014-01-13 17:45:20 -06:00
Steve Harris
282d10fe6d 14.1.1-15 baseline 
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]
Former-commit-id: d8e5799328
Former-commit-id: 35d8f5a281
 2014-01-06 14:08:08 -05:00
Richard Peter
5c0cf804f1 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 62fa535744
 2013-12-17 21:04:53 -06:00