Commit graph

1656 commits

Author SHA1 Message Date
Richard Peter
4d01748097 Merge "Issue #1742 Fixed concurrent mod exception in DAT config updates Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e" into development
Former-commit-id: 531fa21a9c [formerly fd4e8b931c] [formerly 5772854d78bb31832b58a08f72c7aa9c1ac70461 [formerly e5b6102791]] [formerly 39a56abb39 [formerly e5b6102791 [formerly 7988827cf78516d2b928db9004cec0ab5bebd08e]]]
Former-commit-id: 39a56abb39
Former-commit-id: a2323adbe5d1fc9877caa9023a75acaa597ae213 [formerly 2258c4cee1]
Former-commit-id: cdc82ab15f
2013-08-19 10:10:38 -05:00
Dave Hladky
1aae775e7e Issue #1742 Fixed concurrent mod exception in DAT config updates
Change-Id: I78ddb871e2bdc3c4200d9c32ae5d9fbd729f116e

Former-commit-id: 1072e7760e [formerly c25937ec85] [formerly 111ffab3c9] [formerly 6d9872d694 [formerly 111ffab3c9 [formerly 8f3cbb79c086845d49b7a877359cac3f83fc1c1c]]]
Former-commit-id: 6d9872d694
Former-commit-id: d8004af680ebf95d68aa96730d6ee5f26937c6f4 [formerly 2702279e7a]
Former-commit-id: d290c84290
2013-08-16 16:26:19 -05:00
Mike Duff
a6241aa1f7 Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
Peer review comments

Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0

