Commit graph

2028 commits

Author SHA1 Message Date
Brian Clements
c934358ccc Issue #2594 disabled LATLON grid interpolation
Former-commit-id: deac151bc9 [formerly f8820538f4] [formerly deac151bc9 [formerly f8820538f4] [formerly 5a3ed14237 [formerly 4840da51dcb7b9366417129663c0e539716f2335]]]
Former-commit-id: 5a3ed14237
Former-commit-id: 330e961490 [formerly 7efb35be30]
Former-commit-id: 15308ca1b9
2014-01-13 17:44:49 -06:00
Brian Clements
ea9296958c Issue #1998 fixed NPE in PointDataPluginDao
StorageStatus was not being checked after operation


Former-commit-id: f0c1b109f8 [formerly 401cd813f1] [formerly f0c1b109f8 [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 6baf80fc5c [formerly 25765f2fb6]
Former-commit-id: 7d4cfb14a5
2014-01-09 14:02:52 -06:00
Slav Korolev
4c3ce254b6 Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 5bbb774073 [formerly 714fd018ef] [formerly 5bbb774073 [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]
Former-commit-id: ab7fc816b4
Former-commit-id: eb5ec35275 [formerly 0fb9810e91]
Former-commit-id: 4fd070dd46
2014-01-07 11:48:13 -05:00
Max Schenkelberg
783391423f 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: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
2014-01-06 17:03:45 -06:00
Steve Harris
afb79e8384 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 8aac57e096 [formerly 0950a8a1ba] [formerly 8aac57e096 [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 21aaafbd52 [formerly 5d6bae317d]
Former-commit-id: bb449e689e
2013-12-18 13:14:27 -06:00
Richard Peter
1c743d4d44 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
2013-12-17 21:04:53 -06:00
Nate Jensen
cd9dec3e57 Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 29425906ba [formerly 66f5000243] [formerly 29425906ba [formerly 66f5000243] [formerly 84e3cf0988 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]
Former-commit-id: 84e3cf0988
Former-commit-id: eee649c9b1 [formerly 42bd8ccde4]
Former-commit-id: 3141f76bff
2013-12-17 12:20:37 -06:00
Brad Gonzales
f71ea9eeb4 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 253cc9df80 [formerly cc75442fa3] [formerly 253cc9df80 [formerly cc75442fa3] [formerly b2b352a5ae [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 6e78d3a521 [formerly 0df42dacfd]
Former-commit-id: 4f6b8a79bb
2013-12-17 11:57:06 -06:00
Brad Gonzales
b12fc921a5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: d329fc26bb [formerly d324400d65] [formerly d329fc26bb [formerly d324400d65] [formerly d0ae47d053 [formerly f4c1739687685a22847a09490724e84825032146]]]
Former-commit-id: d0ae47d053
Former-commit-id: 729ab5d41e [formerly 8476a13e41]
Former-commit-id: f0f1abea6b
2013-12-17 09:43:12 -06:00
Bryan Kowal
fad82481c1 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 0c3b22c8f2 [formerly 43008f4698] [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 68181d3f62 [formerly fac9d72cc8]
Former-commit-id: 9e0e6662c8
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
ca5fb7e3fa Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: fb1480b30d [formerly 7e5349bbff] [formerly fb1480b30d [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 8a3bbbca50 [formerly 23a26f5d4a]
Former-commit-id: 9f30c14fca
2013-12-16 14:31:44 -06:00
Richard Peter
4bd12a5840 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 42d277364b [formerly 3758a9532c] [formerly 42d277364b [formerly 3758a9532c] [formerly 84b64dac81 [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]
Former-commit-id: 84b64dac81
Former-commit-id: 9230c9de2a [formerly f4ba1cac8c]
Former-commit-id: fcd5955a0f
2013-12-16 13:43:37 -06:00
Richard Peter
27716cb2fe Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 8b18800b95 [formerly 35299e917d] [formerly 8b18800b95 [formerly 35299e917d] [formerly 624c51e393 [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]
Former-commit-id: 624c51e393
Former-commit-id: d0ef49d66c [formerly c05162ed1a]
Former-commit-id: 7125f2eca0
2013-12-13 16:09:13 -06:00
Mike Duff
d8787f7eba Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 685c07cde0 [formerly b310cf0388] [formerly 685c07cde0 [formerly b310cf0388] [formerly eb591030d8 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]
Former-commit-id: eb591030d8
Former-commit-id: ee5788ae5f [formerly 0deef9b6dd]
Former-commit-id: 4127267b78
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
822603235c Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: dd218bb5e3 [formerly 70e6212353] [formerly dd218bb5e3 [formerly 70e6212353] [formerly e0d32db91c [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]
Former-commit-id: e0d32db91c
Former-commit-id: accf148cfd [formerly 80c01c7117]
Former-commit-id: 7d1f693fd9
2013-12-13 14:17:11 -06:00
Richard Peter
84d7393161 Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: cfd3810476 [formerly 595a655dfd] [formerly cfd3810476 [formerly 595a655dfd] [formerly 6267bee5d5 [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]
Former-commit-id: 6267bee5d5
Former-commit-id: 21d9a7445d [formerly 55a21685ea]
Former-commit-id: 689a74ec89
2013-12-13 12:32:46 -06:00
Steve Harris
800136d61b 14.1.1-13 baseline
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
2013-12-12 16:59:57 -05:00
Richard Peter
d357b534c4 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: db0e9d40ec [formerly 312fcc2b2f] [formerly db0e9d40ec [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]
Former-commit-id: ded9c782fc
Former-commit-id: 3b4507cbe5 [formerly b4fc76c03a]
Former-commit-id: 3543625506
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
463ad8e8fa Issue #2619 Fix rare dateline bug.
Former-commit-id: 45e4b4bbad [formerly 399c579671] [formerly 45e4b4bbad [formerly 399c579671] [formerly 607b5edb69 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]
Former-commit-id: 607b5edb69
Former-commit-id: 58dabbfc87 [formerly d0f4b18b78]
Former-commit-id: a92f15a8fa
2013-12-12 10:30:22 -06:00
Richard Peter
455dfbcdeb Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 55047d6807 [formerly ffab0f1669] [formerly 55047d6807 [formerly ffab0f1669] [formerly 2f2f755110 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]
Former-commit-id: 2f2f755110
Former-commit-id: 875d6570ee [formerly 4e5cd81df9]
Former-commit-id: d0fbf8df6b
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
e54629a36e Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: 5f3e8a5436 [formerly 7529f5bbe8] [formerly 5f3e8a5436 [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]
Former-commit-id: 2e909bc207
Former-commit-id: 60d141c6a4 [formerly 620e838f59]
Former-commit-id: b960d13fd8
2013-12-12 09:44:05 -06:00
Richard Peter
ff074484f5 Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 247eb683e5 [formerly 91dc7825ce] [formerly 247eb683e5 [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: 7462693157 [formerly 74c73c8ee1]
Former-commit-id: e4af4c8b58
2013-12-11 18:00:10 -06:00
Richard Peter
59ee3a6432 Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
Former-commit-id: e41adf1ee9 [formerly 49def8a4b2] [formerly e41adf1ee9 [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]
Former-commit-id: a0f59f2059
Former-commit-id: 9a02a5cf39 [formerly 7673b97152]
Former-commit-id: 022ee8929e
2013-12-11 17:59:43 -06:00
Brad Gonzales
7d479d8a73 Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 6515d6a9e5 [formerly 112649eff2] [formerly 6515d6a9e5 [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: 3f5c25ff46 [formerly 79efc3b53a]
Former-commit-id: 133918fba6
2013-12-11 17:06:41 -06:00
Richard Peter
b3074e9215 Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: f278dad7cc [formerly 63bd2b26eb] [formerly f278dad7cc [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]
Former-commit-id: 6f57e14406
Former-commit-id: cdf86e65ec [formerly 2f0e43e5a4]
Former-commit-id: fb3ccd066c
2013-12-11 16:19:02 -06:00
Richard Peter
ff66c6d1e5 Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: 4ec080e015 [formerly 375c532376] [formerly 4ec080e015 [formerly 375c532376] [formerly 0ed2ba8024 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 1d339f16f5 [formerly 890f038a54]
Former-commit-id: 1c5dc1b952
2013-12-11 16:11:26 -06:00
Richard Peter
333ee2bbab Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: d720fbbd63 [formerly d9d19a1515] [formerly d720fbbd63 [formerly d9d19a1515] [formerly 51e46e08c5 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]
Former-commit-id: 51e46e08c5
Former-commit-id: 6dbcd6677c [formerly 561706ef1e]
Former-commit-id: 7788a51f89
2013-12-11 16:08:06 -06:00
Jonathan Sanchez
cb03686dc8 Issue #2604 Refactored portions util out of viz.warngen.
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10

Former-commit-id: 9878c3a797 [formerly 125e747fc9] [formerly 9878c3a797 [formerly 125e747fc9] [formerly 2ecfe79516 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]
Former-commit-id: 2ecfe79516
Former-commit-id: 45903c0e7d [formerly 5796d108c3]
Former-commit-id: a2e5cdeae5
2013-12-11 14:59:16 -06:00
Mike Duff
00e00796ae Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: 1a0893d70e [formerly 9a02ae7d68] [formerly 1a0893d70e [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]
Former-commit-id: 5a42580c2b
Former-commit-id: d65b7c1cf5 [formerly dc6ab027b5]
Former-commit-id: 3f98d329c9
2013-12-11 14:12:05 -06:00
Benjamin Phillippe
c330390a76 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: b2c565c173 [formerly 969099d4c4] [formerly b2c565c173 [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]
Former-commit-id: 0cb4e61261
Former-commit-id: bfa17652ff [formerly 0d98a48d18]
Former-commit-id: 61b206a82e
2013-12-11 12:20:12 -06:00
Mike Duff
671e43a228 Issue #2625 - fix no data errors in bandwidth utilization graph
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime

Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7

Former-commit-id: 4073f048d2 [formerly d378d9194a] [formerly 4073f048d2 [formerly d378d9194a] [formerly 3492436907 [formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]
Former-commit-id: 3492436907
Former-commit-id: d83734f883 [formerly bed189cc7b]
Former-commit-id: 35def598bd
2013-12-11 11:29:38 -06:00
Brad Gonzales
ee8cbe414c Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 419230d6db [formerly 5dd466e22a] [formerly 419230d6db [formerly 5dd466e22a] [formerly cfa7128be2 [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]
Former-commit-id: cfa7128be2
Former-commit-id: 71d6ef856a [formerly 531c598e3b]
Former-commit-id: dbd7f3cc37
2013-12-11 11:19:40 -06:00
Nate Jensen
e548e47239 Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: 6188356e72 [formerly fa674baf89] [formerly 6188356e72 [formerly fa674baf89] [formerly e037c179fe [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]
Former-commit-id: e037c179fe
Former-commit-id: 4478983895 [formerly 34c1af18a7]
Former-commit-id: b5450572f2
2013-12-10 18:27:33 -06:00
Nate Jensen
34319cc97e Issue #2581 fix decoding of LSR freezing drizzle and latlon
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5

Former-commit-id: c0c17822c2 [formerly 60d395b347] [formerly c0c17822c2 [formerly 60d395b347] [formerly 16b0650f67 [formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]
Former-commit-id: 16b0650f67
Former-commit-id: c96678bb3a [formerly 36845b1c1d]
Former-commit-id: 6b9ef6eddd
2013-12-10 10:10:11 -06:00
Richard Peter
5283e7c725 Issue #2170: Fix Ensemble notifications
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b

Former-commit-id: 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c269d0a7c [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: 4a6d41871e [formerly d430167b2c]
Former-commit-id: 3376002d20
2013-12-06 15:41:10 -06:00
Brad Gonzales
143e160eae Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 3d34764022 [formerly 410a00c72a] [formerly 3d34764022 [formerly 410a00c72a] [formerly 72df38075f [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]
Former-commit-id: 72df38075f
Former-commit-id: e18f7b2380 [formerly c54fe467a3]
Former-commit-id: 3d592d0b38
2013-12-05 15:17:14 -06:00
Richard Peter
8cde2b5e9d Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: df4a4c5121 [formerly d0b50eee3c] [formerly df4a4c5121 [formerly d0b50eee3c] [formerly 6fde307f0a [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 45889cb80f [formerly 9f4dfc9051]
Former-commit-id: ef7ba1f1ee
2013-12-05 14:54:46 -06:00
Richard Peter
5744c6422c Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

Former-commit-id: 02f48f898f [formerly 5286ef0efa] [formerly 02f48f898f [formerly 5286ef0efa] [formerly 01a8461ec9 [formerly a266d4007bdb58525942ef406d6fd7a4d269bb8c]]]
Former-commit-id: 01a8461ec9
Former-commit-id: b91b4913c6 [formerly 407fd38c5f]
Former-commit-id: 7475486bf9
2013-12-05 14:22:25 -06:00
Mike Duff
0885df1d3f Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: a412a19583 [formerly 4796f43495] [formerly a412a19583 [formerly 4796f43495] [formerly 0c452e2434 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 45cf9384d8 [formerly 7f2ddb1360]
Former-commit-id: d3c5ee0468
2013-12-05 13:35:31 -06:00
Richard Peter
8e1984e6ed Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: 0cfe359507 [formerly bacfa33301] [formerly 0cfe359507 [formerly bacfa33301] [formerly 88c866256e [formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]
Former-commit-id: 88c866256e
Former-commit-id: ba1bd01bca [formerly 9e64f22e8b]
Former-commit-id: b8e4812182
2013-12-05 13:01:02 -06:00
Nate Jensen
ecdbb80086 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 178b2bc3fa [formerly 34205de815] [formerly 178b2bc3fa [formerly 34205de815] [formerly db25d00dc5 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]
Former-commit-id: db25d00dc5
Former-commit-id: 8b4f6873a0 [formerly 280325460f]
Former-commit-id: a1ff972ae6
2013-12-05 13:00:06 -06:00
Nate Jensen
9740b5349b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: b16c88133b [formerly c47f6546dd] [formerly b16c88133b [formerly c47f6546dd] [formerly ae0bd2a86f [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 15fee953f5 [formerly 7163e28d35]
Former-commit-id: bd4e9158f0
2013-12-05 12:59:58 -06:00
Richard Peter
20b1c9cfbc Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 5ad19e32a9 [formerly 73960ce29a] [formerly 5ad19e32a9 [formerly 73960ce29a] [formerly a8b251223a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]
Former-commit-id: a8b251223a
Former-commit-id: f473851db8 [formerly 7bcdabd8dd]
Former-commit-id: c909291e15
2013-12-05 12:33:51 -06:00
Richard Peter
ae6e34be4b Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
bff909c157 Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: 9036774493 [formerly a567f2af89] [formerly 9036774493 [formerly a567f2af89] [formerly 3d2439dc31 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]
Former-commit-id: 3d2439dc31
Former-commit-id: d1cfb7f9d5 [formerly a5001016c9]
Former-commit-id: c3aa830346
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
2eb9a45951 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 7c2a4ef72c [formerly f682e66e9b] [formerly 7c2a4ef72c [formerly f682e66e9b] [formerly 46a466497c [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: fde968a834 [formerly ad9fee446d]
Former-commit-id: 956e8b04f2
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
8c1e55db1f Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: ed890ce9d9 [formerly 0b0e70b667] [formerly ed890ce9d9 [formerly 0b0e70b667] [formerly ed77440c28 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]
Former-commit-id: ed77440c28
Former-commit-id: 7051d10140 [formerly 7ed6195536]
Former-commit-id: 3d7c473241
2013-12-05 10:20:24 -06:00
Ron Anderson
bbd7ea36a1 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 497236ca74 [formerly b5906249cc] [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: e30d6041ee [formerly 103fed386f]
Former-commit-id: 89e87a1683
2013-12-04 17:10:48 -06:00
Steve Harris
60f062ea59 14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
2013-12-04 16:47:59 -05:00
Richard Peter
54c056a310 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: ff44393e90 [formerly ea7dac5993] [formerly ff44393e90 [formerly ea7dac5993] [formerly 0281447166 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]
Former-commit-id: 0281447166
Former-commit-id: d937861d05 [formerly f6808e6623]
Former-commit-id: 8cdd151d64
2013-12-04 12:00:40 -06:00