xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5648 commits 31 branches 40 tags 3.8 GiB
Commit graph

2606 commits

Author SHA1 Message Date
Nate Jensen
02184e5ad4 Omaha #3133 remove incorrect dependencies 
Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f

Former-commit-id: 201c21929d [formerly 8137d27223] [formerly 2d32999655] [formerly d2f86668df [formerly 2d32999655 [formerly 6db290e14df962d91174727b027b0c5afc1ed0ce]]]
Former-commit-id: d2f86668df
Former-commit-id: a79d24d3bf3e4d0985ec5cb7dba485d7deac944f [formerly 559993eaf9]
Former-commit-id: 3262ff511d
 2014-05-12 15:21:08 -05:00
Brian Clements
bc2ac0198b Omaha #3152 removed monitorsrv 
jmx plugin that is currently not used and required dependency maintenance


Former-commit-id: 083b68d7b4 [formerly 2de644c9e3] [formerly 87aa26bf5a] [formerly ed8b9f5a89 [formerly 87aa26bf5a [formerly 7a00a651afb1c4251b52a852b01696cc861640be]]]
Former-commit-id: ed8b9f5a89
Former-commit-id: e2220ff9eabf1270c1ef05bef631dcc980ffdf3f [formerly b75243d000]
Former-commit-id: 7d9eaa94c5
 2014-05-12 12:13:28 -05:00
Brian Clements
26064a9629 Omaha #2733 changes to match ufcore distribution pattern changes 
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 316bfe3b6f [formerly 8b07016f25 [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]
Former-commit-id: 316bfe3b6f
Former-commit-id: fbf8cffad16b3edb70ad15a4742dcdc5c87e748c [formerly 9cc5ee88b5]
Former-commit-id: 546cf300df
 2014-05-12 09:14:28 -05:00
Richard Peter
c7ed1a1a93 Omaha #1458: Remove reference to cron.properties 
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062]
Former-commit-id: 328a48a33d
 2014-05-08 12:58:49 -05:00
Steve Harris
bfd8f9b971 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways. 
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]
Former-commit-id: 532b861bce
 2014-05-08 09:50:34 -05:00
Richard Peter
899b8ce879 Omaha #1458: Break-out cron.properties. 
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1]
Former-commit-id: c9d8bfdd06
 2014-05-08 09:18:49 -05:00
Richard Peter
e3e1298591 Omaha #2782: Update thread based logging 
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly fbc4428b8c610d5f30f8d66655122d6b8da482af [formerly d5ec01f7c0]] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]
Former-commit-id: 741710881f
 2014-05-08 09:06:31 -05:00
Steve Harris
f1032ccc05 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.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.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]
Former-commit-id: 7a7c1167c2
 2014-05-07 16:01:53 -05:00
Everett Kladstrup
a472cd5363 Omaha #3133 Remove some unecessary dependencies 
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest


Former-commit-id: 4ea3156453 [formerly 516a50a6a1] [formerly 3a00185e3c] [formerly b4a76a575a [formerly 3a00185e3c [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]
Former-commit-id: b4a76a575a
Former-commit-id: 0b36cc357c9ac92e1860eb4bdfa5b01916468b94 [formerly ce743b3c43]
Former-commit-id: a1070cc1ac
 2014-05-07 12:54:37 -05:00
Nate Jensen
c333277d30 Issue #3101 fix some derived parameters on win64 platform 
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]
Former-commit-id: aa7c1fac90
Former-commit-id: e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370]
Former-commit-id: 815aa21d8e
 2014-05-06 17:08:04 -05:00
Everett Kladstrup
de20eacce2 Omaha #3112 Fix adding classes to WFS jaxb 
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest


Former-commit-id: 129f3017bb [formerly 2ee2db6f38] [formerly 1184e77f1a] [formerly aedb166b4d [formerly 1184e77f1a [formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]
Former-commit-id: aedb166b4d
Former-commit-id: 2e1fc87ea552bfc388ab6869d1d09dea57299cff [formerly 08e8a4a60a]
Former-commit-id: 5f378b30f0
 2014-05-06 17:07:23 -05:00
Richard Peter
8e8e1c45ed Issue #2726: update smartInit threads to 1 
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]
Former-commit-id: 611c010968
Former-commit-id: f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]
Former-commit-id: be288505e0
 2014-05-06 15:54:23 -05:00
Nate Jensen
b16bfd2b38 Issue #2060 genericize DataURIFieldConverter 
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]
Former-commit-id: 87b6df4840
Former-commit-id: 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4]
Former-commit-id: d1a040b9c2
 2014-05-06 13:10:48 -05:00
