Commit graph

7586 commits

Author SHA1 Message Date
Ron Anderson
eb7f457ff9 Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2

Former-commit-id: f9c31d4237 [formerly 67443be919] [formerly bdc365d9c9] [formerly f9c31d4237 [formerly 67443be919] [formerly bdc365d9c9] [formerly 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]]
Former-commit-id: 346ea417ea
Former-commit-id: e5cd3a264a [formerly d3bce10b61] [formerly 3c9e861b0a7046daf174da682957bacc3fc53825 [formerly 48c2f0e843]]
Former-commit-id: c05eab7f23451112b73da73fa553ce8d7c9a5fc5 [formerly 30824e2e86]
Former-commit-id: 07ac450c18
2015-02-02 11:26:59 -06:00
Ron Anderson
022afe7518 Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a

Former-commit-id: ef1afbaa0c [formerly a7ab638203] [formerly 5c08543da0] [formerly ef1afbaa0c [formerly a7ab638203] [formerly 5c08543da0] [formerly 8a86832fb2 [formerly 5c08543da0 [formerly 99ae51d268e784461c0686a9d86d512049a501ac]]]]
Former-commit-id: 8a86832fb2
Former-commit-id: 6e7d00e190 [formerly a4c15c7bea] [formerly ff05c9f6924076e0f72cb56db3be2828275d381d [formerly a00e04a8d7]]
Former-commit-id: 1976e5f71abf4a24d0b6a62adb37f72e1cfd1bce [formerly 6d25f74625]
Former-commit-id: 7ab27329ff
2015-01-27 13:43:44 -06:00
Steve Harris
13a33f9b3e Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 70b40e76fb [formerly 0ac687b980] [formerly 1891ed5e5b] [formerly 70b40e76fb [formerly 0ac687b980] [formerly 1891ed5e5b] [formerly 82f2a146da [formerly 1891ed5e5b [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]]]
Former-commit-id: 82f2a146da
Former-commit-id: 0e805888ee [formerly 9f0e63961f] [formerly 345c46c6377f759a853827c13d522d612702ae2a [formerly fbc5eabb4f]]
Former-commit-id: 53eea3060db58e0a6f6df304734f1a98bccf14eb [formerly 73c5d6e51c]
Former-commit-id: fcf2003d09
2015-01-27 11:34:06 -06:00
Ron Anderson
fa0ca1f019 Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
Former-commit-id: f6c2df4507 [formerly 178ad50f20] [formerly d97b54018c] [formerly f6c2df4507 [formerly 178ad50f20] [formerly d97b54018c] [formerly 3a804c4be7 [formerly d97b54018c [formerly aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba]]]]
Former-commit-id: 3a804c4be7
Former-commit-id: ffcb8a1ba9 [formerly c6d1067f5e] [formerly b95ece248ba109135da956dac5b1978700f8c3a8 [formerly db93685468]]
Former-commit-id: af2b42bcf30af8985f932d4a527f0c0542389a06 [formerly f4727858a3]
Former-commit-id: 8ce529bb2d
2015-01-27 08:59:12 -06:00
Ron Anderson
d51975dff4 Omaha #4033 Fix logging in configureTextProducts
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030

Former-commit-id: 24c51738d6 [formerly 0dc17a57a2] [formerly 13bfa6e362] [formerly 24c51738d6 [formerly 0dc17a57a2] [formerly 13bfa6e362] [formerly 29930e52b3 [formerly 13bfa6e362 [formerly 1c1fefe7cc5cf26abf7c60254132ddeb22585b26]]]]
Former-commit-id: 29930e52b3
Former-commit-id: ad35c37255 [formerly 9fd0055fff] [formerly fed5ff215329c0150f6a9a48247e6d7f18e32445 [formerly 738c7462c8]]
Former-commit-id: f82a810704a9bfcb4dcc335fd5d55047b3d9c91f [formerly 658c547dca]
Former-commit-id: 2fb19954c4
2015-01-26 17:50:28 -06:00
Shawn.Hooper
4669314ed9 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]]
Former-commit-id: e84a037b2e
Former-commit-id: 7b6c631780 [formerly 9cc09ab18e] [formerly 0a8001cae9c65d8820ca558d173024196b8d92be [formerly 735893aab0]]
Former-commit-id: 5f80eb11138952b36683d3184c8f43ef25421f01 [formerly bbaebe4fc0]
Former-commit-id: a5b70920fd
2015-01-26 11:22:49 -05:00
Nate Jensen
2e2869bf7b Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]]
Former-commit-id: c4598baf19
Former-commit-id: 7c77a1877e [formerly 4672329a75] [formerly 4cd9a8b2e97217fb2f5ad101996cb66bf394e504 [formerly dead055dca]]
Former-commit-id: 37411debd3ddda5a3b867db46ce99859bbea3cad [formerly 4d96b2a212]
Former-commit-id: df3d12c6c4
2015-01-26 09:10:36 -06:00
Nate Jensen
6b23bfa212 Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: f620816ff6 [formerly 60227bcce2] [formerly fa9b8bec1651fe83a3d02c9e7afad132bb18e9fd [formerly c991d85bfd]]
Former-commit-id: c508c91675b2a9810f26c1958ae01de48b1b1c59 [formerly 9f82d7af10]
Former-commit-id: 5db9791b67
2015-01-23 12:57:24 -06:00
Steve Harris
936834331d Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: c6bb3f9f17 [formerly 5fda208a17] [formerly fd646e3ab88985355fb86128bc69473ecf242072 [formerly 033d0fc742]]
Former-commit-id: 10bac022834ddaeda42626dd3c8c191014cda5e8 [formerly c3d3d5f424]
Former-commit-id: fcdd2faaf1
2015-01-23 09:08:06 -06:00
Richard Peter
20a83b566c Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
Former-commit-id: 8b7354bcc9 [formerly 4e80bdbd9e] [formerly cc69519ce9] [formerly 8b7354bcc9 [formerly 4e80bdbd9e] [formerly cc69519ce9] [formerly d7f79b859b [formerly cc69519ce9 [formerly 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5]]]]
Former-commit-id: d7f79b859b
Former-commit-id: 8f772da403 [formerly dcf2085324] [formerly 656961d6839a397efdb34f2186e3d7e6e51db637 [formerly 9d1f4ee011]]
Former-commit-id: 9090ba82409ce8998a767318458cc407d02d5b58 [formerly 85aa9fb637]
Former-commit-id: c9f7f32c39
2015-01-22 19:13:09 -06:00
Mark Peters
eaabf1281f Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30

