Commit graph

4489 commits

Author SHA1 Message Date
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
Lee Venable
b95b380eb2 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: d6eb7534f5 [formerly aa0e9121f8] [formerly d6eb7534f5 [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: d05d650430 [formerly f3c8b69e2e]
Former-commit-id: b7d5aa748a
2013-12-12 16:15:56 -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
Richard Peter
6a6462331c Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
Former-commit-id: fcbf2ff270 [formerly e441b548cc] [formerly fcbf2ff270 [formerly e441b548cc] [formerly 6e86c98c04 [formerly e1e34142baebc23917a975a60f9f45aab750a775]]]
Former-commit-id: 6e86c98c04
Former-commit-id: a9e4ee030d [formerly 3ebbced489]
Former-commit-id: 3204af5ce8
2013-12-11 13:56:38 -06:00
Greg Armendariz
276b7586bf Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
Former-commit-id: 78e1e9d78f [formerly 45c9f7352e] [formerly 78e1e9d78f [formerly 45c9f7352e] [formerly 4c1eb198d2 [formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: 5171847cdf [formerly 0e0bfc0521]
Former-commit-id: 23f6e3ecdf
2013-12-11 13:54:17 -06:00
Greg Armendariz
88437251d7 Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 57c98d4343 [formerly cb952cdb13] [formerly 57c98d4343 [formerly cb952cdb13] [formerly 2d2641ea7e [formerly 584c543fbab59889769570330e7d83529a6b733f]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: fce327c001 [formerly f5f21141a4]
Former-commit-id: f9f10703e8
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
df1bc54013 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: bf508b4455 [formerly a37db9d1b4] [formerly bf508b4455 [formerly a37db9d1b4] [formerly 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 0fb85fe4aa [formerly 4a86c90bfc]
Former-commit-id: b3ef07794a
2013-12-11 12:45:11 -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
Slav Korolev
65720fea82 Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 85bc26b5a3 [formerly b59e9499d2] [formerly 85bc26b5a3 [formerly b59e9499d2] [formerly 67e18055cc [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 746157755b [formerly 6811b0e5c1]
Former-commit-id: 04bc1a3052
2013-12-11 08:57:13 -05: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
6928a4ef8c Merge "Issue #2581 fix decoding of LSR freezing drizzle and latlon" into omaha_14.2.1
Former-commit-id: 50e0f15ec8 [formerly 7d4256d0d6] [formerly 50e0f15ec8 [formerly 7d4256d0d6] [formerly fed233aff3 [formerly ae4051f529397b7a8b955bfd6ed56d446235e2a4]]]
Former-commit-id: fed233aff3
Former-commit-id: 9cfb911c04 [formerly befa8a0b9a]
Former-commit-id: 367c8b73b4
2013-12-10 15:18:27 -06:00
Nate Jensen
df20fee99e Merge "Issue #2620 Fixed viz base feature dependency issues." into development
Former-commit-id: c4c61022b9 [formerly 4c90d4c5f6] [formerly c4c61022b9 [formerly 4c90d4c5f6] [formerly cd58066889 [formerly e41526263edecf1e867c27ccb89b6326f9675a85]]]
Former-commit-id: cd58066889
Former-commit-id: 9a03bf5943 [formerly 8194559a6e]
Former-commit-id: 08583ea17a
2013-12-10 10:24:25 -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
Mike Duff
bddf555eab Issue #2601 - Fix NullPointerException.
Former-commit-id: 773e546f62 [formerly 9e9706f55f] [formerly 773e546f62 [formerly 9e9706f55f] [formerly d2fe42c27c [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 02bbd4eaa6 [formerly 32b468023d]
Former-commit-id: dd1af02457
2013-12-10 09:03:42 -06:00
Max Schenkelberg
ede6c2fa1e Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: be45102814 [formerly 9d846aa104] [formerly be45102814 [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: e86e477165 [formerly eede01921e]
Former-commit-id: 5c2da4c3e3
2013-12-09 15:14:01 -06:00
Lee Venable
099f3f504a Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 997c575919 [formerly 249435f17c] [formerly 997c575919 [formerly 249435f17c] [formerly 2c6b4309f0 [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 4850830125 [formerly cc7885610d]
Former-commit-id: 291c7f95c4
2013-12-09 09:51:41 -06:00
Brian Clements
d7ddaa295d Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: 5d1d44b60d [formerly 8ece30944a] [formerly 5d1d44b60d [formerly 8ece30944a] [formerly e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 5a7fca6352 [formerly b8df043202]
Former-commit-id: 0cf7b822ce
2013-12-06 17:07:16 -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
Mike Duff
74b19522a2 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: 850e4dfbde [formerly 0a5f2e3484] [formerly 850e4dfbde [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 1925177772 [formerly 4d210517bd]
Former-commit-id: 96de34b2c1
2013-12-06 12:58:38 -06:00
Nate Jensen
907a6e3304 Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: ec6b5393ef [formerly 9bff38e0d3] [formerly ec6b5393ef [formerly 9bff38e0d3] [formerly 41014a105d [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: e8f28c6799 [formerly f3e455d1a3]
Former-commit-id: eb68a1be85
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
fe53e49cb3 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 067c510315 [formerly 59c6a24b68] [formerly 067c510315 [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 899cb2628c [formerly 99afa17fd2]
Former-commit-id: c27934d7ad
2013-12-06 09:14:01 -06:00
Bryan Kowal
c2273bbf5f Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: 8f053f9fcd [formerly 187759698b] [formerly 8f053f9fcd [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: ea0243e5da [formerly eceffc3880]
Former-commit-id: 91cdeb8c89
2013-12-05 15:53:51 -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