Commit graph

5824 commits

Author SHA1 Message Date
Richard Peter
9326b9d125 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: f38816d168 [formerly dc0b598fd4] [formerly f38816d168 [formerly dc0b598fd4] [formerly 132d63ac44 [formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: 8e141a137a [formerly 5314b412b4]
Former-commit-id: b9351199b8
2014-05-02 10:05:59 -05:00
Richard Peter
f34020dcc0 Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 6bb353a05d [formerly 51ba60d62b] [formerly 6bb353a05d [formerly 51ba60d62b] [formerly 24f1c7b385 [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]
Former-commit-id: 24f1c7b385
Former-commit-id: 592e9171e1 [formerly 1f7e076018]
Former-commit-id: 28c8c6357a
2014-05-02 10:05:29 -05:00
Richard Peter
7481634fdb Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: 4e1bc16d70 [formerly 478cedd3a3] [formerly 4e1bc16d70 [formerly 478cedd3a3] [formerly d4a138c534 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]
Former-commit-id: d4a138c534
Former-commit-id: 160ce06137 [formerly 1b7dd13525]
Former-commit-id: 67eb0867ea
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
dd315aa9b8 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 956f62a6ec [formerly 6bdaba048c] [formerly 956f62a6ec [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: d2c0499f2c [formerly 3300d8c75c]
Former-commit-id: c2a3dbe9af
2014-05-01 18:02:08 -05:00
Richard Peter
338b2c53d0 Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 1738b065b8 [formerly a9b088146c] [formerly 1738b065b8 [formerly a9b088146c] [formerly bcd87195ee [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]
Former-commit-id: bcd87195ee
Former-commit-id: 926cd5f6d1 [formerly e1a2767f8f]
Former-commit-id: df422d1516
2014-05-01 16:30:21 -05:00
Nate Jensen
42a27546f9 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: d759efcaa8 [formerly f4d20c41f4] [formerly d759efcaa8 [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 6f211aa9f8 [formerly f3b68178bd]
Former-commit-id: 3f9a33bf35
2014-05-01 16:28:16 -05:00
Nate Jensen
562a70b8fb Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 3222914fde [formerly 137818d03a] [formerly 3222914fde [formerly 137818d03a] [formerly a73a310709 [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]
Former-commit-id: a73a310709
Former-commit-id: b245e49d53 [formerly 84dbedcff5]
Former-commit-id: c7ddb6d476
2014-05-01 16:20:35 -05:00
Matthew Howard
f99bcfc97f Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: 3b48dcc680 [formerly 55b1198186] [formerly 3b48dcc680 [formerly 55b1198186] [formerly 9e7a0e0a61 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]]]
Former-commit-id: 9e7a0e0a61
Former-commit-id: fce48ae3fd [formerly 571a45c6ea]
Former-commit-id: 4f5e129201
2014-05-01 16:07:11 -05:00
Richard Peter
b8bdced87a Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 25fd0e03f4 [formerly 4056f53fa2] [formerly 25fd0e03f4 [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]
Former-commit-id: a4fb460e17
Former-commit-id: f364f02f58 [formerly c3c7ebb146]
Former-commit-id: 472077fbd5
2014-05-01 14:47:41 -05:00
brian.dyke
22ffaef982 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: 2a934def82 [formerly 5d7b8eca6a] [formerly 2a934def82 [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]
Former-commit-id: d5c3f112c1
Former-commit-id: b68c49053a [formerly 302366dac1]
Former-commit-id: b72e2d4289
2014-05-01 15:20:36 -04:00
Steve Harris
523cf536e2 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 9ecd871825 [formerly c8ba70a146] [formerly 9ecd871825 [formerly c8ba70a146] [formerly 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a6ab8c52f [formerly bdf6d0b6be]
Former-commit-id: d7c31fe4a9
2014-05-01 13:25:15 -05:00
Steve Harris
56bf68d145 Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
Change-Id: Id13953881429545bccb590a550c23a73f77d585e

Former-commit-id: 11ca44c583 [formerly 70ee74a311] [formerly 11ca44c583 [formerly 70ee74a311] [formerly ab0b1ec047 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]
Former-commit-id: ab0b1ec047
Former-commit-id: beba75f87c [formerly 579eb6e47a]
Former-commit-id: 64849d50ec
2014-05-01 12:53:06 -05:00
Nate Jensen
7c748842f0 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: ba9ed2aba3 [formerly b7536a398b] [formerly ba9ed2aba3 [formerly b7536a398b] [formerly 96071c250d [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]
Former-commit-id: 96071c250d
Former-commit-id: dbca36c2bc [formerly 4c2923246a]
Former-commit-id: 704eff96aa
2014-05-01 12:40:41 -05:00
Brian Clements
36b2419ff1 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: 93912625ea [formerly 3ca4f8cc52] [formerly 93912625ea [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: 3fd504f1de [formerly 2337d5ef56]
Former-commit-id: c7cea4b5f7
2014-05-01 12:34:09 -05:00
Bryan Kowal
10a57d5299 Issue #3099 - handle empty location name lists in the data request
Former-commit-id: ff21ef813c [formerly 5eac78f0e0] [formerly ff21ef813c [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 4775dc1f40 [formerly 2079aec2bb]
Former-commit-id: bf24af6980
2014-05-01 12:12:42 -05:00
Nate Jensen
8961b7305e Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: 1d157a16e3 [formerly 7fbdb9ff83] [formerly 1d157a16e3 [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 037fe502d7 [formerly e5eb1ab87e]
Former-commit-id: 1b78d60b52
2014-05-01 12:06:13 -05:00
Nate Jensen
1f294864f0 Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 03b412c136 [formerly b28e5291d6] [formerly 03b412c136 [formerly b28e5291d6] [formerly 244183db25 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]
Former-commit-id: 244183db25
Former-commit-id: 59623a97d0 [formerly 02059a512f]
Former-commit-id: 800ee1a68c
2014-05-01 11:21:54 -05:00
Nate Jensen
4669a93a96 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 7b2ed421f0 [formerly 2a0775e748] [formerly 7b2ed421f0 [formerly 2a0775e748] [formerly 76ad31501b [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]
Former-commit-id: 76ad31501b
Former-commit-id: ffb294cab4 [formerly 191f6c3385]
Former-commit-id: ee285cfc57
2014-05-01 11:01:37 -05:00
Gang.Zhang
d4b87f3bad ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 7d2b256ba9 [formerly 74dc7a5d7c] [formerly 090ed29386 [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]]]
Former-commit-id: 090ed29386
Former-commit-id: 3131e25e69 [formerly 7c7adbd77d]
Former-commit-id: 2b25e8c401
2014-05-01 15:49:48 +01:00
Dave Hladky
a520e57f73 Issue #2992 Missed perl script
Former-commit-id: 9a43ac36e6 [formerly 23433f628d] [formerly 9a43ac36e6 [formerly 23433f628d] [formerly 904a608495 [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]
Former-commit-id: 904a608495
Former-commit-id: bc4067c5d8 [formerly dbe4f68100]
Former-commit-id: 741e809c95
2014-05-01 08:48:38 -05:00
Greg Armendariz
4066e1c518 Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: 2994753636 [formerly 1e48076fb2] [formerly 2994753636 [formerly 1e48076fb2] [formerly 58eaf444bd [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]
Former-commit-id: 58eaf444bd
Former-commit-id: 9f6eff005b [formerly e1d91769fe]
Former-commit-id: 733b64a851
2014-04-30 19:34:43 -05:00
Brian Clements
4c1a6b44c8 Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: fee0a858cb [formerly 873efa1c64] [formerly fee0a858cb [formerly 873efa1c64] [formerly f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: 20830253ba [formerly c187523782]
Former-commit-id: c3d2b4be86
2014-04-30 17:52:43 -05:00
Richard Peter
cfb980db11 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: d28c4fdbae [formerly de9eb60629] [formerly d28c4fdbae [formerly de9eb60629] [formerly 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: d961ff6edc [formerly 6ecb5018b6]
Former-commit-id: dd54408a10
2014-04-30 17:43:50 -05:00
Greg Armendariz
e6ffd106a9 Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
Former-commit-id: 95612236c5 [formerly 4d76163f10] [formerly 95612236c5 [formerly 4d76163f10] [formerly 0354c9ad26 [formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]
Former-commit-id: 0354c9ad26
Former-commit-id: c5760afb93 [formerly 8b477dfc39]
Former-commit-id: cbd92a321b
2014-04-30 17:42:26 -05:00
Dave Hladky
a06db5a4e7 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
2014-04-30 17:38:28 -05:00
Brian Clements
170d78b62b Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: e49d150332 [formerly 57f5ac701c] [formerly e49d150332 [formerly 57f5ac701c] [formerly 1273846844 [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]
Former-commit-id: 1273846844
Former-commit-id: 9fc8796247 [formerly a074b27951]
Former-commit-id: d1c9dbcc28
2014-04-30 16:41:14 -05:00
Greg Armendariz
e9ba949734 Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 4c245da2a2 [formerly 4981b6a438] [formerly 4c245da2a2 [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 94a55e5c31 [formerly 784235ab9f]
Former-commit-id: 2cd476cc62
2014-04-30 15:42:42 -05:00
Nate Jensen
bf92253e0f Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: f6f9169aef [formerly 1eade4f434] [formerly f6f9169aef [formerly 1eade4f434] [formerly f005d2f31c [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: a6df4bd2b2 [formerly b98328113b]
Former-commit-id: 9b3282fabf
2014-04-30 15:16:11 -05:00
Juliya Dynina
bac2c83f58 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: 308e775017 [formerly d804167bb2] [formerly 308e775017 [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: cc93e11ce8 [formerly 6282dd45cb]
Former-commit-id: 80e6ae71d0
2014-04-30 14:53:36 -05:00
Richard Peter
fe5fe5b587 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 37a5292083 [formerly f80e16d0c9] [formerly 37a5292083 [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: f2d07ce35c [formerly 8ddc4eaffd]
Former-commit-id: 5d18fbe5d3
2014-04-30 14:49:24 -05:00
Ben Steffensmeier
c92d5785c9 Issue #2946 Fix auxillary purge rules.
Former-commit-id: bcc02476c6 [formerly 2850d80610] [formerly bcc02476c6 [formerly 2850d80610] [formerly 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 076165515a [formerly e51a0dcb13]
Former-commit-id: 749e7fa56d
2014-04-30 14:38:27 -05:00
Steve Harris
ae6eed5e0a Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core
Former-commit-id: 31f17bbb51 [formerly b7272b3248] [formerly 31f17bbb51 [formerly b7272b3248] [formerly 1eb121595d [formerly 839a926dca01566419409138e9810f14e0e46b84]]]
Former-commit-id: 1eb121595d
Former-commit-id: a659f2bf1d [formerly 88a7777e79]
Former-commit-id: 2eed016efd
2014-04-30 13:59:33 -05:00
Nate Jensen
eb5dd811ca Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2d19ee46e5 [formerly 8cbea21f32] [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 9a2c674142 [formerly a33ca4e3ac]
Former-commit-id: 58618a1842
2014-04-30 13:08:26 -05:00
Richard Peter
55708f1d55 Issue #2854: Reorganize deltaScripts
Former-commit-id: 09f41a6b31 [formerly 56745c942e] [formerly 09f41a6b31 [formerly 56745c942e] [formerly c8e373c098 [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]
Former-commit-id: c8e373c098
Former-commit-id: a526600e3e [formerly e1721cad00]
Former-commit-id: 18b4d133c7
2014-04-30 13:03:44 -05:00
Brian.Dyke
f16c305ae4 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
2014-04-30 12:57:09 -04:00
Steve Harris
d214c3174d Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
	edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
	edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
	edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
	edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.auth/build.properties
	edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
	edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
	edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
	edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java


Former-commit-id: 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 7f3a19cd1f [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 6ad5b5a9d7 [formerly f168d3dddb]
Former-commit-id: 98b93e364e
2014-04-30 11:22:22 -05:00
Mike Duff
ac6147c463 Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 90895cf316 [formerly 60bfadd865] [formerly 90895cf316 [formerly 60bfadd865] [formerly c0b2a19a2f [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: 1e84cb07c2 [formerly 0601068b03]
Former-commit-id: 927e8ffcbb
2014-04-30 10:17:56 -05:00
Juliya Dynina
18c84c47bc Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: 00bbbf32c1 [formerly d37490acb1] [formerly 00bbbf32c1 [formerly d37490acb1] [formerly 78bb549533 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]
Former-commit-id: 78bb549533
Former-commit-id: b28bb8e3ac [formerly d5290b8bbf]
Former-commit-id: a4073b805e
2014-04-30 07:41:27 -05:00
Richard Peter
6668196c3d Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 74b2cdfe34 [formerly 4ae87dcece] [formerly 74b2cdfe34 [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: f381290ed1 [formerly 9663a83d1f]
Former-commit-id: 1488bb27f8
2014-04-29 16:14:52 -05:00
Loubna.Bousaidi
ecbad2efac ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: 1b5bccc451 [formerly 760ee964d6] [formerly 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 93a6523f46 [formerly e28ec3469d]
Former-commit-id: 84640a8936
2014-04-29 21:09:34 +00:00
Steve Harris
8860d8e6e7 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java


Former-commit-id: 7e24fd79a1 [formerly 396daac383] [formerly 7e24fd79a1 [formerly 396daac383] [formerly af7fb01f53 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]
Former-commit-id: af7fb01f53
Former-commit-id: 9b65077ad9 [formerly 225da706b7]
Former-commit-id: 04f12dbaca
2014-04-29 16:09:07 -05:00
Ben Steffensmeier
b2c93dda87 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe5d69c896 [formerly 1d38fb2df1] [formerly fe5d69c896 [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: f31d7f826b [formerly 539a32666b]
Former-commit-id: d4d1e28775
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
af80e94349 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: eb9a0398df [formerly 156c25fb9c] [formerly eb9a0398df [formerly 156c25fb9c] [formerly 5959b17732 [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: 8a1b16d15e [formerly ca8cd9fb43]
Former-commit-id: 3be0087fb9
2014-04-29 15:35:29 -05:00
Roger Ferrel
6751691433 Issue #3036 Added check for archive's root directories.
Former-commit-id: 039e4b5209 [formerly 7a2775ecbc] [formerly 039e4b5209 [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]
Former-commit-id: 3259d4d44d
Former-commit-id: 39f7eb1ecc [formerly f71aee1e36]
Former-commit-id: d9015cddb4
2014-04-29 14:15:11 -05:00
Brian Clements
3c8a573a48 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: abb14c67e7 [formerly 5beb3be2e8] [formerly abb14c67e7 [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]
Former-commit-id: a1e416da97
Former-commit-id: 9f1856a6f0 [formerly a2c0ba7f0b]
Former-commit-id: f03c6cdcf9
2014-04-29 13:48:00 -05:00
Brian.Dyke
1aec51b7c4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
2014-04-29 12:07:21 -04:00
Richard Peter
938e39a0fc Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
Steve Harris
567730e595 Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: 2be0e7730f [formerly 7b56fb23a8] [formerly 2be0e7730f [formerly 7b56fb23a8] [formerly c4597ec58b [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]
Former-commit-id: c4597ec58b
Former-commit-id: 9ef44d2a4c [formerly 7c44a9506c]
Former-commit-id: 983efa8dd3
2014-04-28 16:25:21 -05:00
Lee Venable
3a133f6626 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: a8ab7f3946 [formerly 573465f316] [formerly a8ab7f3946 [formerly 573465f316] [formerly e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: eda26e6076 [formerly 43fdbe9ab6]
Former-commit-id: ede8740acc
2014-04-28 15:24:26 -05:00
Steve Harris
51712fe90b Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core
Former-commit-id: 99a987c980 [formerly de5a81fa6e] [formerly 99a987c980 [formerly de5a81fa6e] [formerly a3618cb714 [formerly 786f3c846b23ff201d32f552ed240f1e97acace4]]]
Former-commit-id: a3618cb714
Former-commit-id: 36572c3681 [formerly 0d33195f0c]
Former-commit-id: c7ac81b0cc
2014-04-28 14:41:41 -05:00