Nate Jensen
de7bade647 Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1 
Former-commit-id: 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1]
Former-commit-id: 732aaa6001
 2014-05-06 13:09:12 -05:00
Nate Jensen
e8ca9729eb Issue #2060 fill in units on GridRecords created from URIs 
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]
Former-commit-id: 5bf1554597
 2014-05-06 12:26:21 -05:00
Brian Clements
474068d56a Omaha #3116 changed log formatter class to match camel 2.12.3 
Former-commit-id: 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 51eb6c9f06 [formerly c77ba25dc8 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: a092d2d161356b1089eedda592170e6720447ad2 [formerly b8a648f543]
Former-commit-id: 5b26766041
 2014-05-06 11:38:38 -05:00
Richard Peter
9846fbd82c Issue #2726: Autoset route startup order. 
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]
Former-commit-id: 4dc91f494f
Former-commit-id: c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b]
Former-commit-id: 7fe7b43ee2
 2014-05-06 09:46:41 -05:00
Steve Harris
7245029570 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (updated in ufcore):
	cave/com.raytheon.uf.viz.application.feature/feature.xml
	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
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
	edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java


Former-commit-id: dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly 83368e4b4e [formerly 73ed3251bd [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: 2b3b76c82538d382ce6a14c9e014860eb6ff65e2 [formerly caadbd3dd9]
Former-commit-id: ea24d1dadc
 2014-05-05 16:04:09 -05:00
Nate Jensen
3853ef16bb Issue #2060 fix sat precip for grid data URI removal 
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1]
Former-commit-id: 09091ccf25
 2014-05-05 13:06:08 -05:00
Dave Hladky
d9243205e4 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1 
Conflicts:
	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.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]
Former-commit-id: 93ca9cfe6a
 2014-05-05 12:15:14 -05:00
Brad Gonzales
58fda9c22a Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure. 
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115

Former-commit-id: 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 39a2ec8f46 [formerly df353f06f5 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: 702f18abf50a79b37863af04c5f8463202ed6024 [formerly 78714c6ff7]
Former-commit-id: b33bd153f4
 2014-05-02 13:09:57 -05:00
Richard Peter
2507aaf753 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1 
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]
Former-commit-id: 8e141a137a
 2014-05-02 10:05:59 -05:00
Ben Steffensmeier
ae0185a740 Issue #3095 Update JGridData for creation of numeric java package. 
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]
Former-commit-id: d2c0499f2c
 2014-05-01 18:02:08 -05:00
Steve Harris
9a268173ac Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1 
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]
Former-commit-id: 9a6ab8c52f
 2014-05-01 13:25:15 -05:00
Steve Harris
e72b097763 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: 05d6049e35 [formerly 11ca44c583] [formerly 70ee74a311] [formerly ab0b1ec047 [formerly 70ee74a311 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]
Former-commit-id: ab0b1ec047
Former-commit-id: c4fa57c01ab1fe1ea3b7f0c5c4f08b8a4e6ba322 [formerly 579eb6e47a]
Former-commit-id: beba75f87c
 2014-05-01 12:53:06 -05:00
Nate Jensen
c617423fd7 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1 
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]
Former-commit-id: 96071c250d
Former-commit-id: 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]
Former-commit-id: dbca36c2bc
 2014-05-01 12:40:41 -05:00
Brian Clements
8fc0feed89 Issue #2903 changed commons.lang to match other unpacking foss 
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]
Former-commit-id: 3fd504f1de
 2014-05-01 12:34:09 -05:00
Bryan Kowal
5267bae3dd Issue #3099 - handle empty location name lists in the data request 
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]
Former-commit-id: 4775dc1f40
 2014-05-01 12:12:42 -05:00
Nate Jensen
3634889dab Issue #3101 safe cast numpy shape values to Number 
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]
Former-commit-id: 76ad31501b
Former-commit-id: cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]
Former-commit-id: ffb294cab4
 2014-05-01 11:01:37 -05:00
Brian Clements
00e7061f42 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: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]
Former-commit-id: 20830253ba
 2014-04-30 17:52:43 -05:00
Richard Peter
9ee5b7c648 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1 
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]
Former-commit-id: d961ff6edc
 2014-04-30 17:43:50 -05:00
Dave Hladky
5fc17cf3b8 Issue #2992 Updated DD list of active registries 
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]
Former-commit-id: ea791b5ca5
 2014-04-30 17:38:28 -05:00
