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

3142 commits

Author SHA1 Message Date
Richard Peter
29a58d9c6a Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1 
Former-commit-id: 02d94c61fb [formerly 7ae2b1299f] [formerly 02d94c61fb [formerly 7ae2b1299f] [formerly f6d1e1012e [formerly 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0]]]
Former-commit-id: f6d1e1012e
Former-commit-id: 72200f0892 [formerly 56d0cd836f]
Former-commit-id: e7bc7051df
 2014-05-14 16:25:16 -05:00
Ben Steffensmeier
1ac0aeacc5 Omaha #2697 Collaboration will no longer use local maps. 
Former-commit-id: 270e8805cc [formerly 3e23857dcc] [formerly 270e8805cc [formerly 3e23857dcc] [formerly 1db137a21e [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]
Former-commit-id: 1db137a21e
Former-commit-id: fc54a7f697 [formerly 759b1460d4]
Former-commit-id: e8813c2f24
 2014-05-14 13:53:29 -05:00
Brian Clements
7473191ba6 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37] [formerly 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: abd29bf492 [formerly ee9757ea39]
Former-commit-id: e9ee0bcbde
 2014-05-14 13:45:09 -05:00
Nate Jensen
5da8849cf5 Omaha #3133 remove unused uf.common.cache from alertviz feature 
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832

Former-commit-id: bab916f2be [formerly 68c8238275] [formerly bab916f2be [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]]]
Former-commit-id: 5eaa5d7b0e
Former-commit-id: e8661182d0 [formerly 2a6d25cf41]
Former-commit-id: 437d400966
 2014-05-13 17:52:12 -05:00
Nate Jensen
824c2f805d Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt 
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851

Former-commit-id: e464500dfc [formerly 07426ce408] [formerly e464500dfc [formerly 07426ce408] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]
Former-commit-id: 174fae77d1
Former-commit-id: c31080d705 [formerly ea7b123eef]
Former-commit-id: 4a18f1e24b
 2014-05-13 13:12:54 -05:00
Nate Jensen
dc2ac6e07b Omaha #3133 remove edex dependencies from common.monitor plugin 
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3

Former-commit-id: 88535c69f5 [formerly cc86f19bad] [formerly 88535c69f5 [formerly cc86f19bad] [formerly b05630b171 [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: 5d099a3b4b [formerly 3aff81313f]
Former-commit-id: 363b019ceb
 2014-05-12 16:46:06 -05:00
Steve Harris
ae3bc184ce Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	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: b3bc71c8a4 [formerly 652fb19bc4] [formerly b3bc71c8a4 [formerly 652fb19bc4] [formerly 6964df0664 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 77b2da7a4f [formerly 661eceea83]
Former-commit-id: d33fbe7c31
 2014-05-12 15:05:43 -05:00
Nate Jensen
8b8cb81410 Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1 
Former-commit-id: 650edc41f3 [formerly eff5a8e32f] [formerly 650edc41f3 [formerly eff5a8e32f] [formerly ab064743f4 [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]
Former-commit-id: ab064743f4
Former-commit-id: c57623dc52 [formerly 7afd18662d]
Former-commit-id: 25216d1a2f
 2014-05-12 11:56:34 -05:00
Bryan Kowal
1578a42992 Issue #3026 - remove unnecessary hpe ffmp dependency 
Former-commit-id: 8f16f25cd7 [formerly 6e6a6a73ee] [formerly 8f16f25cd7 [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]
Former-commit-id: faa6b09ac9
Former-commit-id: 9153d61b90 [formerly 5f5987f57b]
Former-commit-id: 31d2290415
 2014-05-12 11:46:35 -05:00
Nate Jensen
064894fe59 Omaha #3075 updates for pydev 3.4.1 
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: 5fcc126e57 [formerly e6569b4a7d] [formerly 5fcc126e57 [formerly e6569b4a7d] [formerly bb32858c04 [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]
Former-commit-id: bb32858c04
Former-commit-id: 651ce74777 [formerly 5d08184312]
Former-commit-id: 9713ae6bf1
 2014-05-09 16:45:39 -05:00
Brian Clements
415ff47d51 Omaha #3107 added timeout handling logic for leader transfer verification 
Former-commit-id: 26d206f780 [formerly 08a406ff18] [formerly 26d206f780 [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 98e74677fd [formerly 3d3d7f04bb]
Former-commit-id: 5e739b598c
 2014-05-09 15:43:46 -05:00
Lee Venable
fb58021364 Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1 
Former-commit-id: cd5956d21a [formerly 364f0d877a] [formerly cd5956d21a [formerly 364f0d877a] [formerly e3c6407be3 [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]
Former-commit-id: e3c6407be3
Former-commit-id: a46987ef36 [formerly b06e8e6e3e]
Former-commit-id: d23ba206c9
 2014-05-09 11:14:51 -05:00
Mike Duff
e4e8e0fe8e Issue #3145 - Fix Scan threat labels, dispose font 
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d

Former-commit-id: 158fb46b9f [formerly 03356dd554] [formerly 158fb46b9f [formerly 03356dd554] [formerly a81569849b [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]
Former-commit-id: a81569849b
Former-commit-id: 456038d161 [formerly 4ec26b6e31]
Former-commit-id: 32f6ad40ec
 2014-05-09 10:32:04 -05:00
Nate Jensen
db6d756ffd Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1 
Former-commit-id: d0d20849b6 [formerly 575360192a] [formerly d0d20849b6 [formerly 575360192a] [formerly e8c4279d10 [formerly 25e500435693940e378df086739fce8eefdba3bb]]]
Former-commit-id: e8c4279d10
Former-commit-id: e0365dd4a3 [formerly 95ca77688a]
Former-commit-id: 191d3a0d06
 2014-05-09 09:53:25 -05:00
Mike Duff
c984973464 Issue #3026 - feature.xml fix 
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794

Former-commit-id: 7e996909d1 [formerly 78f2a26903] [formerly 7e996909d1 [formerly 78f2a26903] [formerly 038b2b7500 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]
Former-commit-id: 038b2b7500
Former-commit-id: b73e635162 [formerly c7f5379b78]
Former-commit-id: 25638a5b40
 2014-05-09 09:27:10 -05:00
Ben Steffensmeier
f0c4cc03a0 Issue #2920 Fix default color of BOXED text. 
Former-commit-id: 60479824d1 [formerly 87ea43cf0d] [formerly 60479824d1 [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: 082a5c515d [formerly 199a2df79e]
Former-commit-id: 2b4d783fd7
 2014-05-08 18:18:08 -05:00
Mike Duff
718fc22e25 Issue #3026 - NullPointer fix, test classpath fix 
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: a6e0ed67d1 [formerly b23473ee8a] [formerly a6e0ed67d1 [formerly b23473ee8a] [formerly 335c02d2c6 [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 0df3f51c87 [formerly 16a973372e]
Former-commit-id: 1dc95cf8de
 2014-05-08 15:02:54 -05:00
Lee Venable
70e31865be Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1 
Former-commit-id: 319073a795 [formerly 92517d3ca2] [formerly 319073a795 [formerly 92517d3ca2] [formerly 1496955e44 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]
Former-commit-id: 1496955e44
Former-commit-id: 0a45b07910 [formerly 0b25428b04]
Former-commit-id: 0075d2a450
 2014-05-08 14:47:03 -05:00
Mike Duff
4adf657556 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays 
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 0456fd0597 [formerly 8498235fd8] [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: f49192936a [formerly 70c8135fde]
Former-commit-id: 916d90ee64
 2014-05-08 14:36:54 -05:00
Nate Jensen
1dc7cc875e Issue #2060 fix auto-update errors with grids in non-map displays 
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de

Former-commit-id: 84f9cd1dc8 [formerly 3e3035b6f1] [formerly 84f9cd1dc8 [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]
Former-commit-id: ecc5c5849f
Former-commit-id: d2070f782b [formerly 6c55f4832c]
Former-commit-id: 93f71ec65c
 2014-05-08 14:08:06 -05:00
Steve Harris
77030c2fc3 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways. 
Former-commit-id: a804a071c0 [formerly ce2b030743] [formerly a804a071c0 [formerly ce2b030743] [formerly ff4a6b8122 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce [formerly 988ad59a0d]
Former-commit-id: 47991060bb
 2014-05-08 09:50:34 -05:00
Steve Harris
2b29fec8d6 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: ddd6e35478 [formerly e37e40ed19] [formerly ddd6e35478 [formerly e37e40ed19] [formerly b7a1bda98c [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2 [formerly 9591532ffd]
Former-commit-id: 049716e54d
 2014-05-07 16:01:53 -05:00
Nate Jensen
76750c319a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1 
Former-commit-id: daac0701fc [formerly d271dfb1a5] [formerly daac0701fc [formerly d271dfb1a5] [formerly 0f1cab916a [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 89621db281 [formerly 70f70371b1]
Former-commit-id: 12f88d14bf
 2014-05-06 17:09:56 -05:00
Ben Steffensmeier
b978e0fc1d Issue #3117 update satellite inventory for new sectors or elements. 
Former-commit-id: e70a6999b7 [formerly bbbf957ba8] [formerly e70a6999b7 [formerly bbbf957ba8] [formerly 70df0ee87e [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]
Former-commit-id: 70df0ee87e
Former-commit-id: 81916ecdb6 [formerly 945fe1db2f]
Former-commit-id: a39b05ac71
 2014-05-06 16:19:58 -05:00
Nate Jensen
3aa1481c98 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1 
Former-commit-id: 26f47e3b00 [formerly a583493711] [formerly 26f47e3b00 [formerly a583493711] [formerly 8f8ea5d014 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: 4f3570324a [formerly f1c48f10b1]
Former-commit-id: a20245a64d
 2014-05-06 16:15:41 -05:00
Nate Jensen
ad7a69f2e3 Issue #2060 fill in units on GridRecords created from URIs 
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
 2014-05-06 12:26:21 -05:00
Brian Clements
89f3a0a1d2 Issue #3076 added clear all to shared display sessions 
Former-commit-id: 729e717be1 [formerly f545c548cc] [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154 [formerly 5583c3903b]
Former-commit-id: 3a60b0db05
 2014-05-06 09:30:07 -05:00
Nate Jensen
c32e1bb9fe Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1 
Former-commit-id: db4fc0c4d2 [formerly 7d11e31b06] [formerly db4fc0c4d2 [formerly 7d11e31b06] [formerly 596b5268d0 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]
Former-commit-id: 596b5268d0
Former-commit-id: bff03681a4 [formerly bad26fdd7d]
Former-commit-id: 7e521c3e0b
 2014-05-05 16:58:44 -05:00
Lee Venable
46eb74e982 Issue #3109 - removed code that sets the Cave cursor. 
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: 550668cbf7 [formerly a6c2260dd1] [formerly 550668cbf7 [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a092fd45dc [formerly 631a8d3cb1]
Former-commit-id: f48d571cb6
 2014-05-05 16:13:31 -05:00
Steve Harris
b8b5300a9b 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: a8d3f4d885 [formerly 73ed3251bd] [formerly a8d3f4d885 [formerly 73ed3251bd] [formerly 83368e4b4e [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: ea24d1dadc [formerly caadbd3dd9]
Former-commit-id: 8cd5ed7a8e
 2014-05-05 16:04:09 -05:00
Brian Clements
9c7f4cd887 Omaha #3061 only shared display capable clients get payload in invite 
Former-commit-id: dec5159216 [formerly 1502354f87] [formerly dec5159216 [formerly 1502354f87] [formerly c61e30a422 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 9d25e9dcb8 [formerly 58f45fa7d0]
Former-commit-id: 1e3d29a3f3
 2014-05-05 15:29:06 -05:00
Dave Hladky
7e763a5a22 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: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
 2014-05-05 12:15:14 -05:00
Nate Jensen
3eaaf56f8e Merge "Issue #2956 more safety checks" into omaha_14.3.1 
Former-commit-id: f233d104d7 [formerly e9b3041170] [formerly f233d104d7 [formerly e9b3041170] [formerly d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434 [formerly 8ee8937daf]
Former-commit-id: e8b7cec960
 2014-05-05 09:45:11 -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
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
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
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
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
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
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
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
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
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
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
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