Commit graph

4496 commits

Author SHA1 Message Date
Nate Jensen
a1ff972ae6 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 34205de815 [formerly 34205de815 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]
Former-commit-id: db25d00dc5
Former-commit-id: 280325460f
2013-12-05 13:00:06 -06:00
Nate Jensen
bd4e9158f0 Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: c47f6546dd [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 7163e28d35
2013-12-05 12:59:58 -06:00
Richard Peter
c909291e15 Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 73960ce29a [formerly 73960ce29a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]
Former-commit-id: a8b251223a
Former-commit-id: 7bcdabd8dd
2013-12-05 12:33:51 -06:00
Richard Peter
fd93b7d85e 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: 0c4ae068ad [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: da027298d4
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
c3aa830346 Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: a567f2af89 [formerly a567f2af89 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]
Former-commit-id: 3d2439dc31
Former-commit-id: a5001016c9
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
956e8b04f2 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: f682e66e9b [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]
Former-commit-id: 46a466497c
Former-commit-id: ad9fee446d
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
3d7c473241 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: 0b0e70b667 [formerly 0b0e70b667 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]
Former-commit-id: ed77440c28
Former-commit-id: 7ed6195536
2013-12-05 10:20:24 -06:00
Lee Venable
195162014d Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 4f1b663b37 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]
Former-commit-id: b7be687903
Former-commit-id: 3a3333e4ec
2013-12-05 08:30:28 -06:00
Lee Venable
ef61348fb8 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: 266d4884da [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]
Former-commit-id: a385ec612c
Former-commit-id: d433717c8c
2013-12-05 08:25:46 -06:00
Ron Anderson
89e87a1683 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: b5906249cc [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]
Former-commit-id: 20eeb2796e
Former-commit-id: 103fed386f
2013-12-04 17:10:48 -06:00
Steve Harris
57355f5eaf 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: cc79281795 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]
Former-commit-id: ce7808a309
Former-commit-id: 7611759aaa
2013-12-04 16:48:47 -06:00
Steve Harris
234ca267ed 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: a3ec45a99f
Former-commit-id: 14421048af
2013-12-04 16:47:59 -05:00
Ron Anderson
1988e86bbd Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 7459d65134 [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 75d2dd7a29
2013-12-04 15:29:28 -06:00
Richard Peter
8cdd151d64 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: ea7dac5993 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]
Former-commit-id: 0281447166
Former-commit-id: f6808e6623
2013-12-04 12:00:40 -06:00
Dave Hladky
dc5f5f3c87 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 483ec5d22f [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]
Former-commit-id: 593f24023d
Former-commit-id: 4060748634
2013-12-04 11:58:49 -06:00
Nate Jensen
35abe8c3af Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 020c4de47d [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 78629260d9
2013-12-04 11:54:11 -06:00
Dave Hladky
3cf23e1e4d Issue #2607 Fixed Nullpointer
Former-commit-id: 25ce37d2d8 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]
Former-commit-id: 25f745bc12
Former-commit-id: b0f12b6613
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
cb6d8f6070 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 3c8962fb96 [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]
Former-commit-id: 0b4eaac59e
Former-commit-id: d1b4fdd9c8
2013-12-04 11:22:47 -06:00
Nate Jensen
de177fb0cb Merge "Issue #2170: Fix DataUriRouter Java 1.6 compliance" into development
Former-commit-id: ca02d9c7e0 [formerly ca02d9c7e0 [formerly c269247a19c35b4e7f641d30ceb601f07cd9eb65]]
Former-commit-id: 6f5ce44016
Former-commit-id: 30fcbc323a
2013-12-04 10:00:06 -06:00
Nate Jensen
7213b7a07c Merge "Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. Amend: Remove IDecoderGettable." into development
Former-commit-id: 419c690953 [formerly 419c690953 [formerly e85be3dba88f7f02564e583b360a5f40a90f95b6]]
Former-commit-id: 92262afcfd
Former-commit-id: 2c45adcd0b
2013-12-04 09:54:13 -06:00
Richard Peter
cd1aebbf03 Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

