Brian.Dyke
|
f4856aae4d
|
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: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
|
2014-04-30 12:57:09 -04:00 |
|
Dave Hladky
|
13137a0a9a
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
|
2014-04-21 12:26:47 -05:00 |
|
Dave Hladky
|
50c77e0a2f
|
Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: ec2c3b4af2 [formerly 2d18b657a8] [formerly 1671baaf10] [formerly ec2c3b4af2 [formerly 2d18b657a8] [formerly 1671baaf10] [formerly 9479219b73 [formerly 1671baaf10 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]]]
Former-commit-id: 9479219b73
Former-commit-id: b908654a83 [formerly 86287bb5df] [formerly 6f17881da511134df9f83e5fdfe37fa16d15481a [formerly f26450c40d]]
Former-commit-id: f804771d0b0a2e246911a4aba55370426917839a [formerly 577b6402da]
Former-commit-id: fedb08a7eb
|
2014-04-02 14:06:25 -05:00 |
|
Dave Hladky
|
216d1afd3b
|
Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]]
Former-commit-id: c57c27c843
Former-commit-id: 5cc337003a [formerly 9d136bb7d8] [formerly edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]]
Former-commit-id: 5b10a19969ade1327d8d6bec3588ab1fed144fda [formerly abd5127160]
Former-commit-id: 097c4379f0
|
2014-01-15 10:05:20 -06:00 |
|
Dave Hladky
|
0f88775389
|
Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370
Former-commit-id: 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly b2b44cd1d2 [formerly b0d929231c [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: ac0d00e3d6 [formerly 7ddd6d4c61] [formerly 4dc511c73e193c9587b7cdc0e8b0ac3f2f661db4 [formerly 35bc4378ca]]
Former-commit-id: ad849d66b0caa535fb7690f603fd59b0b3a80bf4 [formerly d3bd916cf4]
Former-commit-id: ffaa5d5480
|
2013-11-06 15:23:02 -06:00 |
|
Brad Gonzales
|
c49808a723
|
Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6 [formerly 5825fa41d6] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9]
Former-commit-id: feef0a0b55
|
2013-10-11 10:36:53 -05:00 |
|
Dave Hladky
|
89e5b5116c
|
Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]]
Former-commit-id: 1733834e74
Former-commit-id: 87574fd68a [formerly 21239525ea] [formerly 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]]
Former-commit-id: b6b1dc8bacb08fc8a37391ca8c9d065363a89f96 [formerly 3ba8fd56f7]
Former-commit-id: ab9c5af250
|
2013-10-04 10:36:27 -05:00 |
|
Dave Hladky
|
236f9b5988
|
Issue #2098 Updates to how time is managed in DPA
Former-commit-id: 3907155d3d [formerly 02ce48bbdc] [formerly a6c891ba01] [formerly 3907155d3d [formerly 02ce48bbdc] [formerly a6c891ba01] [formerly 24f29f0e55 [formerly a6c891ba01 [formerly 0cd9dc99829d50ef77324b808c662b037b82969c]]]]
Former-commit-id: 24f29f0e55
Former-commit-id: 4986c9db67 [formerly 6ad604217a] [formerly 3ec9c24eb3a3f618f6f45713ff8726c14bfa445e [formerly 6f7e55b18e]]
Former-commit-id: 84dfe03adc31f6ce1c59db62428763162cc78cfe [formerly fa6bc32b5f]
Former-commit-id: 92726f6887
|
2013-09-04 12:58:20 -05:00 |
|
Dave Hladky
|
d3e4994152
|
Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf
Former-commit-id: 077483ac8d [formerly 24a3c8b24b] [formerly 0a45c77520] [formerly 077483ac8d [formerly 24a3c8b24b] [formerly 0a45c77520] [formerly ac4aeeec45 [formerly 0a45c77520 [formerly dc668631168388501efb8753ecb4cff8b9025456]]]]
Former-commit-id: ac4aeeec45
Former-commit-id: c6667a985b [formerly 02c9778ff6] [formerly 5137d7223b27c55203fb556e742da0b258a5b687 [formerly 36005754b5]]
Former-commit-id: 537d3271a6f623d2d977a5dd1e54e8eb620e9a2d [formerly 6cef334d9a]
Former-commit-id: b670a20106
|
2013-08-30 12:57:31 -05:00 |
|
Dave Hladky
|
e9c403615e
|
Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: cfbbc7336f [formerly 6a1a06e3ee] [formerly e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]]
Former-commit-id: 5748dbd8d6839840ad99d4c5bb21eef11054fe88 [formerly 30aa0c93a1]
Former-commit-id: 6e302d35d8
|
2013-08-28 08:24:45 -05:00 |
|