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

2267 commits

Author SHA1 Message Date
Mike Duff
d09c635f80 Issue #2876 - removed import, changed jave version to 1.6 
Change-Id: Ia2806bff0b7042983c6dd7498c76a66c8c277a29

Former-commit-id: f6db852657 [formerly 63b9452c3f] [formerly f6db852657 [formerly 63b9452c3f] [formerly 419293a946 [formerly 8ce84ce824a852ad08e70fd272d2bc62b02ef292]]]
Former-commit-id: 419293a946
Former-commit-id: e005e6fb55 [formerly 60dd115d66]
Former-commit-id: 33a649c9de
 2014-03-10 12:49:27 -05:00
Mike Duff
f46a80e936 Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: bcd4b1490d [formerly 6be6181108] [formerly bcd4b1490d [formerly 6be6181108] [formerly 2fc712e1e8 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: 1eefba01ab [formerly 861013ad86]
Former-commit-id: 75218fb1aa
 2014-03-10 09:45:04 -05:00
Mike Duff
958290f64a Issue #2876 - Fix manifest file. 
Change-Id: If02046664c5d60f2f3c30cbf7f502189eb5874f9

Former-commit-id: 6ace7b364d [formerly 618dbec585] [formerly 6ace7b364d [formerly 618dbec585] [formerly 4cefac4658 [formerly 934b0c91d8f2bb8625aaae7851e4f0202e5b1f48]]]
Former-commit-id: 4cefac4658
Former-commit-id: 1d2fd0a6d2 [formerly 9051daf05f]
Former-commit-id: b818ea8d29
 2014-03-07 15:41:24 -06:00
Richard Peter
a44a6fbe4c Merge "Issue #2876 - Pluginize NDM review comments" into development 
Former-commit-id: 946c8fcf24 [formerly 4568108a3c] [formerly 946c8fcf24 [formerly 4568108a3c] [formerly c9dfa75d1c [formerly 296f8f835cbc87783f0f50278d2148f756cf6296]]]
Former-commit-id: c9dfa75d1c
Former-commit-id: 6845ca74b3 [formerly 29250be003]
Former-commit-id: 338f27beac
 2014-03-07 13:04:14 -06:00
Mike Duff
8c8a5f739f Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 7fd9cc40c7 [formerly 944fca16b8] [formerly 7fd9cc40c7 [formerly 944fca16b8] [formerly c388cb839b [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]
Former-commit-id: c388cb839b
Former-commit-id: 12ea05cffc [formerly 7bb9ada00d]
Former-commit-id: efbc53e61f
 2014-03-07 12:47:46 -06:00
Steve Harris
d65c768373 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd] [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 972fa3bee6 [formerly 7fbbc1e118]
Former-commit-id: 7f932399b9
 2014-03-06 18:31:10 -06:00
Brad Gonzales
650897cef1 Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7. 
Amend: changed to use set method.

Change-Id: I39cb36937fb9faafe24f2e87a897ae78c7c660e1

Former-commit-id: cb89c806c8 [formerly 08ee82c39a] [formerly cb89c806c8 [formerly 08ee82c39a] [formerly b535c90a23 [formerly 5c5eb6f348627f65afc527205c5bc1f7b7463ddb]]]
Former-commit-id: b535c90a23
Former-commit-id: 48b19f3833 [formerly e54ab69bf7]
Former-commit-id: f122bb7ac9
 2014-03-06 10:38:30 -06:00
Nate Jensen
df3a5c02e5 Issue #2627 shorten wrapper arg for retaining failed data 
Change-Id: Ib02246cef47d3a19caa61baedbc5538c07d073d7

Former-commit-id: ad7d5a745b [formerly c07f2e829d] [formerly ad7d5a745b [formerly c07f2e829d] [formerly 0dc5dfae82 [formerly 54578116023ebc7a6474a3297d419c2777d31e17]]]
Former-commit-id: 0dc5dfae82
Former-commit-id: d3a10ba1e6 [formerly 08ac542f2f]
Former-commit-id: 838a3e9dd8
 2014-03-05 09:04:10 -06:00
Richard Peter
ec31c46b9a Merge "Issue #2627 harden static initialization on edex main thread" into development 
Former-commit-id: fdba3b3099 [formerly 7c02ab6b66] [formerly fdba3b3099 [formerly 7c02ab6b66] [formerly 6b08aaf55c [formerly 82f20a96a82ef7f047f716662d319e522ee1c394]]]
Former-commit-id: 6b08aaf55c
Former-commit-id: f6e1fc89de [formerly c12b4fb4ea]
Former-commit-id: 0041d4c2d3
 2014-03-04 17:54:09 -06:00
Nate Jensen
682291237e Issue #2627 harden static initialization on edex main thread 
Change-Id: Icff0a2fd60bec882ac96fc218deb88b16eaeaaff

Former-commit-id: 99254281af [formerly b989b7240c] [formerly 99254281af [formerly b989b7240c] [formerly 660998ac72 [formerly bb838950a2979703ae6ab8f486fc4460789c3f1b]]]
Former-commit-id: 660998ac72
Former-commit-id: fadd59b36d [formerly 81a6675a14]
Former-commit-id: 6df4547b41
 2014-03-04 17:19:24 -06:00
Brian Clements
8d9da2b63e Issue #2756 added security toggle to collaboration 
security on HTTP server can be disabled for legacy clients from openfire settings
added xmpp connection retry to http server so servers can be started in any order


Former-commit-id: cd0e1e271a [formerly 7b085f62de] [formerly cd0e1e271a [formerly 7b085f62de] [formerly f44f1212dd [formerly 1e52606fe709f2cf27f835363ca5ab2bf6ada912]]]
Former-commit-id: f44f1212dd
Former-commit-id: c446513912 [formerly 0790849f03]
Former-commit-id: 8b1a00fb2f
 2014-03-04 16:02:25 -06:00
Benjamin Phillippe
d0999c05e8 Issue #2769: Added batching to registry sync 
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7bf51d507e [formerly 59323be87e] [formerly 7bf51d507e [formerly 59323be87e] [formerly 9fd35140f0 [formerly a265027cacde7690171d30455227c5a843e0d397]]]
Former-commit-id: 9fd35140f0
Former-commit-id: daeb8bec5f [formerly cd04d7dcbe]
Former-commit-id: 6b6a5b0e4f
 2014-03-04 13:31:41 -06:00
Richard Peter
0219b80555 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1 
Former-commit-id: 5280398130 [formerly aa8e1a3625] [formerly 5280398130 [formerly aa8e1a3625] [formerly f9bd27c061 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]
Former-commit-id: f9bd27c061
Former-commit-id: a81447f434 [formerly 3b800bcc09]
Former-commit-id: 9ce19b16cc
 2014-03-04 12:54:23 -06:00
Richard Peter
13bad4e99e Merge "Issue #2791 Use Data Source for all grid data access." into development 
Former-commit-id: 090829f75e [formerly f87a913017] [formerly 090829f75e [formerly f87a913017] [formerly 873fa00fac [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]
Former-commit-id: 873fa00fac
Former-commit-id: 3a96d0758a [formerly 2a5b0fb3ba]
Former-commit-id: dfa3f06e8e
 2014-03-04 12:43:17 -06:00
Nate Jensen
3baaa6e941 Merge "Issue #2870 log product id when generic packet fails to find corresponding packet class" into development 
Former-commit-id: d0e405aac9 [formerly ea0248ff96] [formerly d0e405aac9 [formerly ea0248ff96] [formerly 4547cbcfea [formerly 51797cd167b76be2b3ab55b6c7632e0039d7145c]]]
Former-commit-id: 4547cbcfea
Former-commit-id: 2dba0228c2 [formerly 471492201c]
Former-commit-id: f088ff8a4e
 2014-03-04 12:39:13 -06:00
Richard Peter
351998e947 Merge "Issue #2829 - fix the spelling of 'coordinate' in GfeUtil" into development 
Former-commit-id: 650f794329 [formerly bd94f6bf99] [formerly 650f794329 [formerly bd94f6bf99] [formerly 4fbb2f0059 [formerly 12458982fe4c43a9b61e9194246c80527d02da6d]]]
Former-commit-id: 4fbb2f0059
Former-commit-id: 58f05e288f [formerly 363e9e294f]
Former-commit-id: 2aedbc961d
 2014-03-04 12:38:30 -06:00
Richard Peter
588b95db5c Merge "Issue #2713 Update path for MADIS-Harvester.xml Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788" into development 
Former-commit-id: 15c9066986 [formerly bc8b838a41] [formerly 15c9066986 [formerly bc8b838a41] [formerly 178bfc0b79 [formerly 234b6b7010e6eb044fbf1fc4728a58dc5cb84c8e]]]
Former-commit-id: 178bfc0b79
Former-commit-id: b3c2df969a [formerly e350b5bae1]
Former-commit-id: 000c577656
 2014-03-04 12:38:07 -06:00
Nate Jensen
c183d7bd51 Issue #2870 log product id when generic packet fails to find 
corresponding packet class

Change-Id: I839e622b063eae4e707f9abc31f010ef795bc9f1

Former-commit-id: ef05ddc408 [formerly a1caeae552] [formerly ef05ddc408 [formerly a1caeae552] [formerly 6818ea9c23 [formerly 0d01b387e454f276d0ebdecfb14ad294b67a55b7]]]
Former-commit-id: 6818ea9c23
Former-commit-id: b095d91c92 [formerly 552a2af0b9]
Former-commit-id: 6139ef3461
 2014-03-04 11:52:34 -06:00
Nate Jensen
0ee8c9e58a Merge "Issue #2673 Add ability to query only ref times to Data Access Layer." into development 
Former-commit-id: 92e8393915 [formerly 3afd14e1eb] [formerly 92e8393915 [formerly 3afd14e1eb] [formerly 9b94434a78 [formerly eb07c44098abe7f72b578e24a4a7ea7e92dc655c]]]
Former-commit-id: 9b94434a78
Former-commit-id: c58926d598 [formerly 93da8c2075]
Former-commit-id: cd17f7b63f
 2014-03-04 11:42:51 -06:00
Nate Jensen
5132a0f8cb Issue #2813 fix subscription package names 
Former-commit-id: af76b58b27 [formerly 0ec866f1d2] [formerly af76b58b27 [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]
Former-commit-id: d7d0803ee9
Former-commit-id: 78b2b50370 [formerly df44f8246e]
Former-commit-id: e22b486f25
 2014-03-04 10:53:58 -06:00
Bryan Kowal
34c1a79ec8 Issue #2829 - fix the spelling of 'coordinate' in GfeUtil 
Former-commit-id: 83471b4900 [formerly e6ae710871] [formerly 83471b4900 [formerly e6ae710871] [formerly 56e79f2179 [formerly a06c8efe8b316359cfb0d4feaa7ea8f36e4122e7]]]
Former-commit-id: 56e79f2179
Former-commit-id: 3c42fa358e [formerly eda1dc4142]
Former-commit-id: 832aca28ee
 2014-03-03 17:45:09 -06:00
Ben Steffensmeier
9d757d79e2 Issue #2673 Add ability to query only ref times to Data Access Layer. 
Former-commit-id: 2230164e1f [formerly 641d4acd15] [formerly 2230164e1f [formerly 641d4acd15] [formerly 9fcb730858 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]]
Former-commit-id: 9fcb730858
Former-commit-id: b9b5068329 [formerly 1d2d1e20f5]
Former-commit-id: 4f01f96cf4
 2014-03-03 17:44:11 -06:00
Brian Clements
861716341a Issue #2756 install script for collaboration http server 
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: a738448825 [formerly 3b6121b9fa] [formerly a738448825 [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 75c179b06f [formerly a44c5f8d48]
Former-commit-id: a36f303646
 2014-03-03 14:07:01 -06:00
Benjamin Phillippe
719b90e1e7 Issue #2769: Registry database deadlocking fixes/performance improvements 
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: d339e232f4 [formerly ed050996a2] [formerly d339e232f4 [formerly ed050996a2] [formerly 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 603e433054 [formerly 15a5e7c4a4]
Former-commit-id: 090dbe3918
 2014-03-03 10:57:16 -06:00
Dave Hladky
f03f0f9092 Issue #2713 Update path for MADIS-Harvester.xml 
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: fb2cfff4d2 [formerly 92d677141f] [formerly fb2cfff4d2 [formerly 92d677141f] [formerly d40107e530 [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: dd3501ae41 [formerly 06d41ccafa]
Former-commit-id: ee818ff96b
 2014-03-03 08:46:37 -06:00
Ben Steffensmeier
a19e960342 Issue #2791 Use Data Source for all grid data access. 
Former-commit-id: 02cef4ddaa [formerly 6fa441396f] [formerly 02cef4ddaa [formerly 6fa441396f] [formerly 05770129c1 [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: 72b117cf42 [formerly 4094ef6170]
Former-commit-id: c6f1b922b2
 2014-02-28 17:06:33 -06:00
Brian Clements
f00f8eb1d9 Issue #2756 implemented HTTP public key auth scheme 
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: 9d0b02e0a4 [formerly ce24bd1018] [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: f56cbac9fb [formerly edd72cbde4]
Former-commit-id: 6d4abdc37c
 2014-02-28 16:15:17 -06:00
Nate Jensen
da3ac6ab07 Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development 
Former-commit-id: 2557ffe8c3 [formerly 47255ea9ad] [formerly 2557ffe8c3 [formerly 47255ea9ad] [formerly 45e8290111 [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]
Former-commit-id: 45e8290111
Former-commit-id: 988249c4d8 [formerly 6d41fc9fd2]
Former-commit-id: aa28135a16
 2014-02-28 14:02:33 -06:00
Nate Jensen
58b4cdebad Merge "Issue #2638 wrote java utility for generating list of data URIs and their field names" into development 
Former-commit-id: 420a30cddc [formerly 135bb70a38] [formerly 420a30cddc [formerly 135bb70a38] [formerly f21e9eb889 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]
Former-commit-id: f21e9eb889
Former-commit-id: 403a8611c5 [formerly 67a7197f59]
Former-commit-id: 636cb1b4c1
 2014-02-28 14:02:22 -06:00
Ben Steffensmeier
118991ec22 Issue #2791 Switch contouring to use DataSource for data access. 
Former-commit-id: fbf6371c8e [formerly 4b7f3b2a5b] [formerly fbf6371c8e [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 278ef9f0d4 [formerly a7787a7ff2]
Former-commit-id: c0c017e451
 2014-02-28 11:28:02 -06:00
Dave Hladky
5d37ad762d Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception 
Former-commit-id: 8bddfa77ce [formerly fd85324076] [formerly 8bddfa77ce [formerly fd85324076] [formerly 7399b10778 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]
Former-commit-id: 7399b10778
Former-commit-id: d9a0f99bb5 [formerly 62156a1ba5]
Former-commit-id: b5b9e295fb
 2014-02-28 11:07:15 -06:00
Richard Peter
1103fb5eff Merge "Issue #2838 Archive binary feeder creation." into development 
Former-commit-id: 944ea7936c [formerly 952669fc38] [formerly 944ea7936c [formerly 952669fc38] [formerly 475557d4c8 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]
Former-commit-id: 475557d4c8
Former-commit-id: 67a6ef4bd8 [formerly 1d51a87e86]
Former-commit-id: db1e7f8f48
 2014-02-27 17:36:56 -06:00
Nate Jensen
b051dab483 Issue #2638 wrote java utility for generating list of data URIs and 
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: 5b2f17826e [formerly 7fb97ffad0] [formerly 5b2f17826e [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]
Former-commit-id: 39e167fc76
Former-commit-id: f3de646859 [formerly 8bf8302811]
Former-commit-id: f325498ec3
 2014-02-27 17:14:32 -06:00
Nate Jensen
d286ba624c Merge "Issue #2823 deploy install now defaults to x86_64." into development 
Former-commit-id: 82817c2cbd [formerly f7b4c75f13] [formerly 82817c2cbd [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: c439ecb2a4 [formerly 35ea5b9eb2]
Former-commit-id: 8b7fecdd99
 2014-02-27 16:44:26 -06:00
Brad Gonzales
562245f2af Issue #2823 deploy install now defaults to x86_64. 
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: 73ed932660 [formerly 2135663934] [formerly 73ed932660 [formerly 2135663934] [formerly 45160326aa [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]
Former-commit-id: 45160326aa
Former-commit-id: 003f028176 [formerly 90e6558083]
Former-commit-id: b6dbc7f605
 2014-02-27 16:34:53 -06:00
Richard Peter
5fab51d41b Merge branch 'omaha_14.2.1' (14.2.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
 2014-02-27 15:18:26 -06:00
Roger Ferrel
1b29ee087f Issue #2838 Archive binary feeder creation. 
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c

Former-commit-id: ac03675880 [formerly 9b7715e5e0] [formerly ac03675880 [formerly 9b7715e5e0] [formerly 995d962a66 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]
Former-commit-id: 995d962a66
Former-commit-id: dae52ad3a0 [formerly 03843090fa]
Former-commit-id: 40369d124f
 2014-02-27 07:45:40 -06:00
Ben Steffensmeier
0dd62678f2 Issue #2711 Use level factory more. 
Former-commit-id: 1069ef8d67 [formerly d7a3ae4fdb] [formerly 1069ef8d67 [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 29f9a87085 [formerly f45646ae91]
Former-commit-id: 3a5f655ea4
 2014-02-26 15:10:40 -06:00
Slav Korolev
9dd91d63c1 Issue #2652. Fixed issue with edex-text-ingest log. 
Former-commit-id: a34b1196b7 [formerly 5087a0154d] [formerly a34b1196b7 [formerly 5087a0154d] [formerly bfa84e65ec [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]
Former-commit-id: bfa84e65ec
Former-commit-id: 0566c86a6c [formerly 40b4bf6e8e]
Former-commit-id: 5e494af996
 2014-02-25 15:23:22 -05:00
Richard Peter
e28b3bb5b9 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1 
Former-commit-id: 90b48e0393 [formerly 3735cd3ffe] [formerly 90b48e0393 [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: f803d557c2 [formerly 66b271a550]
Former-commit-id: e78e5a15b9
 2014-02-25 12:34:38 -06:00
Brad Gonzales
aa2d8b76a1 Issue #2386 fixed spatial overlap rule application. 
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: b6e2ce4b74 [formerly 783afb1585] [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: f57f472f6a [formerly 5ce1939d01]
Former-commit-id: f4513d0e64
 2014-02-25 09:22:08 -06:00
Ron Anderson
3c673caec2 Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
 2014-02-24 13:46:48 -06:00
Nate Jensen
da2a363550 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1 
Former-commit-id: 98a6101cd3 [formerly 2111109ce2] [formerly 98a6101cd3 [formerly 2111109ce2] [formerly b1586f8603 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: d6e9cb73f5 [formerly bf8bb95f51]
Former-commit-id: 6979321635
 2014-02-24 13:25:35 -06:00
Dave Hladky
e030ac65b2 Issue #2469 Fixed default rules implementation 
Former-commit-id: f9c6a396f0 [formerly 1d256bfcee] [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890 [formerly ff5a5961db]
Former-commit-id: 8a924bcc2c
 2014-02-24 13:06:52 -06:00
Ben Steffensmeier
831bb0b021 Issue #2762 Use UCUM to format units so IRPixel formats correctly. 
Former-commit-id: f7c48b24bb [formerly 9e5f7d90a0] [formerly f7c48b24bb [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 3c7e578000 [formerly a510abdb22]
Former-commit-id: 358e7d3b1d
 2014-02-24 10:27:30 -06:00
Dave Hladky
c4e70210fd Issue #2636 Try Catch around the MaintTask 
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 542ba7e504 [formerly c4bed432da] [formerly 542ba7e504 [formerly c4bed432da] [formerly 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: 3b9f80d03e [formerly 445b55f796]
Former-commit-id: c545368839
 2014-02-21 16:01:20 -06:00
Brad Gonzales
7dddf974b8 Issue #2828 Added purge cron to Central SBN Simulator. 
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: 290a381715 [formerly 12e22752c2] [formerly 290a381715 [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: bef4e8ee53 [formerly 08c4d1afea]
Former-commit-id: 675477ed66
 2014-02-20 16:31:16 -06:00
Ron Anderson
42048983ce Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated. 
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: e4aeaa79f1 [formerly 6a7e4a147d] [formerly e4aeaa79f1 [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 1dcaf2b790 [formerly d63ad1b1de]
Former-commit-id: 2eb6cb45e3
 2014-02-20 12:32:31 -06:00
Ron Anderson
a5c6428787 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development 
Former-commit-id: 810ad594a1 [formerly c13942140a] [formerly 810ad594a1 [formerly c13942140a] [formerly 6f4a63000d [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: ee5658f9d9 [formerly c07544b904]
Former-commit-id: 32b8cc8a8e
 2014-02-20 09:55:56 -06:00
Ron Anderson
30d9fec3ae Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used 
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 2bfa521e7d [formerly 6b6aa14e59] [formerly 2bfa521e7d [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]
Former-commit-id: 08a1be844d
Former-commit-id: 0ee3625c50 [formerly 1571b9a8eb]
Former-commit-id: 7897be61e2
 2014-02-20 09:34:18 -06:00