Former-commit-id: b02490146a [formerly b02490146a [formerly 6f38a006d33217389975a3cfeeda9c1bed928c13]]
Former-commit-id: 623fb3b71a
Former-commit-id: b627f93141
2013-12-04 09:53:00 -06:00
Nate Jensen
b58a9fbed7 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: cc53373478 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]
Former-commit-id: c29836abd7
Former-commit-id: bad9e2ab44
2013-12-03 17:44:55 -06:00
Richard Peter
0932f3103b Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 98117b4093 [formerly 98117b4093 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 1a554d9632
2013-12-03 17:24:01 -06:00
Richard Peter
b0e694483f 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: f5f75ec629 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: e82e1137f9
Former-commit-id: 94994868fa
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
e0b5d6f75d Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 88f7b75df4 [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]
Former-commit-id: eeb3b0173b
Former-commit-id: dc4b8ec40f
2013-12-03 13:00:47 -06:00
Richard Peter
2648f04f41 Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
Former-commit-id: ce4a95a082 [formerly ce4a95a082 [formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]
Former-commit-id: 37c08d3e82
Former-commit-id: 8a301388e1
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
f09a350189 Issue #2537 Serialize empty enum sets.
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2

Former-commit-id: f460896552 [formerly f460896552 [formerly 0dabccd03145857b75fe90260b4d52e1541c5591]]
Former-commit-id: f7be93daa7
Former-commit-id: 74e182ad5e
2013-12-03 12:17:01 -06:00
Richard Peter
ceaca5b674 Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: 97fe8bd24b [formerly 97fe8bd24b [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]
Former-commit-id: a2028de5bc
Former-commit-id: 86d08ef574
2013-12-03 11:41:22 -06:00
Richard Peter
ff5fbcf012 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: 2085a9cd33 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]
Former-commit-id: fbda83aeb9
Former-commit-id: f7f9a4e57c
2013-12-03 11:41:21 -06:00
Nate Jensen
57d1764c46 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: ece38c85c0 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]
Former-commit-id: 2daf0f2691
Former-commit-id: a5cf904e1f
2013-12-03 09:41:02 -06:00
Lee Venable
3087ef54e2 Merge "Issue #2387. Added system status refresh." into development
Former-commit-id: deb003184f [formerly deb003184f [formerly 3bb2756cd854c029d0656803efdcc686ccbae01f]]
Former-commit-id: 7109e994da
Former-commit-id: 883b960f48
2013-12-03 09:05:04 -06:00
Nate Jensen
ecd87941e6 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: 622cc1b223 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]
Former-commit-id: 90d6b5bd74
Former-commit-id: e40c71acd1
2013-12-02 17:28:09 -06:00
Richard Peter
ceccd412dc Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: 10f32b5fc7 [formerly 10f32b5fc7 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]
Former-commit-id: 02b11b3509
Former-commit-id: 3113fe26cd
2013-12-02 16:52:40 -06:00
Steve Harris
2e47683d4a Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65d5f13864 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 6539b80ded
2013-12-02 16:17:38 -06:00
Nate Jensen
cbd12d4cc7 Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 6bf1fd8d3c [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]
Former-commit-id: 72c322c667
Former-commit-id: 2831ceb356
2013-12-02 16:10:26 -06:00
Steve Harris
f88a635a58 14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
2013-12-02 17:10:10 -05:00
Steve Harris
114fb8b060 Issue #2422 - Fix edexBridge like in RHEL6
Former-commit-id: a58f1f8d76 [formerly a58f1f8d76 [formerly de5cf0cd69ddcd92bcb1e1ff9ea2c2b0253b36bd]]
Former-commit-id: d6242c20a4
Former-commit-id: 67217a7fc3
2013-12-02 15:16:42 -06:00
Slav Korolev
20793f8784 Issue #2387. Added system status refresh.
Former-commit-id: 1be43bc76c [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]
Former-commit-id: f7f00b77d0
Former-commit-id: 5e225387fd
2013-12-02 16:14:45 -05:00
Steve Harris
5346faae3d Issue #2297 - fixing build scripts
Former-commit-id: 193f06f545 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]
Former-commit-id: 94cd37acf6
Former-commit-id: b0516c0938
2013-12-02 14:57:20 -06:00
Brad Gonzales
c596c6f672 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: dc7e255d43 [formerly dc7e255d43 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]
Former-commit-id: 8acfa99e77
Former-commit-id: dd8eb8c2b4
2013-12-02 11:44:09 -06:00
Benjamin Phillippe
878f9fe3ea Issue #2534 Added reciprocated registry replication subscriptions
Change-Id: I6844d65ccab6c4246f37ce212fa17af09851da27

