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

5721 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brian Clements
0fbb5dc22a Issue #3076 added clear all to shared display sessions 
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]
Former-commit-id: 8674841154
 2014-05-06 09:30:07 -05:00
Nate Jensen
7cec722176 Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1 
Former-commit-id: c07a4c0069 [formerly db4fc0c4d2] [formerly 7d11e31b06] [formerly 596b5268d0 [formerly 7d11e31b06 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]
Former-commit-id: 596b5268d0
Former-commit-id: a4dee39f1add48e8c979182cd8f3f9ee04f952a5 [formerly bad26fdd7d]
Former-commit-id: bff03681a4
 2014-05-05 16:58:44 -05:00
Lee Venable
a8864844bb Issue #3109 - removed code that sets the Cave cursor. 
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: a57f0e338d [formerly 550668cbf7] [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: 99c525ad61eed1107476ce09523a10adfb16b511 [formerly 631a8d3cb1]
Former-commit-id: a092fd45dc
 2014-05-05 16:13:31 -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
Brian Clements
89fbf5f2bc Omaha #3061 only shared display capable clients get payload in invite 
Former-commit-id: 46b526473d [formerly dec5159216] [formerly 1502354f87] [formerly c61e30a422 [formerly 1502354f87 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 0a74f9c3259a55c56b2763cb02f26aae56e52755 [formerly 58f45fa7d0]
Former-commit-id: 9d25e9dcb8
 2014-05-05 15:29:06 -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
Nate Jensen
dcbedcbbc0 Merge "Issue #2956 more safety checks" into omaha_14.3.1 
Former-commit-id: a2607513bf [formerly f233d104d7] [formerly e9b3041170] [formerly d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: bd03fd08ecba17789cb90578917e1a4d7b88234a [formerly 8ee8937daf]
Former-commit-id: e8e971d434
 2014-05-05 09:45:11 -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
Richard Peter
0dda5a7c40 Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1 
Former-commit-id: 39467f210d [formerly 6bb353a05d] [formerly 51ba60d62b] [formerly 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]
Former-commit-id: 24f1c7b385
Former-commit-id: f5cd6aa1d45daa261c05965acd4769b63f5b3227 [formerly 1f7e076018]
Former-commit-id: 592e9171e1
 2014-05-02 10:05:29 -05:00
Richard Peter
4537e1276f Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1 
Former-commit-id: aeebf17373 [formerly 4e1bc16d70] [formerly 478cedd3a3] [formerly d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]
Former-commit-id: d4a138c534
Former-commit-id: ca0cfca3ed26cc4f000b74ac3d1f482f80140ed2 [formerly 1b7dd13525]
Former-commit-id: 160ce06137
 2014-05-02 09:50:40 -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
Richard Peter
2d597d61ab Issue #2854: Pack commons.lang for alertviz 
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 36d579c206 [formerly 1738b065b8] [formerly df3f1c4df6e2e8ea052fc3bf1b494b77edaedd01 [formerly a9b088146c]] [formerly bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]
Former-commit-id: bcd87195ee
Former-commit-id: 3fa1d18ae07b1ff8c4ffc4b83cd39952d11ded1d [formerly e1a2767f8f]
Former-commit-id: 926cd5f6d1
 2014-05-01 16:30:21 -05:00
Nate Jensen
9f08442039 Issue #2956 more safety checks 
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

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

Former-commit-id: 8d5ec4bb04 [formerly 3222914fde] [formerly 137818d03a] [formerly a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]
Former-commit-id: a73a310709
Former-commit-id: 61860d514df7120cc0bb0d8c083c115b3944aa73 [formerly 84dbedcff5]
Former-commit-id: b245e49d53
 2014-05-01 16:20:35 -05:00
Richard Peter
3297632b5d Issue #2854: Fix features. 
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: c7f5b23633 [formerly 25fd0e03f4] [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]
Former-commit-id: a4fb460e17
Former-commit-id: 38c78f7ac3ebdff8190b01723125c22a2058c85f [formerly c3c7ebb146]
Former-commit-id: f364f02f58
 2014-05-01 14:47:41 -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
8ae67e0d7f Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1 
Former-commit-id: b911f3e9b5 [formerly 1d157a16e3] [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 793328ce1c59c6fb48e922f66fcf2785e57bd487 [formerly e5eb1ab87e]
Former-commit-id: 037fe502d7
 2014-05-01 12:06:13 -05:00
Nate Jensen
c7610d0a3a Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1 
Former-commit-id: 97ea9dd708 [formerly 03b412c136] [formerly b28e5291d6] [formerly 244183db25 [formerly b28e5291d6 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]
Former-commit-id: 244183db25
Former-commit-id: d915e1041f3582440bb6f108021a9ffb531db781 [formerly 02059a512f]
Former-commit-id: 59623a97d0
 2014-05-01 11:21:54 -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
Dave Hladky
76c963b690 Issue #2992 Missed perl script 
Former-commit-id: f844c98853 [formerly 9a43ac36e6] [formerly 23433f628d] [formerly 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]
Former-commit-id: 904a608495
Former-commit-id: d66d8ebcef31eae8a5b0eefbe03af2d980e7f476 [formerly dbe4f68100]
Former-commit-id: bc4067c5d8
 2014-05-01 08:48:38 -05:00
Greg Armendariz
72793f2c24 Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1 
Former-commit-id: fece69eb09 [formerly 2994753636] [formerly 1e48076fb2] [formerly 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]
Former-commit-id: 58eaf444bd
Former-commit-id: ac1328cf7911a36196114732a8d00e8c762670a8 [formerly e1d91769fe]
Former-commit-id: 9f6eff005b
 2014-04-30 19:34:43 -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
Greg Armendariz
14b88d1dfd Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1 
Former-commit-id: b26f22f40d [formerly 95612236c5] [formerly 4d76163f10] [formerly 0354c9ad26 [formerly 4d76163f10 [formerly a93dfbbea0f33fae158cbb1339293334dec0a2c3]]]
Former-commit-id: 0354c9ad26
Former-commit-id: 5c1c755203c9c48c97d59a8a8fb8e6bca26926d5 [formerly 8b477dfc39]
Former-commit-id: c5760afb93
 2014-04-30 17:42:26 -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
Brian Clements
fc004a1db8 Issue #3089 fixed init.d script for collaboration dataserver RPM 
Former-commit-id: b3825b8032 [formerly e49d150332] [formerly 57f5ac701c] [formerly 1273846844 [formerly 57f5ac701c [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]]
Former-commit-id: 1273846844
Former-commit-id: dfe08f3eccdfa7204ab4aa439b2e37da97873ec7 [formerly a074b27951]
Former-commit-id: 9fc8796247
 2014-04-30 16:41:14 -05:00
Greg Armendariz
b069ee1ea3 Issue #2571 - Update maps.db snapshot and lake shapefile 
Former-commit-id: 239ce27244 [formerly 4c245da2a2] [formerly 4981b6a438] [formerly 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]]
Former-commit-id: 2d38c69ac1
Former-commit-id: 9e10990e64fcefc2ae835d7e6bae34e0905df35d [formerly 784235ab9f]
Former-commit-id: 94a55e5c31
 2014-04-30 15:42:42 -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
Richard Peter
307a149bea Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA 
Former-commit-id: 9e9ff43e16 [formerly 37a5292083] [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly f80e16d0c9 [formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: e3670bef923e89a1f5a7985176c384fe933c5958 [formerly 8ddc4eaffd]
Former-commit-id: f2d07ce35c
 2014-04-30 14:49:24 -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
Steve Harris
2f14898fec Omaha #3085 - moved com.raytheon.uf.viz.application and com.raytheon.uf.viz.application.feature to core 
Former-commit-id: 5845200789 [formerly 31f17bbb51] [formerly b7272b3248] [formerly 1eb121595d [formerly b7272b3248 [formerly 839a926dca01566419409138e9810f14e0e46b84]]]
Former-commit-id: 1eb121595d
Former-commit-id: c0924bd1b1572c832d85f3f1e15e466728edca26 [formerly 88a7777e79]
Former-commit-id: a659f2bf1d
 2014-04-30 13:59:33 -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
Richard Peter
d25ceb8da7 Issue #2854: Reorganize deltaScripts 
Former-commit-id: 46a94c88cd [formerly 09f41a6b31] [formerly 56745c942e] [formerly c8e373c098 [formerly 56745c942e [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]
Former-commit-id: c8e373c098
Former-commit-id: d5d0bc708d2a84d887a8b1401a4d596af0a188e3 [formerly e1721cad00]
Former-commit-id: a526600e3e
 2014-04-30 13:03:44 -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