Former-commit-id: e0ddf25ffb [formerly 89cdc61d65] [formerly 70af70ba8d] [formerly 6190281e77 [formerly 70af70ba8d [formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]]
Former-commit-id: 6190281e77
Former-commit-id: d87f78a39b53d661f4c977717f1277c1b9e92059 [formerly c4c73b4e3b]
Former-commit-id: 8d27c7b420
2013-08-16 13:13:02 -05:00
Everett Kladstrup
38a8d8268f Issue #2240 Fix incorrect environment assumptions
* using $awips_home as the prefix for java/python/psql causes
  problems on edex-environment (wes2bridge) installs; where
  $awips_home does not contain the java/python/psql installs, instead
  they are located at /awips2

Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee

Former-commit-id: 07f18003f1 [formerly 2803eded49] [formerly 535248b69b] [formerly fba53e9fe3 [formerly 535248b69b [formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]
Former-commit-id: fba53e9fe3
Former-commit-id: 0dd804a51c987294808ac793df221d81414a3689 [formerly 6883cdc389]
Former-commit-id: b602d37357
2013-08-16 11:02:15 -05:00
Nate Jensen
6d6c0d121b Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
Former-commit-id: 5b2e7006b6 [formerly f5e84f17ea] [formerly 469df6d806] [formerly d28cb1ff68 [formerly 469df6d806 [formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]]
Former-commit-id: d28cb1ff68
Former-commit-id: c43551d6dbc778aac9cbe8d81d942096567b5381 [formerly b34d67ced3]
Former-commit-id: 8f6f749c60
2013-08-16 10:06:32 -05:00
Richard Peter
bcdd57509a Merge "Issue #2196 final name change for registries. Now registry and centralRegistry." into development
Former-commit-id: 2ca642e7d9 [formerly bbde1db7a0] [formerly ae1d4ca6b4] [formerly ea98de5ad1 [formerly ae1d4ca6b4 [formerly e9dc49bfac807b7ddbe2a6ac39e13eb917aacf44]]]
Former-commit-id: ea98de5ad1
Former-commit-id: 1989be5a9390d6ebd6e2683037b40396ddb99110 [formerly 8f12009352]
Former-commit-id: 6bb8ae2dda
2013-08-16 09:41:08 -05:00
Ben Steffensmeier
644b43649a Issue #2260 Switch poessounding to NSharp.
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78

Former-commit-id: 63604dad27 [formerly fb23de355e] [formerly 36a920333f] [formerly 74b0b57f4b [formerly 36a920333f [formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 2dc426002f0ac501f60be71e2c0a10436e7cf8c8 [formerly 94e79ff7b4]
Former-commit-id: ad82565d1a
2013-08-15 17:51:52 -05:00
Max Schenkelberg
53d4c9d9c2 Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611

Former-commit-id: f8e36bea6f [formerly a6a44754c9] [formerly 57a0df81a6] [formerly 9e213438f4 [formerly 57a0df81a6 [formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]
Former-commit-id: 9e213438f4
Former-commit-id: e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9]
Former-commit-id: 0703b5c772
2013-08-15 17:36:36 -05:00
Max Schenkelberg
39cdbf728f Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: 54b4b759fd [formerly 5a4d880498] [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly e85d66f4e5 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029]
Former-commit-id: 352e21ffd3
2013-08-15 15:50:40 -05:00
Bryan Kowal
5ccd628305 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 31ee9b4bdc [formerly a962be9a15] [formerly 0b4961e9b0] [formerly 8b51e353f1 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]
Former-commit-id: 8b51e353f1
Former-commit-id: b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c]
Former-commit-id: 9943f3a57c
2013-08-15 15:38:11 -05:00
Bryan Kowal
33b6f03899 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: fb1feea107 [formerly 683d7e5b19] [formerly c1dab22fdb] [formerly 94eacfc460 [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]]
Former-commit-id: 94eacfc460
Former-commit-id: b8d6af6f18e6e9e34cf5082362f7b792032c2de6 [formerly 75c6d4ebf6]
Former-commit-id: 53124c5e02
2013-08-15 15:30:05 -05:00
Brad Gonzales
32a2f9cff4 Issue #2196 final name change for registries. Now registry and centralRegistry.
Change-Id: I172aa9918c2281fa2923503eeb067954e4bf955f

Former-commit-id: 7cf7c73053 [formerly 18956d5816] [formerly 2279d03112] [formerly 705d4660cc [formerly 2279d03112 [formerly f5a61ca98bc2da6bb69ef6f78fe40e390bfab45f]]]
Former-commit-id: 705d4660cc
Former-commit-id: 8eaf9ba357094cfe61c11d3c50bbdda77fcde437 [formerly cf77bb12b7]
Former-commit-id: 48cc348080
2013-08-15 14:57:53 -05:00
Max Schenkelberg
62f4f1bafb Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: db24201469 [formerly bbad83c21a] [formerly 6f60751ec6] [formerly c5575f9624 [formerly 6f60751ec6 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d]
Former-commit-id: 8139e0dfb7
2013-08-15 12:21:43 -05:00
Ben Steffensmeier
15a295ca05 Issue #2259 fix units for goes point data pressure
Former-commit-id: 91df4581d2 [formerly d3628766b8] [formerly 2171c10e9e] [formerly 984c5f2684 [formerly 2171c10e9e [formerly 411c30dc9a5396ade5af03294cad612472e8060b]]]
Former-commit-id: 984c5f2684
Former-commit-id: 430e4cc00c7532c4d09b1b5178c1c9a413e1a952 [formerly fff0ce30ae]
Former-commit-id: 7070a2bd18
2013-08-15 12:02:24 -05:00
David Gillingham
218ec39696 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]
Former-commit-id: 9c656c28b9
2013-08-15 11:30:45 -05:00
Brad Gonzales
278d98e214 Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
       and other recommendations from peer review.  Removed count attribute
       from RegistryStatisticsEvent.  Changed construction of SubsriptionRequestEvents
       to set numRecords attribute.

Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2

Former-commit-id: edbea8c515 [formerly e4251ad380] [formerly d2dac35b65] [formerly 64c6e5abff [formerly d2dac35b65 [formerly 818688266a32feec2081f0c6e74a37e431df9435]]]
Former-commit-id: 64c6e5abff
Former-commit-id: 974ed273b70311d9cd1f9f764733500330fab491 [formerly 84e14a5a62]
Former-commit-id: fa4e8d9897
2013-08-15 09:35:10 -05:00
Richard Peter
24f8756c64 Issue #2214: Fix merge issue with gfe-spring.xml
Former-commit-id: e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly dad1b6fb45 [formerly eb8805e51c [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]
Former-commit-id: dad1b6fb45
Former-commit-id: cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430]
Former-commit-id: bbe1002d2d
2013-08-14 18:32:39 -05:00
David Gillingham
5205fe56a7 Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 31ae04c92a [formerly 1d3f3da9cc] [formerly 0f4f24beb8] [formerly f8b6ec20c1 [formerly 0f4f24beb8 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a]
Former-commit-id: 3af47effc5
2013-08-14 17:10:04 -05:00
Richard Peter
84bef1f2ec Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]
Former-commit-id: c0b0eef331
2013-08-14 15:23:18 -05:00
Richard Peter
28a53c8a33 Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]
Former-commit-id: 3f65eaf74b
2013-08-14 14:29:55 -05:00
Brad Gonzales
bd8a061ef4 Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.

Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044

Former-commit-id: ec3646def6 [formerly 50a10b3efb] [formerly 533deffd53] [formerly 5d169e4df1 [formerly 533deffd53 [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]
Former-commit-id: 5d169e4df1
Former-commit-id: 6534d32bcc0af9a21a9c40a2ef91bb08b973dcca [formerly f3bc3d9185]
Former-commit-id: 88fdc1e56b
2013-08-14 12:35:18 -05:00
Roger Ferrel
8daa627e56 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: d3a33f2855 [formerly 81a31214cd] [formerly caa97d7d09] [formerly 87f9cb2fb3 [formerly caa97d7d09 [formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: f7dc5f884640b503af95dd11719fbe5689844939 [formerly 5be73428f0]
Former-commit-id: 87ca79b294
2013-08-14 10:25:49 -05:00
Steve Harris
6f1b6d494f 13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]
Former-commit-id: 4f9288e7c1
2013-08-14 10:24:26 -04:00
Nate Jensen
dde8a77452 Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2

Former-commit-id: 9df41ff246 [formerly 23fe237b7e] [formerly 09872d6713] [formerly 959b50d184 [formerly 09872d6713 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: 51c4ef63ff05fff6b408532bd09a5c1ae80588a3 [formerly 44ef756627]
Former-commit-id: aaee338f5c
2013-08-13 16:59:57 -05:00
Nate Jensen
98b8bcaf15 Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: ee45599b10 [formerly b435eba010] [formerly f8d8e312f3] [formerly d995e29afe [formerly f8d8e312f3 [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]
Former-commit-id: d995e29afe
Former-commit-id: d45c592549b4132053bd6601c4ebc9e98574f455 [formerly 759348ba2e]
Former-commit-id: f8a839a0a1
2013-08-13 12:34:44 -05:00
Nate Jensen
f63ade7443 Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: d6a7d77ae6 [formerly 86e823cc9f] [formerly 260ea8a0b9] [formerly 576b8fa830 [formerly 260ea8a0b9 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]]
Former-commit-id: 576b8fa830
Former-commit-id: 3bce82da0dd11c2290eaa18420eb44d314e94d13 [formerly 295b29860b]
Former-commit-id: 12fd3b3b8d
2013-08-13 12:32:09 -05:00
Nate Jensen
e63e7120e5 Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f

Conflicts:

	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java


Former-commit-id: 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 63b2fe798a [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8]
Former-commit-id: 464a104dc1
2013-08-13 12:27:02 -05:00
Matt Nash
5803a64603 Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186

Former-commit-id: 9289576049 [formerly 80172b1aba] [formerly 5aeda85fca] [formerly dda3d78b48 [formerly 5aeda85fca [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]]
Former-commit-id: dda3d78b48
Former-commit-id: 1d7ef8f99d91ca142fcc53e65be8304b5a111b8c [formerly ebb291e6c3]
Former-commit-id: fc6e2bf0c3
2013-08-13 11:59:35 -05:00
Richard Peter
2be0bfe06c Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: 64496ad332 [formerly 3763073459] [formerly 3f6d8a28da] [formerly 60831564a0 [formerly 3f6d8a28da [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]]
Former-commit-id: 60831564a0
Former-commit-id: b8c51d60a2d0aa03907fcbc0718b69115b70690e [formerly a4d9a82ca5]
Former-commit-id: 35a3e81478
2013-08-13 10:10:07 -05:00
Nate Jensen
766da72c20 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 5e24a11e06 [formerly 78256fd891] [formerly df95db8f78] [formerly 0c92461c65 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 19ebf5cd40eb632cc1ff7e301922bcea379b8369 [formerly bf821fdbe0]
Former-commit-id: 988ac46c2b
2013-08-13 09:09:05 -05:00
Nate Jensen
d037198231 Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: 7bbc2ec7d7 [formerly ce20de02a7] [formerly 5948ebca87] [formerly 8101c961d4 [formerly 5948ebca87 [formerly e9e46b68652caff85b2206180856654876f55f12]]]
Former-commit-id: 8101c961d4
Former-commit-id: e0c53384ed3969b5434ffaf4846c3219ee84cc83 [formerly 75f31b372e]
Former-commit-id: 835516348f
2013-08-13 08:56:01 -05:00
Nate Jensen
342649b95b Issue #2142 more removing of dependencies from common plugins to edex.common
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f

Former-commit-id: c137e92198 [formerly 23802cfe02] [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 28c79d0a56 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 80525ffd198786b7cfb596c35ca6de95bc0f8008 [formerly 018845db8f]
Former-commit-id: 2117ec71c6
2013-08-12 15:41:39 -05:00
Richard Peter
6dd74d080f Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 201004e203 [formerly 5548ae76b1] [formerly d8124958b5] [formerly 2de533cbbf [formerly d8124958b5 [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]
Former-commit-id: 2de533cbbf
Former-commit-id: 36f4d2af4006b315ff6170d430184188400680b2 [formerly 4605595354]
Former-commit-id: e9651a43ed
2013-08-12 15:01:51 -05:00
Nate Jensen
5d26df965e Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: 04d2a4741d [formerly 1473d04e25] [formerly 82472058e9] [formerly de38280317 [formerly 82472058e9 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]
Former-commit-id: de38280317
Former-commit-id: fbcdcf125155de037dae9b094e3b3d3c7c63fb4c [formerly f6c4ec164f]
Former-commit-id: 65c7c9e9b3
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
f80b7d3112 Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 62961949ba [formerly 00f61c4858] [formerly 67c84f2fb8] [formerly 46c3413805 [formerly 67c84f2fb8 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]]
Former-commit-id: 46c3413805
Former-commit-id: 8897a82fdb7c4ccf99db2fe277299859be6243af [formerly 64b1d5d9dd]
Former-commit-id: 16dd725cc1
2013-08-12 13:43:43 -05:00
Roger Ferrel
3ff13b5a3a Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: d6bebdca540bfacd287d4ffd9f21c25794c91d4f [formerly 3d9be94e7e]
Former-commit-id: 8884343d89
2013-08-12 12:50:12 -05:00
Nate Jensen
f3618a3bca Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 525666a23f [formerly 2f641b40d7] [formerly 94096b8f65] [formerly 48758e64ef [formerly 94096b8f65 [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]
Former-commit-id: 48758e64ef
Former-commit-id: 7f46154e70296dfe6b057533331f4761d699edc2 [formerly ce0c8f3259]
Former-commit-id: f69d155d26
2013-08-12 12:47:51 -05:00
Nate Jensen
b886cddc80 Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly c5b96690ce [formerly 9f0698fe75 [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]
Former-commit-id: c5b96690ce
Former-commit-id: a8203aeffc85324d517d20a945883c7a079b265e [formerly b18fa88aaf]
Former-commit-id: 0261071228
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
4376d4c066 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly 9901e7a622 [formerly 479f72bc10 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]
Former-commit-id: 9901e7a622
Former-commit-id: 9bb59859513212d7b568900c9fea7ec4afdb0e0a [formerly 5071cf2fce]
Former-commit-id: 98dab7a5bd
2013-08-12 11:37:51 -05:00
Richard Peter
76acb0349e Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly b6c34162c6 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 5df3d208a95eb5996e46425cd66aab9d4d336f54 [formerly a3895de934]
Former-commit-id: 6d713faf72
2013-08-12 11:09:55 -05:00
Brad Gonzales
030b466b8a Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7

Former-commit-id: b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 21c1b35c8b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 1f321bfc5353c97375cf29fe6b5a3b7362000fbf [formerly 780062acf3]
Former-commit-id: 2468077e8b
2013-08-09 15:42:38 -05:00
Max Schenkelberg
cc6950107f Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]
Former-commit-id: 4fdb3c8306
2013-08-09 14:24:49 -05:00
Ben Steffensmeier
b357fb0018 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: c88e432d04 [formerly bf2dfbaca8] [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 9e799b4df1 [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]
Former-commit-id: d1d3491aaf
Former-commit-id: 5ee45ce1a1eec70e460a54a9e98781bb2db78baa [formerly 761cb47f73]
Former-commit-id: 20a7ba8e69
2013-08-09 13:00:18 -05:00
Lee Venable
b46745eebb Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: 69645f03dc
Former-commit-id: e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]
Former-commit-id: 696ee07b3f
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
1e64c5d491 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: dad0681ae0
Former-commit-id: 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]
Former-commit-id: b467d0fd66
2013-08-08 16:31:35 -05:00
Greg Armendariz
d4840d3802 Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]
Former-commit-id: 24dc722be4
2013-08-08 16:24:39 -05:00
Roger Ferrel
e402e512c7 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly efed5777e9 [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]
Former-commit-id: efed5777e9
Former-commit-id: 02efe6e352bb2e5531596957581bbb2f825eb545 [formerly 96e6d1f7cc]
Former-commit-id: 2dc203ebdf
2013-08-08 16:15:34 -05:00
Greg Armendariz
076a0b08ac 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]
Former-commit-id: 9f2f62427b
2013-08-08 17:00:36 -04:00
Nate Jensen
5e3e8941ec Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: a9f5465c99
Former-commit-id: 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]
Former-commit-id: 71a7b044ae
2013-08-08 14:46:52 -05:00
Greg Armendariz
75d1e77f1b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]
Former-commit-id: f777a744e5
2013-08-08 15:34:01 -04:00