Former-commit-id: 212bbeb379 [formerly 212bbeb379 [formerly 2c52a6ee6f7d491d484c423359b8440975ad6d1e]]
Former-commit-id: 31b53f4ad9
Former-commit-id: 2fa17aab7f
2013-11-27 12:07:59 -06:00
Nate Jensen
3b00fc37a5 Merge "Issue #2537 point data code cleanup." into development
Former-commit-id: 9a4a4fba2d [formerly 9a4a4fba2d [formerly 8ccafcec9155bdab49d4d41c3a463323946f1850]]
Former-commit-id: d9ab670d45
Former-commit-id: 0a936e860a
2013-11-26 17:48:53 -06:00
Ben Steffensmeier
14d7341d68 Issue #2528 Allow geostationary data to display on an identical projection.
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 048f968147 [formerly 048f968147 [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]
Former-commit-id: 59d806fa7e
Former-commit-id: 37f6acbb99
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
63d163c00e Issue #2574 Fix conversion of null grid coverage in dataURI.
Former-commit-id: 21f0abbca1 [formerly 21f0abbca1 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]]
Former-commit-id: 6d14edd0a8
Former-commit-id: 089bdf97cb
2013-11-26 15:19:31 -06:00
Ben Steffensmeier
8c386a2aac Issue #2537 point data code cleanup.
Former-commit-id: a4e3a4a03b [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]
Former-commit-id: 7889c14b35
Former-commit-id: 62ca7b1df6
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
b1de6a34eb Issue #2574 Add DataURIFieldConverter for GridCoverages.
Former-commit-id: 08be03d3fa [formerly 08be03d3fa [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]]
Former-commit-id: bdb0e111ea
Former-commit-id: f7b1015dca
2013-11-25 12:17:36 -06:00
Ben Steffensmeier
a3f5fcabf6 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 927801985a [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 3696896b49
Former-commit-id: 70ca78c7b5
2013-11-25 11:31:57 -06:00
Nate Jensen
7ffe17a73e Merge "Issue #2359 add ability to ignore messages based on threads, ie ignore shef" into development
Former-commit-id: 00fa91223b [formerly 00fa91223b [formerly c4baf73e044c156a942290b8be603d9c9621d9fe]]
Former-commit-id: 38cc0b46f6
Former-commit-id: be4943ae3d
2013-11-25 08:34:40 -06:00
Nate Jensen
493f51eae7 Issue #2359 add ability to ignore messages based on threads, ie ignore
shef

Change-Id: I51d4b29e7accb3ce5bd90c7478c7f143bd76bb48

Former-commit-id: 4a4f50155c [formerly 4a4f50155c [formerly 4a9f2db86a148b58610680dbd2230b286d89e361]]
Former-commit-id: ed1b94ea07
Former-commit-id: 3b0ed49de4
2013-11-22 15:54:22 -06:00
Richard Peter
91fcef9d3f Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: b26e562845 [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]
Former-commit-id: be7c2ef08e
Former-commit-id: c51cc4bf17
2013-11-22 12:38:05 -06:00