Commit graph

21 commits

Author SHA1 Message Date
Brian.Dyke
f16c305ae4 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: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
2014-04-30 12:57:09 -04:00
Dave Hladky
4ce5dfcd92 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
2014-04-21 12:26:47 -05:00
Dave Hladky
f03f0f9092 Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: fb2cfff4d2 [formerly 92d677141f] [formerly fb2cfff4d2 [formerly 92d677141f] [formerly d40107e530 [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: dd3501ae41 [formerly 06d41ccafa]
Former-commit-id: ee818ff96b
2014-03-03 08:46:37 -06:00
Dave Hladky
30cbc03297 Issue #2710 Made MADIS window larger.
Former-commit-id: 37ccd1d80d [formerly edb07269a9] [formerly 37ccd1d80d [formerly edb07269a9] [formerly 0094857d34 [formerly eddd50a0575d140eb05999889940a632f319438c]]]
Former-commit-id: 0094857d34
Former-commit-id: b225690c65 [formerly 78e3974527]
Former-commit-id: 93ec71aadb
2014-01-20 12:04:08 -06:00
Dave Hladky
f38d77b307 Issue #2693 Data set information infrastructure for availability offset calculations
Change-Id: I0f8d90a753ce37d37c682ff17613eb9a44554a3b

Former-commit-id: ef8eb701da [formerly 129163bf87] [formerly ef8eb701da [formerly 129163bf87] [formerly b64df5806a [formerly 48fad391deb95616556628424b1a1799c2929f89]]]
Former-commit-id: b64df5806a
Former-commit-id: c05cbb5337 [formerly 682b06c89d]
Former-commit-id: 83c4b031d6
2014-01-15 17:08:03 -06:00
Dave Hladky
097c4379f0 Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c

Former-commit-id: eddceed756 [formerly 08625addba] [formerly eddceed756 [formerly 08625addba] [formerly c57c27c843 [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]
Former-commit-id: c57c27c843
Former-commit-id: 9d136bb7d8 [formerly 6069bb90c7]
Former-commit-id: abd5127160
2014-01-15 10:05:20 -06:00
Steve Harris
eec64a2dbc Merge branch 'development' into development_on_RHEL6
Former-commit-id: 2a8e926976 [formerly 108a4d908d] [formerly 2a8e926976 [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: a6ae5f9c2f [formerly 50d60d8101]
Former-commit-id: 930b6ddb77
2013-11-06 18:31:05 -06:00
Dave Hladky
ffaa5d5480 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 62cd5b514d [formerly b0d929231c] [formerly 62cd5b514d [formerly b0d929231c] [formerly b2b44cd1d2 [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: 7ddd6d4c61 [formerly 35bc4378ca]
Former-commit-id: d3bd916cf4
2013-11-06 15:23:02 -06:00
Bryan Kowal
f5bb76a01e 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: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
2013-10-31 15:34:46 -05:00
Dave Hladky
cec7d35505 Issue #2361 Moved to private JAXB
Former-commit-id: be351c82ed [formerly 5b5e1ca293] [formerly be351c82ed [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]
Former-commit-id: 33a0890d31
Former-commit-id: 3eff51897b [formerly b55b05fa8b]
Former-commit-id: b5e892c16e
2013-10-29 13:45:05 -05:00
Dave Hladky
90d3c540a6 Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: f5b9d3be39 [formerly 6cb541d1a1] [formerly f5b9d3be39 [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]
Former-commit-id: 15aed68c02
Former-commit-id: b5e309f973 [formerly a8ab9072cc]
Former-commit-id: 072fa5de62
2013-10-29 13:05:47 -05:00
Dave Hladky
0d562b64fd Issue #2361 Harvester JAXB fixed up
Former-commit-id: 1deca13487 [formerly 70d2ad2cdc] [formerly 1deca13487 [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 1a889e84b1 [formerly c5137923c0]
Former-commit-id: 64a9973089
2013-10-29 12:20:53 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Nate Jensen
8cb574a419 Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 540d0ee576 [formerly 5f457fbad6] [formerly 540d0ee576 [formerly 5f457fbad6] [formerly 68150f49ef [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]
Former-commit-id: 68150f49ef
Former-commit-id: 403ba0f9cb [formerly 2002f94568]
Former-commit-id: c2f1e3f838
2013-10-24 20:06:08 -05:00
Richard Peter
5665e7eb9e Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: bf99d8fd4d [formerly 359ee5d1af] [formerly bf99d8fd4d [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 43453bcbff [formerly 16e182d70b]
Former-commit-id: 51773c757e
2013-07-26 14:36:46 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Bryan Kowal
8ff65daabf 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: cb8cb03d7d [formerly 8f479a2536] [formerly cb8cb03d7d [formerly 8f479a2536] [formerly a877e9589c [formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]]
Former-commit-id: a877e9589c
Former-commit-id: 624d423b10 [formerly 09c48506e7]
Former-commit-id: 0185fa1b02
2013-06-19 13:43:16 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Dave Hladky
1b07bcea0c Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: c292bf1b55 [formerly 1608d407d1] [formerly c292bf1b55 [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]
Former-commit-id: 83dae4fe01
Former-commit-id: 64596d3468 [formerly 90e6d184e7]
Former-commit-id: 8c0c235087
2013-05-30 17:04:16 -05:00
Dave Hladky
252ce5bfbd Issue #1959 MADIS implementation peice in AWIPS II baseline
Change-Id: Ice4af1f640cd9c8fb92ed129402b7300b92f65da

Former-commit-id: f833c4cc35 [formerly a770e2fb99] [formerly f833c4cc35 [formerly a770e2fb99] [formerly 0869f14084 [formerly d5ad257cb446a8605bb4df56cc1dba319f0e5abe]]]
Former-commit-id: 0869f14084
Former-commit-id: ba0db0d7d7 [formerly d677614620]
Former-commit-id: cfd01dd5e4
2013-05-02 11:30:32 -05:00
Dave Hladky
af0898807b Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: 618f737fab [formerly f0244f54a4]
Former-commit-id: 64f8c46e64
2013-03-19 13:08:14 -05:00