Commit graph

17 commits

Author SHA1 Message Date
Steve Harris
6cb92b1f57 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -06:00
Richard Peter
73b61633e2 Issue #2125: Clean up hibernate warnings
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e

Former-commit-id: d7e7ca2e26 [formerly f30181d730] [formerly e2d20753e1] [formerly 0c058f461c [formerly e2d20753e1 [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]]]
Former-commit-id: 0c058f461c
Former-commit-id: 3b734e85284d24a2773d8ffa7aec5062ace9f74d [formerly 7054a06acb]
Former-commit-id: caa06ce1e1
2014-01-17 14:12:34 -06:00
Max Schenkelberg
257553461b Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]
Former-commit-id: 0ceaa43902
2014-01-06 17:03:45 -06:00
Mike Duff
1245e00968 Issue #2314 - Fix for notification center's filtering.
Change-Id: I404c5c79f642908ff8c48cba23b269af9a4dc3f6

Former-commit-id: 1cc61d9e3f [formerly bfc8669f17] [formerly 0ad77d7f3c] [formerly 37896c4b81 [formerly 0ad77d7f3c [formerly 307c3cbca9732a534448eb40c4bff03573e4a975]]]
Former-commit-id: 37896c4b81
Former-commit-id: e05bd5545f2b5ccf26c7d0d0933f00753a6d5db7 [formerly 08bc45d599]
Former-commit-id: 286496addb
2013-09-05 15:04:23 -05:00
Dave Hladky
cfbbc7336f Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]
Former-commit-id: 6a1a06e3ee
2013-08-28 08:24: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
85884ccfd1 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: a3d9294d13 [formerly bf99d8fd4d] [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b]
Former-commit-id: 43453bcbff
2013-07-26 14:36:46 -05:00
Mike Duff
87ebf5b62c Issue #1655 - Implement the framework for DD system status messaging
Change-Id: I621cd07fdf6a742b0af4408dad534844d08e9e55

Former-commit-id: c07c4b9e8c [formerly 1ca50d2c4f] [formerly 7acfe076a0] [formerly 2c98a91d05 [formerly 7acfe076a0 [formerly 4f51d50f9d6ea76f3b2cb2e828c6b6f8e192fb38]]]
Former-commit-id: 2c98a91d05
Former-commit-id: 20fcd925338e1b43130104d89f2dd2ca5f14a124 [formerly 218c46928b]
Former-commit-id: 7971b31475
2013-07-17 08:55:27 -05:00
Benjamin Phillippe
a8350c0129 Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]
Former-commit-id: af05feb5a7
Former-commit-id: 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]
Former-commit-id: 541646148b
2013-03-25 15:15:38 -05:00
Steve Harris
7e48d3e684 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Mike Duff
6628aea419 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]
Former-commit-id: 3e59308771
2013-02-18 08:16:57 -06:00
Steve Harris
5027d2365b 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]
Former-commit-id: bbe92e6824
2013-02-07 16:00:39 -06:00
Steve Harris
ce726fadc7 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Dustin Johnson
02604beac9 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 40ef4c5947 [formerly 3ec05a5a9c] [formerly 606083835faa9246ed4f7e98934f8bbc1be66266 [formerly 557de162b0]] [formerly 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 6bc759f6c2019b3fef1eb1a080cf002dc07697ce [formerly a3c99f86bb]
Former-commit-id: 756080321e
2013-01-22 11:45:18 -06:00
Dustin Johnson
ceee5c6ad4 Issue #1501 Use registry version of subscription when sending notification responses
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 5ce7601dfa [formerly 9f775d2dd7] [formerly d9064bdc98] [formerly 38036a0e8b [formerly d9064bdc98 [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 0a9edd87c8a06f3382e4aca4205e470a2f005410 [formerly 13a75fabad]
Former-commit-id: 9681f57fac
2013-01-17 14:53:36 -06:00
Bryan Kowal
0e985cf0f3 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]
Former-commit-id: 6d7f57c62a
2013-01-07 12:16:01 -06:00