Former-commit-id: e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly 7a69f354d9 [formerly db69f5a0bc [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]]]
Former-commit-id: 7a69f354d9
Former-commit-id: 5e30a9a2b6 [formerly a176434c41] [formerly 07d7a446e738af0ab58692a612f9120d7eb946e5 [formerly 32dbdc345f]]
Former-commit-id: 31efce86df88c8f1123b2acdeb12548a1dbbff0b [formerly c6fd704642]
Former-commit-id: 841bf0150c
2015-01-22 18:05:40 -06:00
Shawn.Hooper
5975cc78ca Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 161ca595a2 [formerly 095a22f5e3] [formerly 314a8497f8] [formerly 161ca595a2 [formerly 095a22f5e3] [formerly 314a8497f8] [formerly 37c89530a6 [formerly 314a8497f8 [formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]]]]
Former-commit-id: 37c89530a6
Former-commit-id: 180e03947e [formerly dfd04fec4a] [formerly fd4c49437203ca206a956862d2067c327b748371 [formerly c012f464c9]]
Former-commit-id: 6c3eda46fc47f09791dc040f396679c86dc34dc8 [formerly 03fd6d11c5]
Former-commit-id: eefc3bd57d
2015-01-22 16:05:52 -05:00
Shawn.Hooper
9f0698b631 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]]]
Former-commit-id: a757b55446
Former-commit-id: ef1b152502 [formerly e110ee143a] [formerly 846a085e02ef123cf22a20cfcdcee3365bcca4dd [formerly 6cf71bae0e]]
Former-commit-id: 58d82a3f83ab66bcc80a9c33364bdb69623a3f39 [formerly 953b71a3f8]
Former-commit-id: c1555d3133
2015-01-22 16:05:41 -05:00
Dave Hladky
6985032d53 Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: 41b0ae02d4 [formerly 5fd928ec4c] [formerly c1127b066f] [formerly 41b0ae02d4 [formerly 5fd928ec4c] [formerly c1127b066f] [formerly a15e67385a [formerly c1127b066f [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]]
Former-commit-id: a15e67385a
Former-commit-id: 2f08dfbf3e [formerly f3f75d02dc] [formerly 0bf5d5a434338e257aeafca2d123106930c0f48c [formerly 92fbbea65a]]
Former-commit-id: 0c2236b2083d3ee6b73a340e89ad9ac1eee9dcd0 [formerly 60efde53e6]
Former-commit-id: 9af205777f
2015-01-22 13:22:18 -06:00
Nate Jensen
c0e89fe9af Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
Former-commit-id: f61a9a4031 [formerly 0d1414e56b] [formerly 16d862700a] [formerly f61a9a4031 [formerly 0d1414e56b] [formerly 16d862700a] [formerly 865852c20c [formerly 16d862700a [formerly 6557237cd4cea3300292e1612622547c23bdde2c]]]]
Former-commit-id: 865852c20c
Former-commit-id: f4480e9b07 [formerly 99dae46c58] [formerly f9632910c023c0b2d09e1ac6a5a170a88843bf03 [formerly c06e1c0adb]]
Former-commit-id: ca4f55456c03a217c21ae74e5e52351e5ae12314 [formerly 95bdbef8c4]
Former-commit-id: 84379b24e2
2015-01-15 13:07:10 -06:00
David Lovely
dddc0c9e67 Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5

Former-commit-id: ffbd986a80 [formerly 1f59c0cd21] [formerly 1cfc27241f] [formerly ffbd986a80 [formerly 1f59c0cd21] [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 1cfc27241f [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]]
Former-commit-id: cf4077e8cd
Former-commit-id: d1897052f4 [formerly af5df71b4c] [formerly 7149ce1ab0dab5dc5ff07ad554d8fb7c73497b9a [formerly f7565da27d]]
Former-commit-id: 01b165a2474f9317de4614ec574298ddd54381b9 [formerly 3babe6269f]
Former-commit-id: 62425dfbb3
2015-01-15 08:16:18 -06:00
David Lovely
ffe9e6a027 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 46093ce896 [formerly 2771afe7f4] [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 63c3631559 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: cb81f4322d [formerly 0fa33b0e84] [formerly 3887066e9acf5bcc504692fb690047a9c7d85c77 [formerly f75e17f79e]]
Former-commit-id: 2cbd5b7fba4be5ea1be867bdd5680394153dd6a0 [formerly 49e435ede3]
Former-commit-id: 55fbb2ad86
2015-01-14 14:40:36 -06:00
Nate Jensen
c59dfca9cc Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
Former-commit-id: 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 3c53cb0fe7 [formerly 956845266c] [formerly bdb58ec755] [formerly 7c61d2c06d [formerly bdb58ec755 [formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]]]]
Former-commit-id: 7c61d2c06d
Former-commit-id: 1e47902d87 [formerly fa79e80782] [formerly 9bc5273cc25fd33471a9c6370f9bb759460886bf [formerly 4abf2a8a6c]]
Former-commit-id: a9845d89c493e6e77fcdc9ddeca8f8442e9b6811 [formerly 4837ead714]
Former-commit-id: b86874003f
2015-01-14 14:05:18 -06:00
Brian Clements
8ae1e07cff Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 38aa18a7e0 [formerly 17ccb3ab66] [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly 1c2d8e01d0 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: 33bff8c047 [formerly ba13ccb6f0] [formerly c9bad25f0e0bc3619a4fc5e17fdff45892307a53 [formerly 9a87cf77c5]]
Former-commit-id: 12c0265674271e2a5c6840f97cac1f49816d7a87 [formerly 61b3b6389e]
Former-commit-id: 0f521bee60
2015-01-14 13:00:25 -06:00
Greg Armendariz
1408154892 Merge "Omaha #3957 Fixed path in Installer.edex-environment for QPID." into omaha_14.4.1
Former-commit-id: 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 5e8275c249 [formerly 6bdaf0b924] [formerly 6c7e615de5] [formerly 0431783330 [formerly 6c7e615de5 [formerly 7c37c3ef1e9822a988f2f3aff9e884fbe48dce9c]]]]
Former-commit-id: 0431783330
Former-commit-id: 37317346ca [formerly afe39c3dd6] [formerly 8b473ced856efdd5b45e4fb63e4bc182021ff577 [formerly fff75342eb]]
Former-commit-id: c441899dcfcba06add4edc5696368ccdb04ea756 [formerly 89c4169e18]
Former-commit-id: c7552ebaf9
2015-01-14 11:33:29 -06:00
David Lovely
cc021bb799 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9

Former-commit-id: df92459c77 [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly 9b9d569062]] [formerly df92459c77 [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly 9b9d569062]] [formerly f75230366c [formerly 9b9d569062 [formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]]]]
Former-commit-id: f75230366c
Former-commit-id: aafad06d27 [formerly e8150e977c] [formerly 1d6b91d11911a6b3ab28c054698c6b1b384a7605 [formerly 5bbea995ae]]
Former-commit-id: c967e5feace797303c2cf127e0ad4741c5a04934 [formerly 9316cbc4a4]
Former-commit-id: 4467128c35
2015-01-14 11:28:56 -06:00
Ben Steffensmeier
4f11df8c5a Omaha #3966 Limit the number of flags on wind barbs.
Former-commit-id: f1aadfd1be [formerly dad3e9ed8c] [formerly 22f13c9f08] [formerly f1aadfd1be [formerly dad3e9ed8c] [formerly 22f13c9f08] [formerly 3a6bce1100 [formerly 22f13c9f08 [formerly 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d]]]]
Former-commit-id: 3a6bce1100
Former-commit-id: f54ba922fc [formerly f7d8dae6b9] [formerly 6e46f5ca1f27bbfd2affbcd77eca893a08d09a48 [formerly 7d9ff47dfa]]
Former-commit-id: 5d2c5c2a402c7cc6c52b10342882d75fca379f34 [formerly 4b253097a1]
Former-commit-id: 79d0ce0b70
2015-01-13 17:21:43 -06:00
Nate Jensen
aa93629c1a Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: 88e656a34d [formerly f88f62191f] [formerly 05307be9d0] [formerly 88e656a34d [formerly f88f62191f] [formerly 05307be9d0] [formerly b434ae1343 [formerly 05307be9d0 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]]
Former-commit-id: b434ae1343
Former-commit-id: 482a44faa4 [formerly 9df5c9249b] [formerly cc869028254962519b3a37875e8c730e5b42e009 [formerly 39ab8668fa]]
Former-commit-id: f298e0439354a644ee18ab4fd923ae39f704342c [formerly 69d8073d94]
Former-commit-id: 7a14b2de0c
2015-01-13 16:47:04 -06:00
Ron Anderson
55468188a6 Omaha #3997 Create script for sites to use to compare AreaDictionary.py files
Change-Id: I0b76c40ffe70d1df9d9379deca4bdc0276a723fd

Former-commit-id: bdc4d332f1 [formerly d4ccf1c538] [formerly ce0fa19f7b] [formerly bdc4d332f1 [formerly d4ccf1c538] [formerly ce0fa19f7b] [formerly b8fdaf17a4 [formerly ce0fa19f7b [formerly 23b10f94f9ff892fdbff654e6fefbd4b3c914f58]]]]
Former-commit-id: b8fdaf17a4
Former-commit-id: 1f0797db65 [formerly 4919681992] [formerly 1a179dd43ba317d374f180d368cd3583557a3918 [formerly b5f578a4e1]]
Former-commit-id: 1daba82d5e08e2886250d83dbc318ac6330cb688 [formerly a8d2a64bd7]
Former-commit-id: 9b9d487ad6
2015-01-13 15:11:42 -06:00
Ron Anderson
e14a3d36bb Omaha #3997 Create delta script to preserve the site's current AreaDictionary.py file
Change-Id: Id38826c171ed6d87fd8b677c53df7e2a6b49254c

Former-commit-id: 096a93a4bb [formerly 699573558f] [formerly 690861d350] [formerly 096a93a4bb [formerly 699573558f] [formerly 690861d350] [formerly 82aa416c48 [formerly 690861d350 [formerly 9da286a579c582db47d63aba83552f5361d819e0]]]]
Former-commit-id: 82aa416c48
Former-commit-id: 0a55b5fbbd [formerly 7aaaf55ea8] [formerly a7ca0a1c9d42345e31261442621f895c62e6b26a [formerly ac7a6945f8]]
Former-commit-id: 47ad7f3c08eaaeeeb5a2b79b4f7d1b244a39aef8 [formerly 4af148d7f0]
Former-commit-id: a04c7694d0
2015-01-13 14:32:50 -06:00
Fay.Liang
b99287a213 ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1
Merge branch 'asm_14.4.1' into master_14.4.1

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java

Former-commit-id: 8a6ed4ec3d [formerly 1934dedd2d] [formerly 13fb781066] [formerly 8a6ed4ec3d [formerly 1934dedd2d] [formerly 13fb781066] [formerly a09a27a963 [formerly 13fb781066 [formerly 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290]]]]
Former-commit-id: a09a27a963
Former-commit-id: 116650b2d0 [formerly 10a0b78dcc] [formerly 16ed39efc983c8e3a4316fa09e3809726c001e7a [formerly 50513e1655]]
Former-commit-id: 03325de6fe8ef5f74f26a9449cdab6d895d55c26 [formerly c87c390019]
Former-commit-id: 70350e7c9a
2015-01-13 14:35:30 -05:00
cmadmin
767f41d351 Merge "Omaha #3957 Moved QPID to build repository directory structure." into omaha_14.4.1
Former-commit-id: 88c6cad829 [formerly b9fac8ae47] [formerly 5b796ff2f8] [formerly 88c6cad829 [formerly b9fac8ae47] [formerly 5b796ff2f8] [formerly 478e3825ae [formerly 5b796ff2f8 [formerly 455b763fd46e6053e272854e89074cdb898d4a6c]]]]
Former-commit-id: 478e3825ae
Former-commit-id: 196aba3c92 [formerly 8d5cd7a6d6] [formerly 9b043cae2b087a4fc9989607717d53d30c55ed9c [formerly b5c3233880]]
Former-commit-id: c3ef88677e3904f2c16a4088d47259b7f4567a66 [formerly 4e04d6093e]
Former-commit-id: c95f832d12
2015-01-13 09:14:43 -06:00
Nate Jensen
0f564af508 Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
Former-commit-id: 22ecd81209 [formerly bb5b975ae0] [formerly 65a0433605] [formerly 22ecd81209 [formerly bb5b975ae0] [formerly 65a0433605] [formerly 511ba87c5c [formerly 65a0433605 [formerly d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c]]]]
Former-commit-id: 511ba87c5c
Former-commit-id: 4cb599d378 [formerly 7d2f617c95] [formerly 7d8802c27365739adc62402e7523a0d85267b719 [formerly a9e4546f6a]]
Former-commit-id: b24a418f20ae479fa9115844f15bb7b9976ab4dd [formerly e75e025fe4]
Former-commit-id: 2ab1455029
2015-01-12 13:59:25 -06:00
Slav Korolev
5a3799377c Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly ec08386cc4 [formerly f08d184cfc] [formerly 9c57dab437] [formerly b8ab18d3e1 [formerly 9c57dab437 [formerly 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e]]]]
Former-commit-id: b8ab18d3e1
Former-commit-id: e32ce19793 [formerly 6c73aca047] [formerly 7708df916bb5d9655f804071f169d05bf3fc2cdd [formerly 790a79e752]]
Former-commit-id: 35811ae4e1a7864d41803b014c3710a123669284 [formerly a6e0502c58]
Former-commit-id: 7c7c14b192
2015-01-12 14:32:31 -05:00
Fay.Liang
bccf70f0bd ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
2015-01-12 13:03:31 -05:00
Brian Clements
4d6164a5d9 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 63041f1980 [formerly 911b007d95] [formerly 3d33ce1341] [formerly 63041f1980 [formerly 911b007d95] [formerly 3d33ce1341] [formerly 46c0d7d42c [formerly 3d33ce1341 [formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]]]]
Former-commit-id: 46c0d7d42c
Former-commit-id: 9fa2a180a6 [formerly 42d54b3dac] [formerly 8ae511fba05ed958557137bebb35ff2c00ef6fd0 [formerly c354fa93db]]
Former-commit-id: a5cc2985790b3e7e88f555a7afbfc86e58dd80f9 [formerly 29ec52418c]
Former-commit-id: d577a1d181
2015-01-12 11:06:57 -06:00
Nate Jensen
4a1eccbab5 Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1
Former-commit-id: 014c30ad96 [formerly c37ffcde90] [formerly 44f0f7aafc] [formerly 014c30ad96 [formerly c37ffcde90] [formerly 44f0f7aafc] [formerly 06054344dd [formerly 44f0f7aafc [formerly 5fc926b7e735f2c92b16a85a7ba5f663a443ea53]]]]
Former-commit-id: 06054344dd
Former-commit-id: 2a8197d2c6 [formerly ba3b185a4d] [formerly 11ef8278d6478c02945c4f7d12ea9f44b42b1bf2 [formerly cf448004b9]]
Former-commit-id: cbf383660fc1f71adde8f593f913bafd92249dcf [formerly 3d3f683ba5]
Former-commit-id: 07013d200f
2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
4bcf557068 ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable.
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb

Former-commit-id: f7661c47dc [formerly 1aa98e754a] [formerly bae8d9ea3f] [formerly f7661c47dc [formerly 1aa98e754a] [formerly bae8d9ea3f] [formerly e007fac30f [formerly bae8d9ea3f [formerly 38eabd6196df1576970019f2b0255d3f39a825a9]]]]
Former-commit-id: e007fac30f
Former-commit-id: 3840f1488f [formerly 1c3882e344] [formerly 3a9001951cfa1ba5cfa778fa3b472c7e96496f5f [formerly f034b8dab1]]
Former-commit-id: 240ab83a0f04e1dad9c4133001f9a336e7ced318 [formerly 85a439fb39]
Former-commit-id: feffeee72e
2015-01-09 15:07:29 -05:00
Juliya Dynina
81a980203e Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
Former-commit-id: f126b00040 [formerly 898380889c] [formerly 0113c27937] [formerly f126b00040 [formerly 898380889c] [formerly 0113c27937] [formerly 3bf0aebf64 [formerly 0113c27937 [formerly d0f721f3fe93b87ca3670264a2abdf9b3b64bff8]]]]
Former-commit-id: 3bf0aebf64
Former-commit-id: e5f3fe0053 [formerly 9ebfcec33f] [formerly e04d5c485e886d31d3d00eaf00f7f28f6a8c9920 [formerly 6a4f936e9b]]
Former-commit-id: d49c7ff781b84d62aeca668576f377fd2ad77a13 [formerly 5bd95b83c7]
Former-commit-id: 84032a4d9b
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
24eb522c85 ASM #14246 - Implemented MPE Transmit Best Estimate option
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e

Former-commit-id: a79e03654c [formerly 79ae030ca6] [formerly 275133f9256551156959cf7790586c4aafd74c4e [formerly 4a769ef560]] [formerly a79e03654c [formerly 79ae030ca6] [formerly 275133f9256551156959cf7790586c4aafd74c4e [formerly 4a769ef560]] [formerly f2476cae94 [formerly 4a769ef560 [formerly 212076c520952d0327591b79449ae09ad063adf1]]]]
Former-commit-id: f2476cae94
Former-commit-id: 47c21fe061 [formerly 7aa40a0654] [formerly 7ffde67c706577ae62d7f3625812213879823ffa [formerly 1e849a4bba]]
Former-commit-id: c6bd0a6a4fa53165cdf98d4047a72ff42714d88a [formerly 7226e889f8]
Former-commit-id: c83ade000b
2015-01-08 15:31:58 +00:00
Ying-Lian.Shi
78b8eb0e1a ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e

Former-commit-id: b7e616eb6e [formerly 4109770c59] [formerly 3e1d1aa814] [formerly b7e616eb6e [formerly 4109770c59] [formerly 3e1d1aa814] [formerly c99e199a69 [formerly 3e1d1aa814 [formerly af67fa0f955b35c7b9b141fef507a5db805eaa27]]]]
Former-commit-id: c99e199a69
Former-commit-id: 4ca0174522 [formerly 874b4b0f64] [formerly bbc949c60a5c20ebbfc34228c2dfab1a10813899 [formerly 37ce7e968b]]
Former-commit-id: 6563974c0de3d7ba5e061edc5eae8034599a65f5 [formerly 8102688bd1]
Former-commit-id: 7ce668ce74
2015-01-08 15:28:54 +00:00
David Lovely
0dba443423 Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly d25fcc9155 [formerly 208dd5de01] [formerly 240927c241] [formerly e56002debf [formerly 240927c241 [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]]
Former-commit-id: e56002debf
Former-commit-id: cc40ff8301 [formerly 9f09af1c8a] [formerly b42af842cf64f96a786847d263d90f2eab6ef2ca [formerly d860af2218]]
Former-commit-id: ba931f8d29a5e299b40d1de07af37d22f7100e4b [formerly b67b97803c]
Former-commit-id: 9c401ce4ea
2015-01-07 12:03:10 -06:00
Slav Korolev
6f00a3a43c Omaha #3937 - Removed UELE - Index out of bounds.
Former-commit-id: f8dd337ebb [formerly 13ef257a0d] [formerly e30255308829f00ef8e279a7739ec39926b221ba [formerly c215b4c91b]] [formerly f8dd337ebb [formerly 13ef257a0d] [formerly e30255308829f00ef8e279a7739ec39926b221ba [formerly c215b4c91b]] [formerly da0d46ad81 [formerly c215b4c91b [formerly 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13]]]]
Former-commit-id: da0d46ad81
Former-commit-id: 829b40e864 [formerly a9f642af5b] [formerly a19ec9f110f50b444e205b810d327de71cac6d1a [formerly 32b5dc8928]]
Former-commit-id: fb4b7078c421a89f7f91a815350ebf703c052914 [formerly 44a4f7220d]
Former-commit-id: cb5037ba90
2015-01-07 12:20:08 -05:00
Juliya Dynina
85f1a6640e Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1
Former-commit-id: 1c7bb3f727 [formerly 206a985f23] [formerly d0072cd181] [formerly 1c7bb3f727 [formerly 206a985f23] [formerly d0072cd181] [formerly 2efa96316e [formerly d0072cd181 [formerly 503e8a59c9608c3094d817e3e2d5e07250c0e0e5]]]]
Former-commit-id: 2efa96316e
Former-commit-id: ec611cce88 [formerly 6c868a9c74] [formerly 4e758e9577bc3d7615285f0ed9d5a5682452f767 [formerly 2ab78c21f2]]
Former-commit-id: 0ae461edf1ddf2740e6f2774427ab8e9250330b8 [formerly f413e2c31e]
Former-commit-id: 44cbe51d63
2015-01-07 09:02:32 -05:00
Daniel.Huffman
5f584808fb ASM #632 -Filter erroneous RPG alert messages.
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: f4ea480d38 [formerly 22f923eaf5] [formerly 9db291b296] [formerly f4ea480d38 [formerly 22f923eaf5] [formerly 9db291b296] [formerly 7a563dd505 [formerly 9db291b296 [formerly d7d3bc55053f16da410d3ebe1ef055e93d198790]]]]
Former-commit-id: 7a563dd505
Former-commit-id: 7b1fab2aea [formerly ccc9cf5662] [formerly 32744a5d8c21b6d50edd1fb162d0edab489546c7 [formerly c7b973493f]]
Former-commit-id: b0612e200ebfb5c1f4da5f9ba71ba5ad87750add [formerly 93e0aad16e]
Former-commit-id: 9b6f13244f
2015-01-07 00:41:35 +00:00
Dave Hladky
2632f596c3 Omaha #3918 Fix for standalone clients not starting due to central registry non-existance.
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: a223529e47 [formerly c6aca09cf3] [formerly 66aa4b2fbf] [formerly a223529e47 [formerly c6aca09cf3] [formerly 66aa4b2fbf] [formerly 36ab95205f [formerly 66aa4b2fbf [formerly d8a52577bbe13f53f9afbbae354e8bc58e11a0ed]]]]
Former-commit-id: 36ab95205f
Former-commit-id: f947dbee15 [formerly 87aeba1177] [formerly 47f3e80abb64b345be5144758283db23638433af [formerly f8214a64cd]]
Former-commit-id: 9a83ef88947c86e150c5679b1285768e861465ce [formerly a32499a14a]
Former-commit-id: c038b51e8e
2015-01-06 14:37:01 -06:00
Juliya Dynina
df5f3810d5 Merge "ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions." into asm_14.4.1
Former-commit-id: 62bad7c3af [formerly cc0424d470] [formerly 4dca647a51] [formerly 62bad7c3af [formerly cc0424d470] [formerly 4dca647a51] [formerly e439d3845f [formerly 4dca647a51 [formerly a307a3331eef80ea6dc459f352ea2dccf2ea4bf6]]]]
Former-commit-id: e439d3845f
Former-commit-id: 6c88e33405 [formerly 3a3c55d870] [formerly 1f0ebbfb2747d53d8dfb2c63381199be152887e1 [formerly 4079e43c19]]
Former-commit-id: 5bc168408cb8ff059f859bc36700697f33730619 [formerly 3b62980204]
Former-commit-id: 97fcdc6c1d
2015-01-06 15:16:33 -05:00
steve.naples
1d0b327b72 ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205

Former-commit-id: 4021a11f2c [formerly 7f8716267f] [formerly f53fb9c404] [formerly 4021a11f2c [formerly 7f8716267f] [formerly f53fb9c404] [formerly bdbdc68b2a [formerly f53fb9c404 [formerly 28f92f6b49d286f7c470bda6184d12b7882bb768]]]]
Former-commit-id: bdbdc68b2a
Former-commit-id: fcccb78e21 [formerly 4630ed499f] [formerly 70562ffdaf8a720546e517d2a7a02697c3cffa02 [formerly b89b70f22d]]
Former-commit-id: a9f8dc909b61156c6084a66ef347cfd8c5d98a65 [formerly 61c4126aaf]
Former-commit-id: bd1539e397
2015-01-06 19:49:03 +00:00
Brian Clements
3e6e038aa3 Omaha #2707 replaced LSR officeId constraint with stationId
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: cbc8c0d72d [formerly 111c81d35c] [formerly acc9e8630d] [formerly cbc8c0d72d [formerly 111c81d35c] [formerly acc9e8630d] [formerly ac952bc760 [formerly acc9e8630d [formerly e0cd69f020d351f0aaefd5b35ffb369e44a04e48]]]]
Former-commit-id: ac952bc760
Former-commit-id: cdcb5b287b [formerly 877190a87f] [formerly 5540488375a5b61809fc3517ad4f496e1a5b43d3 [formerly 0d29964efc]]
Former-commit-id: cd9473b86c8a2ff84badf489f7877a46d00e7ca5 [formerly 0a0547b474]
Former-commit-id: 3ec63f55b8
2015-01-06 12:33:06 -06:00
Nate Jensen
443ff48439 Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
Former-commit-id: 0dfbe0f468 [formerly 5ea76c4f3d] [formerly 33229e2871] [formerly 0dfbe0f468 [formerly 5ea76c4f3d] [formerly 33229e2871] [formerly b8f1475a3c [formerly 33229e2871 [formerly d617935ead64cdaf51481aa46fc0bf2e07215696]]]]
Former-commit-id: b8f1475a3c
Former-commit-id: 92822f6fdb [formerly fae5ed4e5f] [formerly 635c7102ca79503a7a04a313d380b472571a4a1f [formerly 4a547884b5]]
Former-commit-id: 27ac421263a07d5b34de5c810c16fd2c2391ed47 [formerly f5db894b86]
Former-commit-id: fb038b5f9e
2015-01-05 13:06:21 -06:00
Mark Peters
399f4943ff Omaha #3709 Fix some minor issues with collaboration colors.
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057

Former-commit-id: bdb8c848dd [formerly 6df0145869] [formerly 530b52d7db] [formerly bdb8c848dd [formerly 6df0145869] [formerly 530b52d7db] [formerly 7cc21da419 [formerly 530b52d7db [formerly f028c5040e50d3a2c96294d5c4d7ddd0e360defb]]]]
Former-commit-id: 7cc21da419
Former-commit-id: 3db765ceae [formerly 3ff2238ced] [formerly f27de8dbf1538562ed370cc4808ac82abc85722d [formerly 75bc5c4ed9]]
Former-commit-id: 4fe9a88e9be015dffe043eac1a6573e3da7402b2 [formerly 308d4aa4a5]
Former-commit-id: aa4db73f94
2015-01-05 12:57:42 -06:00
Richard Peter
c3f7bbddeb Merge "Omaha #3600 Implement getAvailableLevels() for radar to increase inventory performance." into omaha_14.4.1
Former-commit-id: a6991f3d88 [formerly 341197be92] [formerly 38f1ef0e8f] [formerly a6991f3d88 [formerly 341197be92] [formerly 38f1ef0e8f] [formerly be845aea5f [formerly 38f1ef0e8f [formerly 429f7038e0342ccc1673e85c40cbc1f011a70410]]]]
Former-commit-id: be845aea5f
Former-commit-id: 95c78fdce2 [formerly 53e41d4d5a] [formerly f6e35cfb07c6fd3f3742bd6df61b743dafe8ec2c [formerly 8a2358f46a]]
Former-commit-id: 3962bc0df31bcecf65857b65193ac2328639d6a2 [formerly f99847bfea]
Former-commit-id: 59a72b39ec
2015-01-05 11:35:04 -06:00
Rici.Yu
6595295016 ASM #16942 - GFE: VTEC Active Tables not getting purged
Change-Id: Ia00f0c5d9f0a9f8abadde271f3608fd4e786a60b

Former-commit-id: 1a73642a1d [formerly 4d10daca1f] [formerly 97c7681e01] [formerly 1a73642a1d [formerly 4d10daca1f] [formerly 97c7681e01] [formerly 483d0216da [formerly 97c7681e01 [formerly a98e1f924bf0b99657dd56241c02f529c5e48ce7]]]]
Former-commit-id: 483d0216da
Former-commit-id: 8d2ba35d76 [formerly 56b0d27d37] [formerly df1ee60bba6c42e88c0fdda727c0ec71202a5507 [formerly 562ea0d566]]
Former-commit-id: 84887a67aab432a1e9ae6f180b53cae0894474ca [formerly 4ddd8c5c15]
Former-commit-id: d43b569d29
2014-12-30 13:56:02 -05:00
Stephen Gilbert
4eceb88ec5 VLab Issue #4078 - Add project gov.noaa.nws.ncep.viz.rtkp.
It was lost in last merge from ncep_14.2.2-n branch.

Change-Id: Ica2fcdcbc7fea944fbaca26a4c916a9d22e216d4

Former-commit-id: 466f4d799e [formerly 69f6940790] [formerly 31c1388d7b] [formerly 466f4d799e [formerly 69f6940790] [formerly 31c1388d7b] [formerly 53eac04e52 [formerly 31c1388d7b [formerly 65f44141c0855411255e69dd7c7bfd11c7ff74b6]]]]
Former-commit-id: 53eac04e52
Former-commit-id: 2c7b971cd9 [formerly 7a8dd56ad6] [formerly b82a2b87d449ce4b065bfc1fd7e747b5f8070598 [formerly 983891787d]]
Former-commit-id: d44e4520c57efa88baf6203321f6994625be9023 [formerly c2c4a4592b]
Former-commit-id: edf74e6a81
2014-12-30 13:44:32 -05:00
Stephen Gilbert
55b688135a VLab Issue #5749 - Removed uEngine and PDO dependencies
Change-Id: I3368b5cb82b6782e3934b37c5175c9e936768815

Former-commit-id: 6af0889fec [formerly 65f56b863f] [formerly 1cc30e4a12] [formerly 6af0889fec [formerly 65f56b863f] [formerly 1cc30e4a12] [formerly 79d5a192bf [formerly 1cc30e4a12 [formerly 097f9f63433b71433f4c5503ca6a80fb8fd6a4a6]]]]
Former-commit-id: 79d5a192bf
Former-commit-id: 884d2823e5 [formerly 16290cff3d] [formerly 18d6a2b3495eb066e9327ea999d2e78592e7d4f6 [formerly 1e0869c0d7]]
Former-commit-id: efbae776bcc163db1cc28c8d2bb5502b9cbd7d21 [formerly 8c075a5640]
Former-commit-id: 260fbacf1b
2014-12-30 13:28:32 -05:00