Commit graph

1071 commits

Author SHA1 Message Date
Dustin Johnson
c6c0e2cd5a Merge "Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up. Peer review comments" into omaha_13.4.1
Former-commit-id: eb096536b3 [formerly c2cdafa265] [formerly f6a63050a1 [formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]
Former-commit-id: f6a63050a1
Former-commit-id: f2e4d0c743
2013-04-17 13:03:16 -05:00
Dustin Johnson
1ea04e20e0 Issue #1914 Add plugin based registry notification
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7

Former-commit-id: dd190be390 [formerly 91fe9ea501] [formerly 8989c09566 [formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]
Former-commit-id: 8989c09566
Former-commit-id: 0e1994a03c
2013-04-17 12:17:23 -05:00
Ben Steffensmeier
0be0b444e4 Issue #1868 Rewrite mergeAll in PluginDao
Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d

Former-commit-id: d21778dbfb [formerly 7dc1e34f1b] [formerly 3e83b37afd [formerly 93a4bc3f6e7ae7de959a25a563778f424d53f2d1]]
Former-commit-id: 3e83b37afd
Former-commit-id: bf72ff3d37
2013-04-17 11:58:41 -05:00
Mike Duff
e1e3449c71 Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
Peer review comments

Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb

Former-commit-id: 0935bc3e30 [formerly 1f80f38e8a] [formerly 866e27825f [formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]
Former-commit-id: 866e27825f
Former-commit-id: 17d3ed8fde
2013-04-17 10:48:25 -05:00
Richard Peter
a4bbf3c07a Merge "Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes." into omaha_13.4.1
Former-commit-id: 61c22f6715 [formerly 577c9c144d] [formerly 5b1df2ba1a [formerly 81a40e8324f38f819039d179889b4b7c016d3dfe]]
Former-commit-id: 5b1df2ba1a
Former-commit-id: c614e29a9c
2013-04-17 09:33:06 -05:00
Brad Gonzales
a21b495206 Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: 005c935be6 [formerly dc37712fda] [formerly b75ef08190 [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]
Former-commit-id: b75ef08190
Former-commit-id: 16f030294d
2013-04-16 14:44:06 -05:00
Mike Duff
69dd972313 Issue #1786 - fix null pointer
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d

Former-commit-id: ad08e0a6ac [formerly 6b909c7902] [formerly 7701902083 [formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]
Former-commit-id: 7701902083
Former-commit-id: 53c87a865c
2013-04-16 14:21:28 -05:00
Dustin Johnson
ce9f5a7365 Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1

Former-commit-id: 67e49201d6 [formerly 255aea053b] [formerly 58b6899672 [formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]
Former-commit-id: 58b6899672
Former-commit-id: cb899b3fa0
2013-04-16 11:30:06 -05:00
Dustin Johnson
ee0572026a Issue #1906 Remove new registry plugin from datadelivery feature
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598

Former-commit-id: e44d3a8715 [formerly c8241840c5] [formerly 977702e876 [formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]
Former-commit-id: 977702e876
Former-commit-id: 8170693941
2013-04-16 10:36:56 -05:00
Richard Peter
4ed90bf67a Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
Former-commit-id: 30e77171ab [formerly 390bf03c39] [formerly 5a11d3cc1c [formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 6be394ba64
2013-04-16 09:35:12 -05:00
Dustin Johnson
395e4db621 Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044

Former-commit-id: 3e5ace2cf3 [formerly 391a7bb999] [formerly 8b38dec4bb [formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 80ff75c473
2013-04-16 08:08:47 -05:00
Ron Anderson
24a6a3590f Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: 4ea01a29ce [formerly c233ce042d] [formerly 4cd87f2726 [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]
Former-commit-id: 4cd87f2726
Former-commit-id: e9f674a575
2013-04-15 18:02:47 -05:00
Dave Hladky
d0ec4f0d87 Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: c52445652a [formerly 60fa768195] [formerly 978e68d893 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]
Former-commit-id: 978e68d893
Former-commit-id: 5789936212
2013-04-15 17:58:06 -05:00
Lee Venable
b18fa4f6bf Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: 9ae56e2172 [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 042819679ba8e0d22695b41059772da841619f29]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 1674a59ed3
2013-04-15 15:33:53 -05:00
Nate Jensen
d785d3f1c2 Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
Former-commit-id: 56c1fe7422 [formerly 0cbf561f7c] [formerly d411aad285 [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]
Former-commit-id: d411aad285
Former-commit-id: 9d0e3fd0c2
2013-04-15 14:57:03 -05:00
Matt Nash
317cbf0950 Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840

Former-commit-id: 7ffb45758d [formerly 0d12fb16bc] [formerly 4b896002ac [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]
Former-commit-id: 4b896002ac
Former-commit-id: 87af6d2809
2013-04-15 14:53:07 -05:00
Mike Duff
7a1809afca Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: 8271eaf328 [formerly 020713663a] [formerly 85f1aba297 [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]
Former-commit-id: 85f1aba297
Former-commit-id: f61bae1c3e
2013-04-15 09:40:07 -05:00
Ron Anderson
b60c6b19e6 Merge "Issue #1845: Fix gfeNotify with java qpid broker" into omaha_13.4.1
Former-commit-id: 4e62fbdd54 [formerly df06966a09] [formerly 428fdebd9e [formerly f23561f863b623b230b19ef2075560507fc61fb6]]
Former-commit-id: 428fdebd9e
Former-commit-id: c4d754d75e
2013-04-15 08:27:42 -05:00
Nate Jensen
bee4f5fafd Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
Former-commit-id: ea2c0e6c40 [formerly b24ccfd7a3] [formerly a422709ab6 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]
Former-commit-id: a422709ab6
Former-commit-id: 32ea01b8b8
2013-04-12 12:39:12 -05:00
Richard Peter
c613cfb4da Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

Former-commit-id: 4e3e044281 [formerly 025600f4cb] [formerly a6ffc663a9 [formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]
Former-commit-id: a6ffc663a9
Former-commit-id: 207b4cafcc
2013-04-12 12:04:54 -05:00
Benjamin Phillippe
e5fbf006dd Issue #1802 Implemented ebxml registry replication
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: e3f3483b51 [formerly 120906de78] [formerly ec69cdeb44 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
2013-04-12 11:27:45 -05:00
Roger Ferrel
0b7d85a43f Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 1258e12e11 [formerly 842852d975] [formerly 4c15be46a0 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]
Former-commit-id: 4c15be46a0
Former-commit-id: e3bacfb9f0
2013-04-12 11:10:13 -05:00
Bryan Kowal
d2cb482ead Issue #1901 - EDEX will no longer automatically be killed during shutdown
Former-commit-id: fabebb7adf [formerly 36fa6f932b] [formerly 81423bdca1 [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]
Former-commit-id: 81423bdca1
Former-commit-id: 694e7fe9ee
2013-04-12 10:36:15 -05:00
David Gillingham
d9035f421c Issue #1898: Modify service backup export_configuration script to also include site's map bundles.
Former-commit-id: 967ec40df6 [formerly d5c8ecc6d3] [formerly 7303425900 [formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]
Former-commit-id: 7303425900
Former-commit-id: b6201bba2f
2013-04-12 09:50:47 -05:00
Matt Nash
4ee6085bda Issue #1871 convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 64323fc0af [formerly cd77308fac] [formerly 6c488cee05 [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]
Former-commit-id: 6c488cee05
Former-commit-id: 7dd72ab7d5
2013-04-12 09:31:23 -05:00
Matt Nash
e6fc7942b8 Issue #1871 add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]
Former-commit-id: b44ee44664
Former-commit-id: c95e825d35
2013-04-12 09:31:16 -05:00
Matt Nash
705be14b64 Issue #1871 make Java data access class better match Python version
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

Former-commit-id: baafdafed7 [formerly 68c84fd8cc] [formerly 4ac6480f52 [formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]
Former-commit-id: 4ac6480f52
Former-commit-id: 7ffd8efcf2
2013-04-12 09:31:07 -05:00
Nate Jensen
12d4837e78 Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
Former-commit-id: 03fac8cb06 [formerly 36ad161721] [formerly 8561b201d5 [formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]
Former-commit-id: 8561b201d5
Former-commit-id: 826e64a990
2013-04-12 09:30:38 -05:00
Matt Nash
123351e82b Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 68892951c5 [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: caf1f1fdf7
2013-04-12 07:55:56 -05:00
Steve Harris
55dda49d47 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: 0d86b95f1b [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]
Former-commit-id: 0fed14d765
Former-commit-id: fe6a078c64
2013-04-11 13:14:00 -05:00
Richard Peter
8c91f737ba Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
Former-commit-id: b29d274316 [formerly a244fe0cd0] [formerly 7f25a86e4d [formerly cd417d34a230322f80dd48eb59416c938697320d]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 830ec7274c
2013-04-10 16:57:38 -05:00
Bryan Kowal
fa1e0a02b0 Issue #1874 - created external properties files for specifying the number of grib decode threads
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers

Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff

Former-commit-id: 4ef22f8e93 [formerly eb04d2b85f] [formerly b5994702dc [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: b5994702dc
Former-commit-id: a60f14f5d6
2013-04-10 16:24:39 -05:00
Richard Peter
148776865f Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
Former-commit-id: 429d562563 [formerly 060cf5b326] [formerly a31dec3cc8 [formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]
Former-commit-id: a31dec3cc8
Former-commit-id: 558812ff6e
2013-04-10 14:40:36 -05:00
Ben Steffensmeier
3c48093ab4 Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
Former-commit-id: 26b8938242 [formerly d727b93273] [formerly d0070fcec4 [formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]
Former-commit-id: d0070fcec4
Former-commit-id: 0ac1b41eeb
2013-04-10 14:09:47 -05:00
Mike Duff
080bb15b65 Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: f584e17aa7 [formerly b9abbcdf37] [formerly 0a33734e6f [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]
Former-commit-id: 0a33734e6f
Former-commit-id: fd55f6ed42
2013-04-10 10:29:33 -05:00
Max Schenkelberg
e369546b51 Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: b695de3698
Former-commit-id: f2a0f8223a
2013-04-10 10:04:17 -05:00
Dustin Johnson
0578916ec1 Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
2013-04-09 11:40:25 -05:00
Steve Harris
ed4150db5f 13.3.1-19 baseline
Former-commit-id: dc9fef33a9 [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Richard Peter
c9afa907cd Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
Former-commit-id: 0abecda3d1 [formerly aba25dc7c4] [formerly e95911f615 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]
Former-commit-id: e95911f615
Former-commit-id: afef66b87e
2013-04-08 14:20:09 -05:00
Bryan Kowal
eea02ee972 Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch


Former-commit-id: e92e2712da [formerly 4cc9a742c8] [formerly c08190a586 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]
Former-commit-id: c08190a586
Former-commit-id: 55f234c2d1
2013-04-08 14:04:05 -05:00
Steve Harris
5f5dd9a031 Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
Former-commit-id: 2711be871a [formerly 53492c2902] [formerly 84370207a1 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]
Former-commit-id: 84370207a1
Former-commit-id: 0105f15306
2013-04-08 13:47:34 -05:00
Greg Armendariz
274c0a9c26 Issue #1872 - Add Jensen's build fix
Former-commit-id: 8b2d3f7b00 [formerly fba9de785d] [formerly 0e2b440b86 [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]
Former-commit-id: 0e2b440b86
Former-commit-id: ea340322bb
2013-04-08 12:26:20 -05:00
Dustin Johnson
4b4eb8e406 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
2013-04-05 12:41:02 -05:00
Bryan Kowal
e05b72b17e Issue #1873 - reduce EDEX shutdown time
Former-commit-id: b252ca6506 [formerly bec051d00a] [formerly 82a1b0752e [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]
Former-commit-id: 82a1b0752e
Former-commit-id: 3bd9819e59
2013-04-04 17:36:09 -05:00
Dustin Johnson
9531e50cac Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ec85cdcf8c [formerly 7cf482512d] [formerly 06e6d84273 [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]
Former-commit-id: 06e6d84273
Former-commit-id: add67ae3dc
2013-04-04 16:44:57 -05:00
Roger Ferrel
5c4a938c72 Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: 90dae591a6 [formerly 998714524d] [formerly b00d64ec0a [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]
Former-commit-id: b00d64ec0a
Former-commit-id: 8c5f3fb8f7
2013-04-04 13:22:10 -05:00
Max Schenkelberg
fb1a6e203b Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Conflicts:

	cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java


Former-commit-id: be574276f9 [formerly 6d0960c4ef] [formerly b042037a67 [formerly ed981dc2487d169a502f7396520899fc55ff3299]]
Former-commit-id: b042037a67
Former-commit-id: 1b81c79b13
2013-04-04 13:21:35 -05:00
Dustin Johnson
9a4f4431de Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: dbeffa91fe [formerly 375f0801a2] [formerly 3c41127c42 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]
Former-commit-id: 3c41127c42
Former-commit-id: 0dc74710ce
2013-04-04 13:10:24 -05:00
Richard Peter
e9fe732dac 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: 91d708eaac [formerly f77948929d] [formerly 814bff6ddb [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]
Former-commit-id: 814bff6ddb
Former-commit-id: 4337abd873
2013-04-04 13:03:41 -05:00
Bryan Kowal
a214ee536a 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: 991de38661 [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]
Former-commit-id: 3d04b0f87b
Former-commit-id: a154e3b3cd
2013-04-04 13:03:08 -05:00