Commit graph

353 commits

Author SHA1 Message Date
Bryan Kowal
caa561a4cb Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 86d8e511b5 [formerly 0924bfd726 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]]
Former-commit-id: 86d8e511b5
Former-commit-id: 68244041e7 [formerly cf71d24fff] [formerly 0225f396c0bb9b4bc44f8a3a438673280a30a3ff [formerly ff64a23deb]]
Former-commit-id: 1b947eb6a2a4a24f81407f08c14c3453f1c4ca73 [formerly af1d6136e4]
Former-commit-id: 822094bc7c
2013-04-18 14:06:53 -05:00
Bryan Kowal
621a9a740d Issue #1835 - update LDM to 6.11.2
- fixed hard-coded 6.8.1 version

Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890

Former-commit-id: d7fba83690 [formerly dfd75571f3] [formerly 890a6c0afb] [formerly d7fba83690 [formerly dfd75571f3] [formerly 890a6c0afb] [formerly ba3a0ad7d5 [formerly 890a6c0afb [formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]]]
Former-commit-id: ba3a0ad7d5
Former-commit-id: 6e93716097 [formerly fc4e0af835] [formerly 988bbc7b5ea322a6008397048e527d3ad02d4508 [formerly 6ef61185c9]]
Former-commit-id: 1df7a38db89e811b2b9b8f633d4055536286ffa9 [formerly 77242640b8]
Former-commit-id: 8cc6de9e57
2013-04-16 16:32:58 -05:00
Bryan Kowal
de0546ca99 Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 35b956fc4c [formerly e00a6207a5 [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 02f01470fc [formerly 49b9046bb4] [formerly a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070]]
Former-commit-id: f2ac9bf75c2eac62c3ddae97b705ade27423325b [formerly 39bae3cc54]
Former-commit-id: 6ad82744d2
2013-04-15 16:38:00 -05:00
Richard Peter
06b54e67c5 Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 78b230aaaf [formerly 0c869ee231 [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 227dcdbd81 [formerly a281d26608] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d]
Former-commit-id: ec77d423fe
2013-04-15 12:52:40 -05:00
Bryan Kowal
b36387d51a Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
Former-commit-id: 52f1aa5fda [formerly 0800c14061] [formerly cca3f43736] [formerly 52f1aa5fda [formerly 0800c14061] [formerly cca3f43736] [formerly c797715efe [formerly cca3f43736 [formerly d0fe712b37f7890c547470b24139635183ee9e1e]]]]
Former-commit-id: c797715efe
Former-commit-id: 763c9b7ca1 [formerly 8e27924557] [formerly b54c980ffdd49821d2302b071c9aecdca092cc4e [formerly 671e600a62]]
Former-commit-id: 0fab5d61e84d36cac7de1d7a1c9c9c43112cb824 [formerly fa59505e28]
Former-commit-id: 7db0542069
2013-04-15 09:40:43 -05:00
Bryan Kowal
43ec29fec3 Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
Former-commit-id: ea560bc843 [formerly cc0748d2d9] [formerly 331ca69086] [formerly ea560bc843 [formerly cc0748d2d9] [formerly 331ca69086] [formerly 765569f139 [formerly 331ca69086 [formerly 64f31d1f7c2c01eee91cfb4de68fbc01a73ae113]]]]
Former-commit-id: 765569f139
Former-commit-id: cb1af6d7dd [formerly 2fca1ce506] [formerly 608f24572f3c70daec845beeedf1886c792d5f78 [formerly 73e3d99f47]]
Former-commit-id: 63728125a3c81187c19b92409dc975f9f611ab60 [formerly f30c1fb3cf]
Former-commit-id: 64cfb4f79d
2013-04-11 18:06:42 -05:00
Steve Harris
23ba5b6690 Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	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.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]]
Former-commit-id: 0fed14d765
Former-commit-id: 6f691692bb [formerly 55dda49d47] [formerly 9971801ff7675d72352d78bac25edb59dd4b1b9c [formerly fe6a078c64]]
Former-commit-id: 55c3e4f9cc9b0427394c00bf35baeeaf592f669f [formerly a9d3e94b3b]
Former-commit-id: 98fd30b0d5
2013-04-11 13:14:00 -05:00
Bryan Kowal
a82f5189a2 Merge "Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades." into omaha_13.4.1
Former-commit-id: a24885cb34 [formerly 8e78666902] [formerly cce4b819c9] [formerly a24885cb34 [formerly 8e78666902] [formerly cce4b819c9] [formerly a792a0246b [formerly cce4b819c9 [formerly 655d6f29a5f9667dad6900a6dc2562968d8c8fcb]]]]
Former-commit-id: a792a0246b
Former-commit-id: 29022ce97c [formerly 893074643b] [formerly 980f49bed4a3d19f4d98fbbac2b4204254a112fa [formerly 7f482f0335]]
Former-commit-id: 6b35a5c87d050e3dcdcca1f6827d2e0a1d6d30db [formerly 435162efc7]
Former-commit-id: 695fe29564
2013-04-10 18:29:52 -05:00
Bryan Kowal
53fa990b4f Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
Former-commit-id: a05a76ddc7 [formerly b4f51b7c46] [formerly c28286b9ef] [formerly a05a76ddc7 [formerly b4f51b7c46] [formerly c28286b9ef] [formerly ef5dcf4489 [formerly c28286b9ef [formerly f49bb80458be42996555e5692a3403f2befad77b]]]]
Former-commit-id: ef5dcf4489
Former-commit-id: 1febd44526 [formerly cfba1ca4a1] [formerly 5e9169f18c9492cd2c9ad5add270ebdb91a0bb83 [formerly 3baf4ada50]]
Former-commit-id: 5e8c84136fb3961a6952685075219cf2eac3143c [formerly cd5d97fb3b]
Former-commit-id: 435ae4fd18
2013-04-10 18:27:52 -05:00
Bryan Kowal
ea661ea9fe Issue #1805 - incremented the python qpid release
Former-commit-id: 7dab615cd8 [formerly 12d16daeed] [formerly c146f1835b] [formerly 7dab615cd8 [formerly 12d16daeed] [formerly c146f1835b] [formerly 2bfd416f13 [formerly c146f1835b [formerly f2c5c819d91ad851d82444865b4279f85e13f791]]]]
Former-commit-id: 2bfd416f13
Former-commit-id: 3d7a62e041 [formerly 1ac1d10e40] [formerly d4ecf11f646728c016c9ca2cbb65890bec2f842b [formerly 6c7cad26f0]]
Former-commit-id: 115f53aff9ec1bbc95805bbfd0235e0a667d1fbf [formerly c1202c7331]
Former-commit-id: efb15a5474
2013-04-10 16:49:20 -05:00
Bryan Kowal
26aea61095 Issue #1805 - restore the full nightly delta build.
Former-commit-id: 1c225c3ad7 [formerly 4c3dfc910c] [formerly 6beda99aee] [formerly 1c225c3ad7 [formerly 4c3dfc910c] [formerly 6beda99aee] [formerly 837a65494f [formerly 6beda99aee [formerly a0a625006c1fec5c6825e390b1dfd1e539ca318c]]]]
Former-commit-id: 837a65494f
Former-commit-id: d0c3abc675 [formerly 0da297e3bc] [formerly 63fcf432ecdc072a09cb4f7a7b09d4782c93e37a [formerly a4d8303e2d]]
Former-commit-id: 687d4016c2fa491ee662d78a25f1e252969dd0c6 [formerly 3a8e2159de]
Former-commit-id: 9066cf854e
2013-04-09 09:56:38 -05:00
Steve Harris
b6db7821fa 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Bryan Kowal
4accd3bbd4 Issue #1805 - restore the full nightly delta build.
Former-commit-id: 8474243360 [formerly 1ebf50c7ed] [formerly 52be309cac] [formerly 8474243360 [formerly 1ebf50c7ed] [formerly 52be309cac] [formerly dc522ede44 [formerly 52be309cac [formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]]]
Former-commit-id: dc522ede44
Former-commit-id: a5d79669d7 [formerly 607d5b205d] [formerly 13548041df738803ecba4e04334e549a9ebb19c1 [formerly 04e22df174]]
Former-commit-id: 852a30c2e05f970b0eae175c1839c9b30ceb4c96 [formerly c97dccb62d]
Former-commit-id: ce1f23692e
2013-04-04 16:16:53 -05:00
Bryan Kowal
0b69be4a24 Issue #1750 - qpid updates for compatibility with operational servers
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly 1cea2404c8 [formerly 1000dac7ad [formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]]]
Former-commit-id: 1cea2404c8
Former-commit-id: c9666aa999 [formerly 8c20b1f4bc] [formerly 9883b0093f4fbc3aaa265cddbe9d5db095bd7555 [formerly 22a2c082b8]]
Former-commit-id: 62cfebe217bf8cddef962cf431fa6d694f753836 [formerly 5034964bfa]
Former-commit-id: 0c862db6f9
2013-04-04 13:20:13 -05:00
Bryan Kowal
db7ae2aab9 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 3454fd030b [formerly a07f8076cf [formerly 790804146d4eade073e3250e1b1cd95e313b1a96]]]]
Former-commit-id: 3454fd030b
Former-commit-id: 5cb707736a [formerly 59b2e35928] [formerly 61a29a2dc8e795045f30b007407d07cd9e3cc057 [formerly 3dadeb157d]]
Former-commit-id: d8eac6730a714ebf9eb92d1da7aa07a8835f01b8 [formerly 879b3bc84e]
Former-commit-id: 078622476d
2013-04-04 13:12:07 -05:00
Richard Peter
3abc53b70d Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]]
Former-commit-id: 814bff6ddb
Former-commit-id: d1369dbf29 [formerly e9fe732dac] [formerly ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]]
Former-commit-id: f0de5f6f544fadd3b91519c8f6322d053c734a6f [formerly 055440acda]
Former-commit-id: 52533b4f49
2013-04-04 13:03:41 -05:00
Bryan Kowal
427f4b451e Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 978f55d007 [formerly 8c68c8f9cb] [formerly bfb14b4ad6] [formerly 978f55d007 [formerly 8c68c8f9cb] [formerly bfb14b4ad6] [formerly 24dd9b550d [formerly bfb14b4ad6 [formerly f1551ef32c5e67358a60a6ba7d1ca2344afa0829]]]]
Former-commit-id: 24dd9b550d
Former-commit-id: ef26170029 [formerly 0a801c95ce] [formerly 2e41083816bf9b61d5576a771bb66626e85ceea0 [formerly 122c085a62]]
Former-commit-id: 6796cabf4b66ef4b8907c9928026d8b03cdd754b [formerly c053058d8f]
Former-commit-id: 528d1a14c1
2013-04-04 13:03:20 -05:00
Bryan Kowal
2bc13fa033 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: 1147a05bcf [formerly a214ee536a] [formerly 98c4ccb22060dd1661aa24f92d73ea9c175710d4 [formerly a154e3b3cd]]
Former-commit-id: ae924e9e5aad49a5024c850fb5b892c8ea59c34b [formerly 040bf63b7f]
Former-commit-id: f785bd78aa
2013-04-04 13:03:08 -05:00
Bryan Kowal
0cbefb8b77 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: d6b11bacf0 [formerly d40863c38f] [formerly dced69266300d616b3126d8ab0a9ce82349c7fc0 [formerly fcc7b102ad]]
Former-commit-id: df080e66e266ed5db77210502282ac3ed02a0060 [formerly 887b7d9c1a]
Former-commit-id: aab6cce629
2013-04-04 12:56:58 -05:00
Bryan Kowal
53a2897d7a Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Conflicts:

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


