Nate Jensen
f08d3f4a9d
Merge "Issue #2254 - Send an email to omaha_awips on unit test failures or errors" into development
...
Former-commit-id: 22288cd9249420ffd643e5bb6d1f84bc6eda5326
2013-08-14 15:45:29 -05:00
Richard Peter
a5383dbfa4
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: ddfc06eb9753e893ece28e1718c5e4550e82b053
2013-08-14 15:33:02 -05:00
Richard Peter
2a9276c728
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: e1aa1aa51e2325b005604aa971e842bccfcd8375
2013-08-14 15:23:18 -05:00
Greg Armendariz
edf12d4d4f
Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
...
Former-commit-id: ced372967755b611158c213011132a353b72f421
2013-08-14 15:00:26 -05:00
Richard Peter
ee6b9eb11a
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: 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3
2013-08-14 14:29:55 -05:00
Mike Duff
0973d5018c
Issue #2254 - Send an email to omaha_awips on unit test failures or errors
...
Former-commit-id: 8e0e4e93a094c60c18b28a5ebc49a8f175e6f373
2013-08-14 14:20:52 -05:00
Richard Peter
bca32c2e0a
Merge "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." into development
...
Former-commit-id: 3f45f1988372462a7f541b9e76a893b1e2f4e1ae
2013-08-14 13:57:48 -05:00
Nate Jensen
0947f358b1
Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
...
Former-commit-id: 34c2b29b569f9179d37c330bc2f8edf5d56edf6c
2013-08-14 12:55:15 -05:00
Brad Gonzales
5d169e4df1
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: b4ee9c5753571a8cdd0720986c76723f4e646f0c
2013-08-14 12:35:18 -05:00
Richard Peter
11229d4b51
Merge "Issue #2224 Bug fixes to pass unit test." into development
...
Former-commit-id: 0063088d0cffc2e7c6ba12f055184dd85f8820ca
2013-08-14 11:55:17 -05:00
Bryan Kowal
21893102bb
Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
...
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function
Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3
Former-commit-id: af2882799bd08998d1321bac37beb2a7cecb4fb9
2013-08-14 11:21:33 -05:00
Richard Peter
045d3cd618
Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
...
Former-commit-id: 247b8d0848b7cfcadfe2163938226f20e654a98d
2013-08-14 10:53:53 -05:00
Roger Ferrel
87f9cb2fb3
Issue #2224 Bug fixes to pass unit test.
...
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: ca2bb73e1fd77bc289a106eb7743ee5344be3a52
2013-08-14 10:25:49 -05:00
Mike Duff
e791617acc
Issue #2247 - Fix permission displays in UserAdmin Dialogs
...
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: ca3499309373b553874e7a89e8f38f30e9b041e6
2013-08-14 10:13:05 -05:00
Steve Harris
c6dc1817e7
13.5.1-15 baseline
...
Former-commit-id: dbf9107f9c775f9a1df759bc341c0722f5fc92f2
2013-08-14 10:24:26 -04:00
Max Schenkelberg
06dbae8bdb
Issue #2033 moved bundles and menu files into corresponding plugins
...
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: fe1b35711ec55a022027bb8ff1a27924b3926911
2013-08-14 09:20:28 -05:00
Steve Harris
80e5f7fbd4
13.5.1-14 baseline
...
Former-commit-id: fe7b1a704ee92b34684e4f9059bd61cfa28dd485
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
fd0f2f1c09
Issue #2243 Resolved incorrect import.
...
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: f79e7820ea010e0bc860b0033183147d7299221f
2013-08-13 20:47:49 -05:00
Nate Jensen
c844396230
Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
...
Former-commit-id: 5b909886e84f0f6942a06367f223940e4448e315
2013-08-13 17:19:25 -05:00
Nate Jensen
959b50d184
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
...
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: f3d233aeff8017c521288affd4b5be668c9a890a
2013-08-13 16:59:57 -05:00
Richard Peter
d5130432a8
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
...
Former-commit-id: d7d87eb785c9c5e26a841503ea11fac4461b23b3
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
49f488a58f
Issue #2243 Fixed update list bugs.
...
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee
2013-08-13 16:30:05 -05:00
Roger Ferrel
ea862ea395
Issue #2224 Quick for daily build until I figure out what is really wrong.
...
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6
Former-commit-id: 261e40897b011ea7f0aec668d57b65631a6c735f
2013-08-13 16:03:50 -05:00
Mike Duff
62c3e2107f
Issue #2263 - remove build failure on unit test failure
...
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f
Former-commit-id: 57870e24ca02e1cb66705cac79fb8856685a56b3
2013-08-13 14:54:24 -05:00
Nate Jensen
d995e29afe
Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
...
Former-commit-id: 32053b62812fc375aebb5af21af1149b2b4944c5
2013-08-13 12:34:44 -05:00
Greg Armendariz
84413bd66f
Merge "Issue #2164 - fix 13.6.1 build" into development
...
Former-commit-id: aa808c2ef1cbee907fbe910892a2c37fa5b0d45c
2013-08-13 12:34:04 -05:00
Nate Jensen
576b8fa830
Merge "Issue #2142 removing more dependencies on edex.common" into development
...
Former-commit-id: 725b2654ce507b302ac111a740f27460799ecd80
2013-08-13 12:32:09 -05:00
Nate Jensen
63b2fe798a
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: 0f66e6b3e5999f5f1f97b74b157838c598110cb2
2013-08-13 12:27:02 -05:00
Matt Nash
dda3d78b48
Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
...
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186
Former-commit-id: 1c72a8cfeeb9263f8d406002de9703a1ee73f40e
2013-08-13 11:59:35 -05:00
Bryan Kowal
586b7646f0
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371
2013-08-13 11:13:52 -05:00
Richard Peter
60831564a0
Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
...
Former-commit-id: c4cc04a6b759f934a556004a242da4dfa4709653
2013-08-13 10:10:07 -05:00
Nate Jensen
0c92461c65
Issue #2142 removing more dependencies on edex.common
...
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: 231c873711159c9a59f0bc4e25e70cc9c989ecc0
2013-08-13 09:09:05 -05:00
Nate Jensen
e6fc534b8c
Merge "Issue #2162 : Add performance logging for GFE edit area query evaluation." into development
...
Former-commit-id: 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f
2013-08-13 08:58:50 -05:00
Nate Jensen
c62139c327
Merge "Issue #2033 Fixed alertviz startup" into development
...
Former-commit-id: 3312f297f36ab27d9f9fb74d48bf291f60292e5a
2013-08-13 08:56:24 -05:00
Nate Jensen
8101c961d4
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
...
Former-commit-id: e9e46b68652caff85b2206180856654876f55f12
2013-08-13 08:56:01 -05:00
Max Schenkelberg
3f35c335c9
Issue #2033 Fixed alertviz startup
...
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 1cdd5eab835f2df85f8ebc82d0bea79bca3977da
2013-08-12 17:37:15 -05:00
Nate Jensen
c2bf2163d9
Issue #2142 more removing of dependencies from common plugins to edex.common
...
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: 2342170ce4cf51f12759afa26fc5af46f35c6188
2013-08-12 15:41:39 -05:00
Richard Peter
2de533cbbf
Merge "Issue #2224 Changes to have DataSet in configuration." into development
...
Former-commit-id: d4a46b8283ac0cb47f62c43b999d7f119161e08d
2013-08-12 15:01:51 -05:00
Nate Jensen
de38280317
Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
...
Former-commit-id: 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
46c3413805
Issue #2245 make DataTimeCompatible Java 6 compatible.
...
Former-commit-id: e32655d3daef131c451d972c7b2747b01e49d840
2013-08-12 13:43:43 -05:00
Roger Ferrel
3ecf95b18a
Issue #2224 Changes to have DataSet in configuration.
...
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: de48fa389414c87ba557b70a480ce6b45144f4aa
2013-08-12 12:50:12 -05:00
Nate Jensen
48758e64ef
Issue #2142 remove some uf.common dependencies on edex.common
...
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887
Former-commit-id: c0c65319cd731aea51f730f700b0fda3c6992d38
2013-08-12 12:47:51 -05:00
Greg Armendariz
594198b5a5
Merge "Issue #2254 - Fix the nightly automated junit tests" into development
...
Former-commit-id: 347fe4615e9902892a95f13d13cfd8c0bcd7c39d
2013-08-12 12:25:17 -05:00
David Gillingham
98f48e5a64
Issue #2162 : Add performance logging for GFE edit area query evaluation.
...
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338
Former-commit-id: 7d24f69078e324c56db448f293d3094df83f5c34
2013-08-12 12:18:02 -05:00
Nate Jensen
c5b96690ce
Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
...
Former-commit-id: 971df482819466e48efcbc3a1b01eab88687436a
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
9901e7a622
Issue #2245 Make all DataTime comparisons consistent.
...
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d
Former-commit-id: b175ec81e61f18b42432e0245cddb953fbc5963f
2013-08-12 11:37:51 -05:00
Greg Armendariz
487b751143
Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
...
Former-commit-id: a978af636454b1c1ef5287869de3b91ceac52ee1
2013-08-12 11:14:03 -05:00
Richard Peter
b89bb1e8a0
Merge "Issue #2222 Changes to allow display of all selected data." into development
...
Former-commit-id: 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2
2013-08-12 11:09:55 -05:00
Nate Jensen
2245b2f7a6
Merge "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" into development
...
Former-commit-id: 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8
2013-08-12 09:49:22 -05:00
Mike Duff
832e61f938
Issue #2254 - Fix the nightly automated junit tests
...
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a
Former-commit-id: 96eddd84c4f1287fa56e5356831961209c76331a
2013-08-12 09:25:21 -05:00
