Commit graph

2508 commits

Author SHA1 Message Date
Nate Jensen
aea85a4fb8 Merge "Issue #2620 Fixed viz base feature dependency issues." into development
Former-commit-id: 3c728333b7 [formerly c4c61022b9] [formerly 4c90d4c5f6] [formerly 3c728333b7 [formerly c4c61022b9] [formerly 4c90d4c5f6] [formerly cd58066889 [formerly 4c90d4c5f6 [formerly e41526263edecf1e867c27ccb89b6326f9675a85]]]]
Former-commit-id: cd58066889
Former-commit-id: ee8d223346 [formerly 9a03bf5943] [formerly 823402ec5485e61576f944862a7a0a2a71242200 [formerly 8194559a6e]]
Former-commit-id: 7be8b23cfd6151086cd32ea4187f6059ca5cfdf3 [formerly 08583ea17a]
Former-commit-id: df20fee99e
2013-12-10 10:24:25 -06:00
Max Schenkelberg
d6ee7afe4a Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
2013-12-09 15:14:01 -06:00
Brian Clements
1197d89ded 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: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 4d04f6edbf [formerly 5a7fca6352] [formerly ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]]
Former-commit-id: ebcbc592123de417dee62c72e2708e136768fd8e [formerly 0cf7b822ce]
Former-commit-id: d7ddaa295d
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
e324a43104 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 59c6a24b68 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 57de1adb55 [formerly 899cb2628c] [formerly 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2]]
Former-commit-id: 48272569ea237bbdd940ff601ceae5ae9469c967 [formerly c27934d7ad]
Former-commit-id: fe53e49cb3
2013-12-06 09:14:01 -06:00
Richard Peter
077ddd9818 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 3088533103 [formerly 45889cb80f] [formerly ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]]
Former-commit-id: 714bcfc3b217ba5f4187ec79b31726d5a3bcf4c4 [formerly ef7ba1f1ee]
Former-commit-id: 8cde2b5e9d
2013-12-05 14:54:46 -06:00
Mike Duff
6bacb944fb Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c [formerly 45cf9384d8] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Nate Jensen
200183a10b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: ad2b7df40b [formerly 15fee953f5] [formerly e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]]
Former-commit-id: 8d7ad4d8fd6c5d67b7d5e36dddea37c59b03c830 [formerly bd4e9158f0]
Former-commit-id: 9740b5349b
2013-12-05 12:59:58 -06:00
Richard Peter
f362062048 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: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
84825d1841 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]]
Former-commit-id: 46a466497c
Former-commit-id: 6ebc4e5fbc [formerly fde968a834] [formerly a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]]
Former-commit-id: 127df8be9a4be1f882d7db4b5b59fec0343ae2c3 [formerly 956e8b04f2]
Former-commit-id: 2eb9a45951
2013-12-05 10:54:28 -06:00
Lee Venable
c734fc4ad3 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]]
Former-commit-id: b7be687903
Former-commit-id: 0a9dcb2cc4 [formerly 40dc07e0ff] [formerly 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]]
Former-commit-id: 05a05f7fdac155b046e7212956138fe3b43c5264 [formerly 195162014d]
Former-commit-id: 0ef3c4386d
2013-12-05 08:30:28 -06:00
Lee Venable
d699aabd99 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly a385ec612c [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]]
Former-commit-id: a385ec612c
Former-commit-id: 35352350b7 [formerly cddca699c6] [formerly a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c]]
Former-commit-id: 841ea7e4aafc68bfd0b91d31ddd1ac1567aa33a5 [formerly ef61348fb8]
Former-commit-id: 24102d052b
2013-12-05 08:25:46 -06:00
Ron Anderson
d3d2ea3745 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f [formerly e30d6041ee] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683]
Former-commit-id: bbd7ea36a1
2013-12-04 17:10:48 -06:00
Steve Harris
31c94115c7 14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
2013-12-04 16:47:59 -05:00
Ron Anderson
e3fc955e54 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 21f431f203 [formerly a99197c5c2] [formerly 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]]
Former-commit-id: 0193b4e72e257f2b7fccd9d06a481874e19ebeef [formerly 1988e86bbd]
Former-commit-id: 95d6bebb13
2013-12-04 15:29:28 -06:00
Nate Jensen
ef9d5e9f15 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 3c8d882681 [formerly 331df460ff] [formerly 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]]
Former-commit-id: baef817fbd402f74ebdcc42f8c8e67374bfa1bc3 [formerly 35abe8c3af]
Former-commit-id: b6f9b78e92
2013-12-04 11:54:11 -06:00
Dave Hladky
c9644b91ed Issue #2607 Fixed Nullpointer
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]]
Former-commit-id: 25f745bc12
Former-commit-id: 085b6124b9 [formerly c93d7b57a1] [formerly 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]]
Former-commit-id: d4b639f2168ea27ca32fecf44774479f0c1f770c [formerly 3cf23e1e4d]
Former-commit-id: 393d4a2967
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
e359c36fd8 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: 76c989a47d [formerly d6640590e9] [formerly a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]]
Former-commit-id: 41865ec7e304f1812b2137c264a6494932b7e22b [formerly cb6d8f6070]
Former-commit-id: ea09aaff72
2013-12-04 11:22:47 -06:00
Nate Jensen
af6baf91c7 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]]
Former-commit-id: c29836abd7
Former-commit-id: f2a827f884 [formerly cb3d6e2de3] [formerly 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]]
Former-commit-id: 197acb24ea07e1c4a72c16927485bb24f7b34c1c [formerly b58a9fbed7]
Former-commit-id: 92fb530969
2013-12-03 17:44:55 -06:00
Richard Peter
2e90e498f3 Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b [formerly ee03dcf505] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f]
Former-commit-id: 30862929e2
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
f6301e6b23 Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]]
Former-commit-id: eeb3b0173b
Former-commit-id: 1e475d6b33 [formerly 641673e1d5] [formerly cd3195def23d760eed1c4717d9bf0fee8c3ced2a [formerly dc4b8ec40f]]
Former-commit-id: e03027b764b8ea79c6dfa043c06c44c33b01c48a [formerly e0b5d6f75d]
Former-commit-id: bcfa6bb00b
2013-12-03 13:00:47 -06:00
Nate Jensen
3804cdf794 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 38c40514e6 [formerly b6e54e2709] [formerly 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]]
Former-commit-id: 23d82665adeab525d91c44171b8bbdfc67ba46ee [formerly 57d1764c46]
Former-commit-id: c4f8d3e8d5
2013-12-03 09:41:02 -06:00
Nate Jensen
72ed3cce85 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly 622cc1b223] [formerly ccf897af6f [formerly 5c80b34e16] [formerly 622cc1b223] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: d035dbc831 [formerly e5cfe76cac] [formerly dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]]
Former-commit-id: c1d11a887f87c095f57beb9114d2c95e789951a2 [formerly ecd87941e6]
Former-commit-id: cd258c50ee
2013-12-02 17:28:09 -06:00
Steve Harris
c01c05f777 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b455a385e9 [formerly 1195e95c8b] [formerly b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]]
Former-commit-id: b298b019250daf5a2e5c72bbc4f82d1267a2ad12 [formerly 2e47683d4a]
Former-commit-id: 6f4e8734c8
2013-12-02 16:17:38 -06:00
Steve Harris
941d5f65df 14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]]
Former-commit-id: 71ae71c850
Former-commit-id: 41a54a5ca6 [formerly 8bd818de09] [formerly 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]]
Former-commit-id: 163b900bd16bb48d13431ad4d1511ea0204fdfed [formerly f88a635a58]
Former-commit-id: bfa9d638cc
2013-12-02 17:10:10 -05:00
Slav Korolev
3dd96d0f33 Issue #2387. Added system status refresh.
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 4a2e195ea2 [formerly 3dc318418e] [formerly 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]]
Former-commit-id: 34f372bd245e24be00060583c2d67605fee315d9 [formerly 20793f8784]
Former-commit-id: bfb25c50cc
2013-12-02 16:14:45 -05:00
Ben Steffensmeier
92a64b540d Issue #2537 point data code cleanup.
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]]
Former-commit-id: 7889c14b35
Former-commit-id: 65147cfb78 [formerly a4e3bf34b8] [formerly ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]]
Former-commit-id: bbabc5a7d5c61748932072b1206d0f441a38f98e [formerly 8c386a2aac]
Former-commit-id: b29fbe64a8
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
bdf45ea291 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: dcfdc9a24b [formerly 8a7d3ceab1] [formerly 927801985a] [formerly dcfdc9a24b [formerly 8a7d3ceab1] [formerly 927801985a] [formerly 3696896b49 [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]]
Former-commit-id: 3696896b49
Former-commit-id: 56456894f1 [formerly ca5e771451] [formerly a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5]]
Former-commit-id: 8c9b502d3f1a66a2504cb05bd0baf7af764cfd79 [formerly a3f5fcabf6]
Former-commit-id: d307af23eb
2013-11-25 11:31:57 -06:00
Richard Peter
8ba48221d9 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: 551ccf368d [formerly 4b09affc7c] [formerly b26e562845] [formerly 551ccf368d [formerly 4b09affc7c] [formerly b26e562845] [formerly be7c2ef08e [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]]
Former-commit-id: be7c2ef08e
Former-commit-id: 26eb16cae1 [formerly d1201473cd] [formerly b4dd124c6256f5d1be94fb46c9a4a162c713aed8 [formerly c51cc4bf17]]
Former-commit-id: 1240ceeba1f5cebc78296a32d16f5394c461c1fa [formerly 91fcef9d3f]
Former-commit-id: 5bb7b93078
2013-11-22 12:38:05 -06:00
Nate Jensen
7c42c962ed Merge "Issue #2361 fix style manager's jaxb context" into development
Former-commit-id: 591dcce82e [formerly 38fdf1edcf] [formerly 9de7c7f434] [formerly 591dcce82e [formerly 38fdf1edcf] [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 873a26a6a7 [formerly e049c8aca2] [formerly 562f912e8920c73d85c6d405361ce0180caa8daf [formerly 6ab6de4419]]
Former-commit-id: 542ab93f11c94c56a2e2420009615e7c22781b7f [formerly 54c2d1e420]
Former-commit-id: 3d4b802ead
2013-11-22 10:08:13 -06:00
Nate Jensen
3aab64af24 Issue #2361 fix style manager's jaxb context
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 905879ba90 [formerly 2c61b8f4d6] [formerly 16329ab06b] [formerly 905879ba90 [formerly 2c61b8f4d6] [formerly 16329ab06b] [formerly 328991e577 [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]]
Former-commit-id: 328991e577
Former-commit-id: bf3e9e95e6 [formerly 24e99ec924] [formerly 3170492ca14e7028f5daf3a156117f991ebeea59 [formerly ebc3efdf80]]
Former-commit-id: d6b3fce814c8cb24ee8a9a7b52224b71d77beaff [formerly b6748206e5]
Former-commit-id: 3e24b4827e
2013-11-22 09:15:24 -06:00
Dave Hladky
3f842ea0de Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly a9a3973319 [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]]
Former-commit-id: a9a3973319
Former-commit-id: ad8acfb5f4 [formerly cebf79ad44] [formerly 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1]]
Former-commit-id: b147519b3153c2a930101210430242451206b975 [formerly 54af53ffb4]
Former-commit-id: 2e254e0208
2013-11-21 14:46:47 -06:00
Nate Jensen
41a4389e68 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
Former-commit-id: 9c2398a7dd [formerly 32cbfd6150] [formerly ddb0eaf0ff] [formerly 9c2398a7dd [formerly 32cbfd6150] [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]]
Former-commit-id: d851e6fc97
Former-commit-id: a95890a5c8 [formerly f5a2c7298a] [formerly c5557070349346f520ff88e345376e2ce126e8b0 [formerly f60948fc36]]
Former-commit-id: 76566b611d6aa3e7867c609059825a2c4c81d349 [formerly a5469c1d9e]
Former-commit-id: f3bbaa5362
2013-11-21 10:12:11 -06:00
Nate Jensen
aa5f825c11 Issue #2033 fix plots working with multiple plotModels dirs contributed
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 8a2c4ced39 [formerly b3028b4f39] [formerly 9371c63c41] [formerly 8a2c4ced39 [formerly b3028b4f39] [formerly 9371c63c41] [formerly 2b6799712d [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]]
Former-commit-id: 2b6799712d
Former-commit-id: 68ac9daf67 [formerly 87dc5fb261] [formerly 6e959cad50fac90ee22febf459ef923945938143 [formerly 3e88de72dc]]
Former-commit-id: e746ee27e1b0a4a2e4cc0607c58c2c3ae60a7acf [formerly 19b467c208]
Former-commit-id: 3a5a066bf3
2013-11-20 17:33:53 -06:00
Ron Anderson
f54ac1014a Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly 633137d8c0 [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]]
Former-commit-id: 633137d8c0
Former-commit-id: bbb24dfdbd [formerly 769df41dea] [formerly ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738]]
Former-commit-id: 88b789c28703f9bf73991585ff00bcc13e9d24bd [formerly a731f80011]
Former-commit-id: e2f54e78d0
2013-11-20 13:43:25 -06:00
Ben Steffensmeier
f3fb127460 Issue #2532 Fix grid displays of grids larger than the world.
Former-commit-id: f98ccd8c97 [formerly 6d878e3361] [formerly d3ed1ba356] [formerly f98ccd8c97 [formerly 6d878e3361] [formerly d3ed1ba356] [formerly 41753c40b5 [formerly d3ed1ba356 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]]]
Former-commit-id: 41753c40b5
Former-commit-id: 7d6d765081 [formerly 7f441392b8] [formerly c329e9c74d28818f4e37e2c7f57e4357d5175a4a [formerly 07743c4369]]
Former-commit-id: 85824d9ffaa9ff82c417d5e8021819197e1fb138 [formerly 1bc4453a8d]
Former-commit-id: 6cd151b427
2013-11-20 11:11:03 -06:00
Brian Clements
e7fb4b66f0 Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 42f7214967 [formerly d35fc591d2] [formerly fe58826a1e] [formerly 0f40ae2b99 [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 6c28068d21 [formerly 10e63616ff] [formerly 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88]]
Former-commit-id: a1d8502b3240284d2507e2776811c33a9a4f1087 [formerly 2e4dc2000e]
Former-commit-id: 6b8a853240
2013-11-20 08:40:12 -06:00
Steve Harris
8a1ea4d35f 14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a]
Former-commit-id: ea65181d19
2013-11-19 16:40:25 -05:00
Lee Venable
62b59bc20a Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly d42c36f365 [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]]
Former-commit-id: d42c36f365
Former-commit-id: 1468a92082 [formerly c680cc3ea9] [formerly 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e]]
Former-commit-id: c74dc0479155e96d534cdcdfca9a709e0b351ba4 [formerly d3b12f6973]
Former-commit-id: fd377ca4cc
2013-11-19 15:12:38 -06:00
Nate Jensen
036fa57da4 Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly a610825ef9 [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]]
Former-commit-id: a610825ef9
Former-commit-id: 37f4ecfe9e [formerly 789f050b27] [formerly 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7]]
Former-commit-id: 5f448b6e0ae144458579d677da2387bf34095954 [formerly ac93e07973]
Former-commit-id: 3cbf29226a
2013-11-19 14:11:01 -06:00
Nate Jensen
ca6de6494d Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: cd44881c08 [formerly 83c28fd04b] [formerly c90a7d7b3c] [formerly cd44881c08 [formerly 83c28fd04b] [formerly c90a7d7b3c] [formerly 5aee685557 [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]]
Former-commit-id: 5aee685557
Former-commit-id: cee86da089 [formerly 48632a81b3] [formerly 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba]]
Former-commit-id: 16de96ff126e1735ea9cc6c041a171b1f7237755 [formerly cf87d1c335]
Former-commit-id: 9cbe1a123e
2013-11-19 12:59:10 -06:00
Mike Duff
3d66f30af1 Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 71093a685e [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]]
Former-commit-id: 71093a685e
Former-commit-id: 4d18da0420 [formerly 8f9b847eff] [formerly 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354]]
Former-commit-id: 2c9c893948fa8f87a91c114556f3aaee31babb91 [formerly fcc96787c3]
Former-commit-id: e380af2664
2013-11-19 12:51:06 -06:00
Mike Duff
7b285740e2 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 665d9e7651 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]]
Former-commit-id: 665d9e7651
Former-commit-id: fd5a8b283d [formerly 8221f50e8a] [formerly fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967]]
Former-commit-id: 82ed33c047718d5a5664b805503ccce5378442c1 [formerly d254f954c4]
Former-commit-id: dd80768cc2
2013-11-19 08:55:27 -06:00
Nate Jensen
24bb2b914d Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 3d51d80170 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]]
Former-commit-id: 3d51d80170
Former-commit-id: 32737415fc [formerly 7da95f7b57] [formerly d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3]]
Former-commit-id: 1eb3dd2593616960f8702398df44a591a5441f49 [formerly a5abd4dad0]
Former-commit-id: 1926ac3647
2013-11-18 12:50:38 -06:00
Nate Jensen
88725bf57b Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]]
Former-commit-id: 827b7f5a93
Former-commit-id: f640ecf96e [formerly 3de7e3576b] [formerly ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f]]
Former-commit-id: b1e2fa733d9d12c12439bc83f67a8be4f1479985 [formerly b6fe32de06]
Former-commit-id: 553a32f5a3
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
86418297ff Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly e7a068e595 [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]]
Former-commit-id: e7a068e595
Former-commit-id: 8e2b4353cc [formerly 51c04680e2] [formerly ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57]]
Former-commit-id: 14e9b1c968978356e85b2e67c57fd8481fdfcd9a [formerly 9bd35b793d]
Former-commit-id: 9fa1dbbfa5
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
c49ae5d321 Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 9ff1751f4e [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 00088654a0 [formerly 0788a82a99] [formerly 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695]]
Former-commit-id: d79a110b1a53c8b830a2684f1f2f27e3e8b4309f [formerly 55f26e277f]
Former-commit-id: 7de35d0111
2013-11-18 11:44:56 -06:00
Nate Jensen
64318dcc88 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]]
Former-commit-id: 0146ae59df
Former-commit-id: f9cdff25f0 [formerly d9d0eb7354] [formerly d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]]
Former-commit-id: 6f1ac0cbf7524da75f1cd4b4998b7cdb7a08bd26 [formerly 951c1ff2f3]
Former-commit-id: 7e76b097c7
2013-11-18 11:39:12 -06:00
Steve Harris
2d3311aace Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6]
Former-commit-id: 87ce579deb
2013-11-15 13:15:25 -06:00
Steve Harris
e3de9e104e 14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5]
Former-commit-id: ed58bc7f71
2013-11-15 12:47:49 -05:00
Nate Jensen
6b09f38258 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d8f4ecc2d7 [formerly d0d712ec6f] [formerly dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]]
Former-commit-id: ec63b3c149df4d0ab77744254adbda1de3fcf101 [formerly f2c777ff48]
Former-commit-id: 2e81364691
2013-11-14 17:41:24 -06:00