Commit graph

4552 commits

Author SHA1 Message Date
Bryan Kowal
3ab3dde09b Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: 0c43ddc19a [formerly ea0243e5da] [formerly ce6e7989617ea657c038124ee01c2907330c0e40 [formerly eceffc3880]]
Former-commit-id: 670c6c05d0683cd40d129ff44552087cd66d1f04 [formerly 91cdeb8c89]
Former-commit-id: c2273bbf5f
2013-12-05 15:53:51 -06:00
Brad Gonzales
d1fa8c738b 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: 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 72df38075f [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0 [formerly e18f7b2380] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -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
Richard Peter
ba7c66948e Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

Former-commit-id: 3dd79852c5 [formerly 02f48f898f] [formerly 5286ef0efa] [formerly 3dd79852c5 [formerly 02f48f898f] [formerly 5286ef0efa] [formerly 01a8461ec9 [formerly 5286ef0efa [formerly a266d4007bdb58525942ef406d6fd7a4d269bb8c]]]]
Former-commit-id: 01a8461ec9
Former-commit-id: af583069c4 [formerly b91b4913c6] [formerly b77fed65aafbc3c1525e24ed1b2eabe0af90b127 [formerly 407fd38c5f]]
Former-commit-id: 5f8efd3491b29239d1ee302c99035252660d57d3 [formerly 7475486bf9]
Former-commit-id: 5744c6422c
2013-12-05 14:22:25 -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
Richard Peter
cd6f139d06 Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: bf845a6f50 [formerly 0cfe359507] [formerly bacfa33301] [formerly bf845a6f50 [formerly 0cfe359507] [formerly bacfa33301] [formerly 88c866256e [formerly bacfa33301 [formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]]
Former-commit-id: 88c866256e
Former-commit-id: 7b222f8982 [formerly ba1bd01bca] [formerly d13b14c1956ab859e5db6a8f3904659a9ce48a78 [formerly 9e64f22e8b]]
Former-commit-id: e215fac20b023c853044712a724bbf1d7f6f493f [formerly b8e4812182]
Former-commit-id: 8e1984e6ed
2013-12-05 13:01:02 -06:00
Nate Jensen
88dba55224 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 70667c9edc [formerly 178b2bc3fa] [formerly 34205de815] [formerly 70667c9edc [formerly 178b2bc3fa] [formerly 34205de815] [formerly db25d00dc5 [formerly 34205de815 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]]
Former-commit-id: db25d00dc5
Former-commit-id: b838267dfc [formerly 8b4f6873a0] [formerly 75746ca49730ca540e2a30e1645ceb7d3dc5b58b [formerly 280325460f]]
Former-commit-id: 00ab4bdcb1b88ea20092d07c85b260d4c24a1461 [formerly a1ff972ae6]
Former-commit-id: ecdbb80086
2013-12-05 13:00:06 -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
a9fca155ac Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 98d1934501 [formerly 5ad19e32a9] [formerly 73960ce29a] [formerly 98d1934501 [formerly 5ad19e32a9] [formerly 73960ce29a] [formerly a8b251223a [formerly 73960ce29a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]]
Former-commit-id: a8b251223a
Former-commit-id: 405274c409 [formerly f473851db8] [formerly 353ea204d786797b9a8d11a6fa8df1eaa4fe8faa [formerly 7bcdabd8dd]]
Former-commit-id: 6c14189c557acf3e1b8a1b3e6050994837f87b02 [formerly c909291e15]
Former-commit-id: 20b1c9cfbc
2013-12-05 12:33:51 -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
9afbf8737a Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: 8746c75023 [formerly 9036774493] [formerly a567f2af89] [formerly 8746c75023 [formerly 9036774493] [formerly a567f2af89] [formerly 3d2439dc31 [formerly a567f2af89 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]]
Former-commit-id: 3d2439dc31
Former-commit-id: 8ca3c352c6 [formerly d1cfb7f9d5] [formerly 10d58850c6a7d67b077c8a2f260784bc567fdc56 [formerly a5001016c9]]
Former-commit-id: c167d318348112adecb62fdca3c42916f9750ba0 [formerly c3aa830346]
Former-commit-id: bff909c157
2013-12-05 11:27:29 -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
Benjamin Phillippe
05697b7d21 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: da4f658b7a [formerly ed890ce9d9] [formerly 0b0e70b667] [formerly da4f658b7a [formerly ed890ce9d9] [formerly 0b0e70b667] [formerly ed77440c28 [formerly 0b0e70b667 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]]
Former-commit-id: ed77440c28
Former-commit-id: 2165a9059a [formerly 7051d10140] [formerly 30d36d7bd29ad367d12eab6b8c4f863628e42d08 [formerly 7ed6195536]]
Former-commit-id: e1c980933ce90b17acef2e071f802300ba5224f4 [formerly 3d7c473241]
Former-commit-id: 8c1e55db1f
2013-12-05 10:20:24 -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
43dc948ff1 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: 655c9931e4 [formerly a5f141a2cc] [formerly cc79281795] [formerly 655c9931e4 [formerly a5f141a2cc] [formerly cc79281795] [formerly ce7808a309 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]]]
Former-commit-id: ce7808a309
Former-commit-id: 445b20ba2e [formerly d67709483a] [formerly d1b039aab850486af92fdbc8361d52b37403588f [formerly 7611759aaa]]
Former-commit-id: 7732f3fbda02c68db5fc7fa0491b2f307e91e9c2 [formerly 57355f5eaf]
Former-commit-id: e36c9ca1b6
2013-12-04 16:48:47 -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
Richard Peter
956a39cf72 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 0281447166 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]]
Former-commit-id: 0281447166
Former-commit-id: 8f9b6fa07c [formerly d937861d05] [formerly f8b518f19e6bc75858971de994088a9caa63f0de [formerly f6808e6623]]
Former-commit-id: c7aa9d937c01012c67dfbd64e95131561967b13e [formerly 8cdd151d64]
Former-commit-id: 54c056a310
2013-12-04 12:00:40 -06:00
Dave Hladky
4d222b0a16 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly 593f24023d [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]]
Former-commit-id: 593f24023d
Former-commit-id: 36f601253e [formerly 09aa3a6c62] [formerly 035f4702c002daa8199c28c0d3ad1c8b496bd6ab [formerly 4060748634]]
Former-commit-id: f25d919b9119ff63b128cb8bcb67039b0f6d8ae8 [formerly dc5f5f3c87]
Former-commit-id: 25745e2782
2013-12-04 11:58:49 -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
3094682113 Merge "Issue #2170: Fix DataUriRouter Java 1.6 compliance" into development
Former-commit-id: 5445c1a958 [formerly d593a3248c] [formerly ca02d9c7e0] [formerly 5445c1a958 [formerly d593a3248c] [formerly ca02d9c7e0] [formerly 6f5ce44016 [formerly ca02d9c7e0 [formerly c269247a19c35b4e7f641d30ceb601f07cd9eb65]]]]
Former-commit-id: 6f5ce44016
Former-commit-id: e3c371f17e [formerly 2005435560] [formerly 972ff4be59c2a0341f67d0fcfaae44f29eb6f7e0 [formerly 30fcbc323a]]
Former-commit-id: 6f30af7631c54c45963cf8ea905a6ec15ae1130f [formerly de177fb0cb]
Former-commit-id: 8fc153836a
2013-12-04 10:00:06 -06:00
Nate Jensen
92fe16915e Merge "Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. Amend: Remove IDecoderGettable." into development
Former-commit-id: 454488ed7d [formerly fd361d7d5c] [formerly 419c690953] [formerly 454488ed7d [formerly fd361d7d5c] [formerly 419c690953] [formerly 92262afcfd [formerly 419c690953 [formerly e85be3dba88f7f02564e583b360a5f40a90f95b6]]]]
Former-commit-id: 92262afcfd
Former-commit-id: 6293458bcd [formerly d8f5b9b7ca] [formerly cb8966343fc0b332e805a55e26d86889504d5bc3 [formerly 2c45adcd0b]]
Former-commit-id: d4c0b35a2d295bb963a18720f53b064318119818 [formerly 7213b7a07c]
Former-commit-id: 285c7f0f96
2013-12-04 09:54:13 -06:00
Richard Peter
67e89d6e14 Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

Former-commit-id: 8de680ac47 [formerly 987b86734f] [formerly b02490146a] [formerly 8de680ac47 [formerly 987b86734f] [formerly b02490146a] [formerly 623fb3b71a [formerly b02490146a [formerly 6f38a006d33217389975a3cfeeda9c1bed928c13]]]]
Former-commit-id: 623fb3b71a
Former-commit-id: 5df468bf42 [formerly 8b221db32d] [formerly cd13fd0803ec14ea5f01e028adf952d3cc210785 [formerly b627f93141]]
Former-commit-id: ecb9de3c03deb8be91efdef65b5c3a1eec8e33c2 [formerly cd1aebbf03]
Former-commit-id: da26ffa328
2013-12-04 09:53:00 -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
e93e05f0d9 Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 7a6363a221 [formerly 796293c036] [formerly 98117b4093] [formerly 7a6363a221 [formerly 796293c036] [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 98117b4093 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 73ead1f113 [formerly 00c44b3a08] [formerly 44511bfc2e531ad41861e79e71e290ead558ef3f [formerly 1a554d9632]]
Former-commit-id: 50fd2d176bfd11cab3ceb3941987c83a296eaa8b [formerly 0932f3103b]
Former-commit-id: 611b721bbf
2013-12-03 17:24:01 -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
Richard Peter
84a524a254 Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
Former-commit-id: 27802b5c05 [formerly 2ffe348d85] [formerly ce4a95a082] [formerly 27802b5c05 [formerly 2ffe348d85] [formerly ce4a95a082] [formerly 37c08d3e82 [formerly ce4a95a082 [formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]]]
Former-commit-id: 37c08d3e82
Former-commit-id: c809c1d4de [formerly 686de8b760] [formerly 2ea31c1eecb49d380da4ab9010c20541fc000514 [formerly 8a301388e1]]
Former-commit-id: fbd83bc9c41dfdc0274416a176768b1230d1de6c [formerly 2648f04f41]
Former-commit-id: 3b6e52cc8d
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
99cb89f475 Issue #2537 Serialize empty enum sets.
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2

Former-commit-id: a7b0bf7f5d [formerly 90950af8a2] [formerly f460896552] [formerly a7b0bf7f5d [formerly 90950af8a2] [formerly f460896552] [formerly f7be93daa7 [formerly f460896552 [formerly 0dabccd03145857b75fe90260b4d52e1541c5591]]]]
Former-commit-id: f7be93daa7
Former-commit-id: 225ab6a985 [formerly 0ac69e2bda] [formerly f6f3d8e3cf59df4cee317ea30921cc5eccf19bca [formerly 74e182ad5e]]
Former-commit-id: bd8fbc59982816e8afb6c7e66dfc60b7f5aa2e61 [formerly f09a350189]
Former-commit-id: 8f7b486130
2013-12-03 12:17:01 -06:00
Richard Peter
df868138bf Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: ad487befc7 [formerly c0c4dad633] [formerly 97fe8bd24b] [formerly ad487befc7 [formerly c0c4dad633] [formerly 97fe8bd24b] [formerly a2028de5bc [formerly 97fe8bd24b [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]]]
Former-commit-id: a2028de5bc
Former-commit-id: 753bb7d8ba [formerly f75acec79c] [formerly f6c2eea47423468305e8de35fb818c7b24ded26e [formerly 86d08ef574]]
Former-commit-id: 3ab1ed6edd1696f0f5af072511cafb2567044c79 [formerly ceaca5b674]
Former-commit-id: d53d7d0c0d
2013-12-03 11:41:22 -06:00
Richard Peter
052119fffe Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 14ed9331d3 [formerly 670e63d0dd] [formerly 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c]]
Former-commit-id: 5edc348b297d22aeb20b7b1cbe81e90329464d25 [formerly ff5fbcf012]
Former-commit-id: 90e23f5c6b
2013-12-03 11:41:21 -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
Lee Venable
e89ea0b855 Merge "Issue #2387. Added system status refresh." into development
Former-commit-id: 9ddd43be62 [formerly 8de2238748] [formerly deb003184f] [formerly 9ddd43be62 [formerly 8de2238748] [formerly deb003184f] [formerly 7109e994da [formerly deb003184f [formerly 3bb2756cd854c029d0656803efdcc686ccbae01f]]]]
Former-commit-id: 7109e994da
Former-commit-id: 2ad5976b0b [formerly 3335ef660c] [formerly a85eade7e9608af89c4b4f1956ac0d384b52c311 [formerly 883b960f48]]
Former-commit-id: 138990153dff7017e50c1c9dc9ecaae7e7bb07d4 [formerly 3087ef54e2]
Former-commit-id: dc6e92b66d
2013-12-03 09:05:04 -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
Richard Peter
b4294ee22d Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: daab4cdf27 [formerly 829744ced9] [formerly 10f32b5fc7] [formerly daab4cdf27 [formerly 829744ced9] [formerly 10f32b5fc7] [formerly 02b11b3509 [formerly 10f32b5fc7 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]]]
Former-commit-id: 02b11b3509
Former-commit-id: 212fccb765 [formerly 35d4e7239f] [formerly 2cafe53ae959bca215aefcacc88290c16da44bc2 [formerly 3113fe26cd]]
Former-commit-id: 5e4bf8e92d73db3f07f1cc61dfa50bf03dd24b92 [formerly ceccd412dc]
Former-commit-id: b5962b7f06
2013-12-02 16:52:40 -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
Nate Jensen
74c0067901 Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 77c23c6d0e [formerly 9b3f871c21] [formerly 6bf1fd8d3c] [formerly 77c23c6d0e [formerly 9b3f871c21] [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]]
Former-commit-id: 72c322c667
Former-commit-id: a25621ae6d [formerly 476f9da5ad] [formerly 58b83a2d53b306277cdc9a0820852147a2519f74 [formerly 2831ceb356]]
Former-commit-id: f8fdfa9a908f980ca803296046b6496e1b85e6e3 [formerly cbd12d4cc7]
Former-commit-id: da9d1b2447
2013-12-02 16:10:26 -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
Steve Harris
83a7b34369 Issue #2422 - Fix edexBridge like in RHEL6
Former-commit-id: 2214ab8e80 [formerly 927b509334] [formerly a58f1f8d76] [formerly 2214ab8e80 [formerly 927b509334] [formerly a58f1f8d76] [formerly d6242c20a4 [formerly a58f1f8d76 [formerly de5cf0cd69ddcd92bcb1e1ff9ea2c2b0253b36bd]]]]
Former-commit-id: d6242c20a4
Former-commit-id: 12fdbf66fa [formerly 75d68f80d0] [formerly 874a6fc5a7ef30f4765c328ae6fa870a0561027c [formerly 67217a7fc3]]
Former-commit-id: 99ece5fc86ef1d56b33b07e47a085ba3fd197e7b [formerly 114fb8b060]
Former-commit-id: ece2004a97
2013-12-02 15:16:42 -06: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
Steve Harris
c2c71e6bca Issue #2297 - fixing build scripts
Former-commit-id: 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 1ea87a31c1 [formerly 1914ddd079] [formerly 6f8066380ee7e58d7dbf970e1cf56bc481bf84f2 [formerly b0516c0938]]
Former-commit-id: 6679dd86e41a55daa6fb0bef55c854612c4d4dbd [formerly 5346faae3d]
Former-commit-id: f51f520acb
2013-12-02 14:57:20 -06:00
Brad Gonzales
5a58530d03 Issue #2541 Added exclude patterns to RequestPatterns.
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: 5a29ccf45a [formerly abafd2bc13] [formerly dc7e255d43] [formerly 5a29ccf45a [formerly abafd2bc13] [formerly dc7e255d43] [formerly 8acfa99e77 [formerly dc7e255d43 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]]]
Former-commit-id: 8acfa99e77
Former-commit-id: 2ac17d4f80 [formerly f25d05d871] [formerly ae02142a37272496582f2ecc88cfd8d603853aa7 [formerly dd8eb8c2b4]]
Former-commit-id: 92c939ad476a1068e1097bc9ebf073196e097603 [formerly c596c6f672]
Former-commit-id: 5bebc39d29
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
aaf5dfbd62 Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 67f6ee0999 [formerly f4144fca06] [formerly 212bbeb379] [formerly 67f6ee0999 [formerly f4144fca06] [formerly 212bbeb379] [formerly 31b53f4ad9 [formerly 212bbeb379 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 615b5ce605 [formerly 495f70a5cf] [formerly 9bc982c030242d6a1ff819c729fdbb6438d12813 [formerly 2fa17aab7f]]
Former-commit-id: d2bdc249c301c9e83e1cfcf57c2349d6f1571183 [formerly 878f9fe3ea]
Former-commit-id: b39ef6ca2b
2013-11-27 12:07:59 -06:00
Nate Jensen
68a79505d3 Merge "Issue #2537 point data code cleanup." into development
Former-commit-id: 4d3135ae4a [formerly de593896f8] [formerly 9a4a4fba2d] [formerly 4d3135ae4a [formerly de593896f8] [formerly 9a4a4fba2d] [formerly d9ab670d45 [formerly 9a4a4fba2d [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]]]
Former-commit-id: d9ab670d45
Former-commit-id: 3eecc7fca3 [formerly 1326b0ec0f] [formerly 798f185f5ee43a9a59c7105331f7aa7b519c6504 [formerly 0a936e860a]]
Former-commit-id: 5d912da049763a80bfd65c5199972f5b4e0618c6 [formerly 3b00fc37a5]
Former-commit-id: e6c012c071
2013-11-26 17:48:53 -06:00
Ben Steffensmeier
43c8bab420 Issue #2528 Allow geostationary data to display on an identical projection.
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 7dd3dd2332 [formerly 5369a757ce] [formerly 048f968147] [formerly 7dd3dd2332 [formerly 5369a757ce] [formerly 048f968147] [formerly 59d806fa7e [formerly 048f968147 [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]]
Former-commit-id: 59d806fa7e
Former-commit-id: e3b84502cb [formerly a78188ecb9] [formerly c7a36153bad0dfab90f971ef314e2c47b661772c [formerly 37f6acbb99]]
Former-commit-id: 05df042bf68043ed948634a9cff1c9cac3771b5c [formerly 14d7341d68]
Former-commit-id: d06d42ec24
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
79368df50f Issue #2574 Fix conversion of null grid coverage in dataURI.
Former-commit-id: b790c592e3 [formerly e639a00fd8] [formerly 21f0abbca1] [formerly b790c592e3 [formerly e639a00fd8] [formerly 21f0abbca1] [formerly 6d14edd0a8 [formerly 21f0abbca1 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]]]
Former-commit-id: 6d14edd0a8
Former-commit-id: b64e917cad [formerly c300d0ee8a] [formerly fbbf2251bce73f0459ef7cb44f9d765edb9c2fce [formerly 089bdf97cb]]
Former-commit-id: 70858a5794585afb1ebd500d74ccfb68e819c7ff [formerly 63d163c00e]
Former-commit-id: 38ca6a726c
2013-11-26 15:19:31 -06:00