Nate Jensen
299cb28462 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1 
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]
Former-commit-id: f005d2f31c
Former-commit-id: 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]
Former-commit-id: a6df4bd2b2
 2014-04-30 15:16:11 -05:00
Ben Steffensmeier
410b30ef15 Issue #2946 Fix auxillary purge rules. 
Former-commit-id: 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 4c06cd6f5e [formerly 2850d80610 [formerly a62bdff82f96e79737269686598687ecef746c01]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13]
Former-commit-id: 076165515a
 2014-04-30 14:38:27 -05:00
Nate Jensen
65ad418a94 Issue #2060 fix FFG processing 
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]
Former-commit-id: 9a2c674142
 2014-04-30 13:08:26 -05:00
Brian.Dyke
624606c9dd 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: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]
Former-commit-id: fcf13ae9f7
 2014-04-30 12:57:09 -04:00
Steve Harris
103318357b 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: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]
Former-commit-id: 3380a1dba0
Former-commit-id: ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]
Former-commit-id: 6ad5b5a9d7
 2014-04-30 11:22:22 -05:00
Mike Duff
e5572a5cd0 Issue #2860 - Fix to not create empty substitution tags 
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly c0b2a19a2f [formerly 60bfadd865 [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03]
Former-commit-id: 1e84cb07c2
 2014-04-30 10:17:56 -05:00
Richard Peter
3c2ff2733b Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1 
Former-commit-id: 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 4ae87dcece [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f]
Former-commit-id: f381290ed1
 2014-04-29 16:14:52 -05:00
Steve Harris
bb335fd675 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: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]
Former-commit-id: af7fb01f53
Former-commit-id: aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]
Former-commit-id: 9b65077ad9
 2014-04-29 16:09:07 -05:00
Ben Steffensmeier
57f185dd72 Issue #3081 Use alias in derived paraemters less. 
Former-commit-id: fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly 1d38fb2df1 [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b]
Former-commit-id: f31d7f826b
 2014-04-29 15:43:08 -05:00
Ben Steffensmeier
08442c513a Issue #3080 add NaN conversion to Slice.py 
Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]
Former-commit-id: 8a1b16d15e
 2014-04-29 15:35:29 -05:00
Roger Ferrel
a447baa5a0 Issue #3036 Added check for archive's root directories. 
Former-commit-id: fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly 7a2775ecbc [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]
Former-commit-id: 3259d4d44d
Former-commit-id: c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36]
Former-commit-id: 39f7eb1ecc
 2014-04-29 14:15:11 -05:00
Brian Clements
ad5be1cf6a Issue #2906 added close to BUFR parser 
close netcdf file to solve NFS clean issue


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


Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]
Former-commit-id: f8c3dca497
 2014-04-29 12:07:21 -04:00
Richard Peter
0dfa8cc4c6 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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]
Former-commit-id: 6966b79246
 2014-04-28 16:27:40 -05:00
Steve Harris
1266b9438f Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss 
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2

Former-commit-id: 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly c4597ec58b [formerly 7b56fb23a8 [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]
Former-commit-id: c4597ec58b
Former-commit-id: 21bcb7ea12e3aa6614573b6302c5937f0be904d4 [formerly 7c44a9506c]
Former-commit-id: 9ef44d2a4c
 2014-04-28 16:25:21 -05:00
Steve Harris
98d024336d Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core 
Former-commit-id: 0f0f8a5ee2 [formerly 99a987c980] [formerly de5a81fa6e] [formerly a3618cb714 [formerly de5a81fa6e [formerly 786f3c846b23ff201d32f552ed240f1e97acace4]]]
Former-commit-id: a3618cb714
Former-commit-id: b0eec809b52563ccffa698ac75278b9e18b2151c [formerly 0d33195f0c]
Former-commit-id: 36572c3681
 2014-04-28 14:41:41 -05:00
Dave Hladky
c4212d6252 Issue #2940 Better error message for bad XMRG config in FFMP 
Former-commit-id: a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly 82be445e97 [formerly 2f4c0cd364 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]
Former-commit-id: 82be445e97
Former-commit-id: 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a]
Former-commit-id: 0ea0313cb8
 2014-04-28 11:04:35 -05:00
Steve Harris
1e989b1639 Omaha #3085 - Removed ufcore and ufcore-foss plugins 
Former-commit-id: 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 491b768204 [formerly a89621797d [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]
Former-commit-id: 491b768204
Former-commit-id: 85fa8d3f761f8d88d8e3d58caaba110e85d03595 [formerly 23e542e36b]
Former-commit-id: 558686f2fd
 2014-04-28 09:59:23 -05:00