Brian.Dyke
278aab6b6f
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Dave Hladky
61fc2fea51
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Dave Hladky
92d677141f
Issue #2713 Update path for MADIS-Harvester.xml
...
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788
Former-commit-id: f6e63a5d65a5450eb58e59833091b41ef4bf0a3f
2014-03-03 08:46:37 -06:00
Dave Hladky
edb07269a9
Issue #2710 Made MADIS window larger.
...
Former-commit-id: eddd50a0575d140eb05999889940a632f319438c
2014-01-20 12:04:08 -06:00
Dave Hladky
129163bf87
Issue #2693 Data set information infrastructure for availability offset calculations
...
Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b
Former-commit-id: 48fad391deb95616556628424b1a1799c2929f89
2014-01-15 17:08:03 -06:00
Dave Hladky
08625addba
Issue #2679 Multiple regions for a single collector mapped to single WFS source
...
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: b888d311923ba0628fa015018ef2f62fce47fb43
2014-01-15 10:05:20 -06:00
Steve Harris
108a4d908d
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: b0aa5782ea932919ad3e67d460c4809a664b1e08
2013-11-06 18:31:05 -06:00
Dave Hladky
b0d929231c
Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
...
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370
Former-commit-id: 03cfdbd4c8c74da4200781b8b716181eac759195
2013-11-06 15:23:02 -06:00
Bryan Kowal
feaacd9356
Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
2013-10-31 15:34:46 -05:00
Dave Hladky
5b5e1ca293
Issue #2361 Moved to private JAXB
...
Former-commit-id: facfc8287c3826ca9764b7be336cc332b5567a94
2013-10-29 13:45:05 -05:00
Dave Hladky
6cb541d1a1
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
...
Former-commit-id: ded6bbf39f6d6fe05f31d61f310e7473d55a6643
2013-10-29 13:05:47 -05:00
Dave Hladky
70d2ad2cdc
Issue #2361 Harvester JAXB fixed up
...
Former-commit-id: 6d9af3f0f470cfe5a566789c59a90fe05e516aa2
2013-10-29 12:20:53 -05:00
Steve Harris
bd95bb6a4e
14.1.1-4 baseline
...
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
2013-10-28 10:55:16 -04:00
Nate Jensen
5f457fbad6
Issue #2361 remove ISerializableObject from harvester plugin
...
Former-commit-id: f80e24871b5fb2e6f990cc099532adfcb802ae13
2013-10-24 20:06:08 -05:00
Richard Peter
359ee5d1af
Issue #2170 : Initial plugin rename for notification framework
...
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: 8a8eff74685abb8a709480fa33f2c56dd7923ab9
2013-07-26 14:36:46 -05:00
Steve Harris
70e4ff30a6
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Bryan Kowal
8f479a2536
Issue #1956 - dependency updates for EDEX dpa
...
- relocated certain localization files based on the plugins that used them; when more than one plugin used the localization it was
moved to the plugin that was a dependency of the other plugin that used it
- added the edex and common datadelivery service plugins to the core feature since there spring files are included in the dpa mode
Change-Id: Id1582abaa3e89a86289ce9ae615ac0997f60582d
Former-commit-id: 914587220cb65cb22b788a5bf1e867cdf53cf5bf
2013-06-19 13:43:16 -05:00
Steve Harris
998961612c
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Dave Hladky
1608d407d1
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 636bed36a4f7adc5db8b476d618ff4d67c806671
2013-05-30 17:04:16 -05:00
Dave Hladky
a770e2fb99
Issue #1959 MADIS implementation peice in AWIPS II baseline
...
Change-Id: Ice4af1f640cd9c8fb92ed129402b7300b92f65da
Former-commit-id: d5ad257cb446a8605bb4df56cc1dba319f0e5abe
2013-05-02 11:30:32 -05:00
Dave Hladky
ddb23ae59f
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: a52596494feb2255269513a3cd19490628d4ae10
2013-03-19 13:08:14 -05:00