Former-commit-id: bc227a5cb9 [formerly 6f8ef422c8] [formerly d585db3b99] [formerly bc227a5cb9 [formerly 6f8ef422c8] [formerly d585db3b99] [formerly 1e3e6e3f28 [formerly d585db3b99 [formerly e95b6ade25a28b440d7283b5d162ff88f3671378]]]]
Former-commit-id: 1e3e6e3f28
Former-commit-id: 9041cb18ca [formerly 45ee1fd607] [formerly 14e31ea1ce773ab9f5dfc2a8393ea15bfff7a2b5 [formerly fdf99a56b2]]
Former-commit-id: 78f910f693602fd697104b818306fa3953584677 [formerly 73f078b400]
Former-commit-id: 1e28ae19cc
2013-04-04 12:37:15 -05:00
Steve Harris
084125dd3c Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: bbfc0f76ef [formerly 0f53c46d7a] [formerly 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]]
Former-commit-id: 55bdcb43db4e6090118e9aec0586c1a76860abe3 [formerly 7eda24c3b0]
Former-commit-id: a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
114eec390d Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1 [formerly 0342b648b6] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Bryan Kowal
a3a009e375 Issue #1850 - the ebxml schema will now be created within the metadata database
Former-commit-id: 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 2dbd62e9ce [formerly 8d63244b4e [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: 55b84c59c6 [formerly a57a457c79] [formerly 57767b7c64c0b9fe7114780c1b2b46960afdf9dc [formerly b31ade0770]]
Former-commit-id: 5d201beef6e4982516bfefcc6ee6d05a26d22162 [formerly 94b0191843]
Former-commit-id: 3f9bcfe936
2013-04-02 10:49:46 -05:00
Steve Harris
6a3f6359d6 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8]
Former-commit-id: ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Bryan Kowal
3ad26d1b99 Issue #1750 - qpid updates for compatibility with operational servers
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Former-commit-id: a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]]
Former-commit-id: e3c39b9be6
Former-commit-id: 0e463b7bc9 [formerly fa5825b0c5] [formerly 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7]]
Former-commit-id: 9645bd3efad403aca10a90570bae4707b44a92e2 [formerly df6d81dfd9]
Former-commit-id: 8cd870d757
2013-03-28 16:00:27 -05:00
Bryan Kowal
7b230a9f04 Issue #1821 - re-compile grib2.so 32-bit and 64-bit
Former-commit-id: d3a2525705 [formerly 203a3d5200] [formerly da99727625] [formerly d3a2525705 [formerly 203a3d5200] [formerly da99727625] [formerly 2da2b370db [formerly da99727625 [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]]]
Former-commit-id: 2da2b370db
Former-commit-id: cf87439189 [formerly 131e260337] [formerly e0118a2e7c08a69d3c453f036763cc1d265db530 [formerly 998fbe8769]]
Former-commit-id: 508308ddeba82fc74145379e3c709953bd7c5648 [formerly 9343dee116]
Former-commit-id: c29e1e5374
2013-03-28 09:48:27 -05:00
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
cdad316568 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Roger Ferrel
396cc261b2 Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly 74389834de [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]]]
Former-commit-id: 74389834de
Former-commit-id: dea028c7fc [formerly 7244b4d23c] [formerly ac5853bb00b807a9281ab41fb9a03069a5f9ac8e [formerly 4c5aa32169]]
Former-commit-id: a5932806895275b2c8af4b0f876ddbd93ef872a1 [formerly 8cdcee0ec5]
Former-commit-id: d76cbc6e80
2013-03-26 14:47:48 -05:00
Steve Harris
56522d8cf5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 072b1bf35e [formerly 02147470db] [formerly 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]]
Former-commit-id: 75eb70e2f016a2173b886ec488d1cbc6651d6e51 [formerly 779adedea9]
Former-commit-id: 0d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8 [formerly 4f2e9aec0d] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265]
Former-commit-id: 25a851cccf
2013-03-26 12:43:07 -05:00
Bryan Kowal
e7229e6124 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 21fa510eaa [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]]]
Former-commit-id: 21fa510eaa
Former-commit-id: 154bedca1d [formerly f8fafc8d4a] [formerly 1488501309286ce57335dc6761ded04fe446c3fa [formerly db39a45c88]]
Former-commit-id: 011a44105665b50f56331fc21dda723ff864dd90 [formerly 01d571a088]
Former-commit-id: 2d5d41e214
2013-03-25 16:52:33 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Richard Peter
e62f6880db Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c [formerly 4b386ccd1c] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -05:00
Greg Armendariz
e4d51820e2 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]]
Former-commit-id: 85113a66b6
Former-commit-id: 8550ade3ba [formerly 1884b6dce3] [formerly 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6]]
Former-commit-id: 8865116ee2a1c8adf793566471920cb0699d0ba9 [formerly 559136f546]
Former-commit-id: f9d1bfbb48
2013-03-21 12:55:59 -05:00
Bryan Kowal
fc836cda4f Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 2395ca0b3b [formerly 574f6cf4ad] [formerly 4e37fa6627] [formerly 5b15c6fcaa [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 95b9e9b751 [formerly 88b0c2e120] [formerly 77e7359cd424f1e3096c107873683b66ceb81137 [formerly 8141f49211]]
Former-commit-id: 1800cbc92a8918b59f5980df4cafec6fab28acd7 [formerly 6e9c94566c]
Former-commit-id: 17c46599a4
2013-03-21 10:04:29 -05:00
Bryan Kowal
a9dd3bd622 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Bryan Kowal
bb8b9b69da Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
Former-commit-id: fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]]]
Former-commit-id: 74b4bb0891
Former-commit-id: c7403dffe2 [formerly 6b8538f7f5] [formerly 3ba7c5a5f785e32de3db6c45c7f138af8ec9aa79 [formerly 7628860bfe]]
Former-commit-id: d011da6f3e84b53833888641711e30f0f78af275 [formerly cb78a6af53]
Former-commit-id: b05b21401f
2013-03-19 13:27:38 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3 Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00