Commit graph

1409 commits

Author SHA1 Message Date
Dave Hladky
14a08d6f66 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 c52445652a [formerly 60fa768195] [formerly 978e68d893 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]
Former-commit-id: 978e68d893
Former-commit-id: d0ec4f0d87 [formerly 5789936212]
Former-commit-id: 0f7843f0b7
2013-04-15 17:58:06 -05:00
Lee Venable
783df0394c Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: 9ae56e2172 [formerly 8723d88a19] [formerly 9ae56e2172 [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 042819679ba8e0d22695b41059772da841619f29]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: b18fa4f6bf [formerly 1674a59ed3]
Former-commit-id: ec3f0c0a11
2013-04-15 15:33:53 -05:00
Nate Jensen
f8c3cb4589 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 56c1fe7422 [formerly 0cbf561f7c] [formerly d411aad285 [formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]
Former-commit-id: d411aad285
Former-commit-id: d785d3f1c2 [formerly 9d0e3fd0c2]
Former-commit-id: 2eaf49612c
2013-04-15 14:57:03 -05:00
Matt Nash
a8358a4b40 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 7ffb45758d [formerly 0d12fb16bc] [formerly 4b896002ac [formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]
Former-commit-id: 4b896002ac
Former-commit-id: 317cbf0950 [formerly 87af6d2809]
Former-commit-id: a2e421048c
2013-04-15 14:53:07 -05:00
Mike Duff
feb9fc93ef Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: 8271eaf328 [formerly 020713663a] [formerly 8271eaf328 [formerly 020713663a] [formerly 85f1aba297 [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]
Former-commit-id: 85f1aba297
Former-commit-id: 7a1809afca [formerly f61bae1c3e]
Former-commit-id: 812599d8db
2013-04-15 09:40:07 -05:00
Ron Anderson
dca0eeb302 Merge "Issue #1845: Fix gfeNotify with java qpid broker" into omaha_13.4.1
Former-commit-id: 4e62fbdd54 [formerly df06966a09] [formerly 4e62fbdd54 [formerly df06966a09] [formerly 428fdebd9e [formerly f23561f863b623b230b19ef2075560507fc61fb6]]]
Former-commit-id: 428fdebd9e
Former-commit-id: b60c6b19e6 [formerly c4d754d75e]
Former-commit-id: e01f6a0f7f
2013-04-15 08:27:42 -05:00
Nate Jensen
f1c3f25368 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 ea2c0e6c40 [formerly b24ccfd7a3] [formerly a422709ab6 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]
Former-commit-id: a422709ab6
Former-commit-id: bee4f5fafd [formerly 32ea01b8b8]
Former-commit-id: e2f072f2d5
2013-04-12 12:39:12 -05:00
Richard Peter
2110908015 Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

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

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

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

Former-commit-id: 64323fc0af [formerly cd77308fac] [formerly 64323fc0af [formerly cd77308fac] [formerly 6c488cee05 [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]
Former-commit-id: 6c488cee05
Former-commit-id: 4ee6085bda [formerly 7dd72ab7d5]
Former-commit-id: 6969b0c0ae
2013-04-12 09:31:23 -05:00
Matt Nash
dc0f234f02 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 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]
Former-commit-id: b44ee44664
Former-commit-id: e6fc7942b8 [formerly c95e825d35]
Former-commit-id: 7b25f73a9a
2013-04-12 09:31:16 -05:00
Matt Nash
7f52894c51 Issue #1871 make Java data access class better match Python version
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051

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

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 68892951c5 [formerly bf01f50e17] [formerly 68892951c5 [formerly bf01f50e17] [formerly 4b23ec7c0a [formerly e3df8efa51ad95c952318b59edca702157a59856]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 123351e82b [formerly caf1f1fdf7]
Former-commit-id: d6feca69b4
2013-04-12 07:55:56 -05:00
Steve Harris
98fd30b0d5 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 0d86b95f1b [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]
Former-commit-id: 0fed14d765
Former-commit-id: 55dda49d47 [formerly fe6a078c64]
Former-commit-id: a9d3e94b3b
2013-04-11 13:14:00 -05:00
Richard Peter
a1228d7830 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 b29d274316 [formerly a244fe0cd0] [formerly 7f25a86e4d [formerly cd417d34a230322f80dd48eb59416c938697320d]]]
Former-commit-id: 7f25a86e4d
Former-commit-id: 8c91f737ba [formerly 830ec7274c]
Former-commit-id: c0e4cca8a4
2013-04-10 16:57:38 -05:00
Bryan Kowal
d64370525b 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 4ef22f8e93 [formerly eb04d2b85f] [formerly b5994702dc [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]]
Former-commit-id: b5994702dc
Former-commit-id: fa1e0a02b0 [formerly a60f14f5d6]
Former-commit-id: 2ac40dd058
2013-04-10 16:24:39 -05:00
Richard Peter
5279ca8c53 Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
Former-commit-id: 429d562563 [formerly 060cf5b326] [formerly 429d562563 [formerly 060cf5b326] [formerly a31dec3cc8 [formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]]
Former-commit-id: a31dec3cc8
Former-commit-id: 148776865f [formerly 558812ff6e]
Former-commit-id: 70b9220889
2013-04-10 14:40:36 -05:00
Ben Steffensmeier
bb96a2e866 Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
Former-commit-id: 26b8938242 [formerly d727b93273] [formerly 26b8938242 [formerly d727b93273] [formerly d0070fcec4 [formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]]
Former-commit-id: d0070fcec4
Former-commit-id: 3c48093ab4 [formerly 0ac1b41eeb]
Former-commit-id: ea7aa6d647
2013-04-10 14:09:47 -05:00
Mike Duff
657bb56bf0 Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: f584e17aa7 [formerly b9abbcdf37] [formerly f584e17aa7 [formerly b9abbcdf37] [formerly 0a33734e6f [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]]
Former-commit-id: 0a33734e6f
Former-commit-id: 080bb15b65 [formerly fd55f6ed42]
Former-commit-id: c1a7a62e5b
2013-04-10 10:29:33 -05:00
Max Schenkelberg
f1617ea662 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 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]]
Former-commit-id: b695de3698
Former-commit-id: e369546b51 [formerly f2a0f8223a]
Former-commit-id: 0b2fed1f34
2013-04-10 10:04:17 -05:00
Dustin Johnson
60e910e3d3 Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]]
Former-commit-id: 6bc69df127
Former-commit-id: 0578916ec1 [formerly b78f56f1ca]
Former-commit-id: b61292ce4d
2013-04-09 11:40:25 -05:00
Steve Harris
7b7efd0bd1 13.3.1-19 baseline
Former-commit-id: dc9fef33a9 [formerly 9be238bcc4] [formerly dc9fef33a9 [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]
Former-commit-id: abaf9f12f9
Former-commit-id: ed4150db5f [formerly 340a2cfb23]
Former-commit-id: 7d76371536
2013-04-09 08:37:12 -05:00
Richard Peter
bde2fdcbf8 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 0abecda3d1 [formerly aba25dc7c4] [formerly e95911f615 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]]
Former-commit-id: e95911f615
Former-commit-id: c9afa907cd [formerly afef66b87e]
Former-commit-id: 0c2f84de7f
2013-04-08 14:20:09 -05:00
Bryan Kowal
4f8d471c5e 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 e92e2712da [formerly 4cc9a742c8] [formerly c08190a586 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]
Former-commit-id: c08190a586
Former-commit-id: eea02ee972 [formerly 55f234c2d1]
Former-commit-id: 7bfabf4a4e
2013-04-08 14:04:05 -05:00
Steve Harris
0e857a47e9 Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
Former-commit-id: 2711be871a [formerly 53492c2902] [formerly 2711be871a [formerly 53492c2902] [formerly 84370207a1 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]]
Former-commit-id: 84370207a1
Former-commit-id: 5f5dd9a031 [formerly 0105f15306]
Former-commit-id: ee08ef663f
2013-04-08 13:47:34 -05:00
Greg Armendariz
d25ec9c02c Issue #1872 - Add Jensen's build fix
Former-commit-id: 8b2d3f7b00 [formerly fba9de785d] [formerly 8b2d3f7b00 [formerly fba9de785d] [formerly 0e2b440b86 [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]]
Former-commit-id: 0e2b440b86
Former-commit-id: 274c0a9c26 [formerly ea340322bb]
Former-commit-id: 190d2b79ad
2013-04-08 12:26:20 -05:00
Dustin Johnson
5958178516 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 cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 4b4eb8e406 [formerly 8c52cd190f]
Former-commit-id: fefc0dca3b
2013-04-05 12:41:02 -05:00
Bryan Kowal
82db2880b7 Issue #1873 - reduce EDEX shutdown time
Former-commit-id: b252ca6506 [formerly bec051d00a] [formerly b252ca6506 [formerly bec051d00a] [formerly 82a1b0752e [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]]
Former-commit-id: 82a1b0752e
Former-commit-id: e05b72b17e [formerly 3bd9819e59]
Former-commit-id: 0285965657
2013-04-04 17:36:09 -05:00
Dustin Johnson
bf97f2e7d2 Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ec85cdcf8c [formerly 7cf482512d] [formerly ec85cdcf8c [formerly 7cf482512d] [formerly 06e6d84273 [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]
Former-commit-id: 06e6d84273
Former-commit-id: 9531e50cac [formerly add67ae3dc]
Former-commit-id: 64b2560d05
2013-04-04 16:44:57 -05:00
Roger Ferrel
59bb22e52b 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 90dae591a6 [formerly 998714524d] [formerly b00d64ec0a [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]
Former-commit-id: b00d64ec0a
Former-commit-id: 5c4a938c72 [formerly 8c5f3fb8f7]
Former-commit-id: da4b43a4fc
2013-04-04 13:22:10 -05:00
Max Schenkelberg
61f17d8d34 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 be574276f9 [formerly 6d0960c4ef] [formerly b042037a67 [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]
Former-commit-id: b042037a67
Former-commit-id: fb1a6e203b [formerly 1b81c79b13]
Former-commit-id: 95e73c34f9
2013-04-04 13:21:35 -05:00
Dustin Johnson
ce87841d63 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 dbeffa91fe [formerly 375f0801a2] [formerly 3c41127c42 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]
Former-commit-id: 3c41127c42
Former-commit-id: 9a4f4431de [formerly 0dc74710ce]
Former-commit-id: 32da016541
2013-04-04 13:10:24 -05:00
Richard Peter
52533b4f49 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 91d708eaac [formerly f77948929d] [formerly 814bff6ddb [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]
Former-commit-id: 814bff6ddb
Former-commit-id: e9fe732dac [formerly 4337abd873]
Former-commit-id: 055440acda
2013-04-04 13:03:41 -05:00
Bryan Kowal
f785bd78aa 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 991de38661 [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: a214ee536a [formerly a154e3b3cd]
Former-commit-id: 040bf63b7f
2013-04-04 13:03:08 -05:00
Roger Ferrel
9125683187 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 24e5e7ff35 [formerly 4e607bc7bf] [formerly 24e5e7ff35 [formerly 4e607bc7bf] [formerly 2cd455764b [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]]
Former-commit-id: 2cd455764b
Former-commit-id: df1c674ba0 [formerly 97fdbb2477]
Former-commit-id: d5628c3291
2013-04-04 13:02:58 -05:00
Bryan Kowal
15ec53b037 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: d35246ef31 [formerly 267b2c4dfa] [formerly d35246ef31 [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]
Former-commit-id: 37d869ef60
Former-commit-id: 1ce9d40711 [formerly 6eec333843]
Former-commit-id: 8723415965
2013-04-04 13:01:09 -05:00
David Gillingham
cdba87a6f3 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py


Former-commit-id: 5ae3fbd325 [formerly d24fcc85e2] [formerly 5ae3fbd325 [formerly d24fcc85e2] [formerly 56235e370f [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]
Former-commit-id: 56235e370f
Former-commit-id: b97b1766ee [formerly 60e8146a18]
Former-commit-id: a49920c978
2013-04-04 13:00:36 -05:00
Bryan Kowal
aab6cce629 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: 211307edfd [formerly 9e99447eee] [formerly 211307edfd [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: d40863c38f [formerly fcc7b102ad]
Former-commit-id: 887b7d9c1a
2013-04-04 12:56:58 -05:00
Mike Duff
cbca9678b4 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: 2e424cd74a [formerly 4ab07a31da] [formerly 2e424cd74a [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 57fa0f2ef9 [formerly aefbc4f54f]
Former-commit-id: 0901f42fc9
2013-04-04 12:56:44 -05:00
David Gillingham
7eb15969fb Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF


Former-commit-id: 05f52e6e54 [formerly 055c36ea41] [formerly 05f52e6e54 [formerly 055c36ea41] [formerly 0969f85246 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]
Former-commit-id: 0969f85246
Former-commit-id: 2038a703ac [formerly 8859674c70]
Former-commit-id: 184bb9e966
2013-04-04 12:46:21 -05:00
Steve Harris
a7b174bfaf Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a [formerly ed8c0487fe]
Former-commit-id: 7eda24c3b0
2013-04-04 11:58:50 -05:00
Steve Harris
dc0baf57ba Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 2bc12f7a23 [formerly 0f000f4485] [formerly 2bc12f7a23 [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 0342b648b6 [formerly c7b9690456]
Former-commit-id: f22108c973
2013-04-03 15:52:19 -05:00
Richard Peter
75a2845464 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 920ba0628c [formerly d282a49b6f] [formerly 920ba0628c [formerly d282a49b6f] [formerly 6d73e25290 [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]
Former-commit-id: 6d73e25290
Former-commit-id: 8ac6ae3539 [formerly 64dc5c4d23]
Former-commit-id: 0548ee285d
2013-04-03 15:14:17 -05:00
Richard Peter
aca16ca6f9 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: dd527a4ef2 [formerly cbbd9ab90d] [formerly dd527a4ef2 [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]
Former-commit-id: cfcacd20e9
Former-commit-id: d973d83519 [formerly 58908a0fd7]
Former-commit-id: d2dd57fee4
2013-04-03 15:13:26 -05:00
Steve Harris
fc009792e3 13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 0edd049e3b [formerly bf6c3b6762]
Former-commit-id: 044912d48b
2013-04-03 14:58:29 -05:00
Bryan Kowal
1aa28394c4 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: d1663ea98b [formerly e788c7b471] [formerly d1663ea98b [formerly e788c7b471] [formerly ee8c99ef6e [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: b60bea920c [formerly 344237d9ee]
Former-commit-id: 962755143e
2013-04-03 14:03:54 -05:00