Commit graph

648 commits

Author SHA1 Message Date
Roger Ferrel
9116d93f52 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: cc1aecde2f [formerly bfcefac909] [formerly 0cf7d64cf4] [formerly 9071334fe9 [formerly 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]
Former-commit-id: 9071334fe9
Former-commit-id: 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794]
Former-commit-id: c317c5d0a3
2012-07-12 11:32:03 -05:00
Bryan Kowal
c3e4e47c08 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: 85bcee527d [formerly 7f6015eba5] [formerly e00da679e583e063dc81e0603ad2d318d8b5b9f3 [formerly 0f31fadffa]] [formerly bde6be6e2b [formerly 0f31fadffa [formerly ea1b0920d908481e28477329497204dda324bd3e]]]
Former-commit-id: bde6be6e2b
Former-commit-id: bc57b24caca1c0e9ce531e9ab741fafb2aa3ba46 [formerly 00c9a0f708]
Former-commit-id: 6d961d22fb
2012-07-11 17:31:55 -05:00
Bryan Kowal
bce385a4cb Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 81dcc5dcc7 [formerly 6fe6e64f38] [formerly 5058c32c34] [formerly 31f2db8719 [formerly 5058c32c34 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 236fceea7dfc2f90dc34eb5ec0b4ebb1cb7fd6d1 [formerly 5619099acd]
Former-commit-id: 43f3d40a8e
2012-07-11 16:28:28 -05:00
Bryan Kowal
e07c3c20b5 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]
Former-commit-id: 3b7c761f99
Former-commit-id: 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]
Former-commit-id: 470511d9a3
2012-07-11 12:44:32 -05:00
Bryan Kowal
38f5b0d3b8 Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.


Former-commit-id: 85dab34a39 [formerly 0e279845ba] [formerly b79f5a3c2b] [formerly c7a172f97a [formerly b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]]]
Former-commit-id: c7a172f97a
Former-commit-id: 14635ee7a33af24a843b10200822f7105e7b3f28 [formerly 7ace6b7acb]
Former-commit-id: 8aea713004
2012-07-11 09:42:46 -05:00
Bryan Kowal
c8dd1f50e9 Merge branch 'merge_development' into development
Former-commit-id: 291a674e41 [formerly 226818bda5] [formerly 051a51b79c] [formerly b27994c9b1 [formerly 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]
Former-commit-id: b27994c9b1
Former-commit-id: c0a190ac0c964f309e33d6b6b28bdaa7c7fa56be [formerly fa5eb7a16a]
Former-commit-id: 541b59d060
2012-07-10 17:03:21 -05:00
Bryan Kowal
76ee9afb3f Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]
Former-commit-id: f92eb59a73
Former-commit-id: 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]
Former-commit-id: 8d64fdba2c
2012-07-10 16:57:16 -05:00
Nate Jensen
3b2ec2665e Merge "Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API. Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998" into development
Former-commit-id: 596d51ad4b [formerly 85350ace5e] [formerly 2af538f200] [formerly ee43626e2e [formerly 2af538f200 [formerly 95d4cacc92bbf5531ca54c3a4dda811ea402ac84]]]
Former-commit-id: ee43626e2e
Former-commit-id: e40aec983c60f96f4bab65e30bd69be98d4e798a [formerly 3fbdc016c5]
Former-commit-id: 989ddf7808
2012-07-10 16:06:28 -05:00
Ben Steffensmeier
bd239a7466 Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 0a7be21041 [formerly 5bf019e1bb] [formerly 74a69d1fb9] [formerly 79ab850efa [formerly 74a69d1fb9 [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]
Former-commit-id: 79ab850efa
Former-commit-id: 2abc2a1aad032ea41191229591abdad0597e5bc9 [formerly 4182352f8c]
Former-commit-id: 612e586a6c
2012-07-10 16:04:56 -05:00
Greg Armendariz
21b9c6d41e Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: 57113a9d9d [formerly e119a69089] [formerly 84e8babca1] [formerly 2fcdef36f3 [formerly 84e8babca1 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]]]
Former-commit-id: 2fcdef36f3
Former-commit-id: 010f83d0aee7da6153861690e8c43ebb020293eb [formerly 481b13193d]
Former-commit-id: 6520670080
2012-07-10 10:15:33 -05:00
Steve Harris
1e747f0a42 Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: a456af38fa [formerly 8fff0d7e53] [formerly 479ccdbed2] [formerly 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]
Former-commit-id: 9454393d13
Former-commit-id: 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174]
Former-commit-id: 45ac1d4d51
2012-07-10 09:29:33 -05:00
Bryan Kowal
36231b4174 Issue #862 - fix java error.
Former-commit-id: 708a753282 [formerly adcd49b090] [formerly 2ec61df191] [formerly 748c121036 [formerly 2ec61df191 [formerly 9e5b18d03a18d7af849efb9b1cf3f1c25a9252a8]]]
Former-commit-id: 748c121036
Former-commit-id: 9dde1d16468f23e06dd6c1473768f5c8c5687b38 [formerly 8c8dcd0b81]
Former-commit-id: 99593642d4
2012-07-09 09:40:40 -05:00
Max Schenkelberg
24cc9781c0 Issue #626 wrote grid downscaler to help NPP/GOES-R downscale data in a common method. Uses new interpolation/reprojection APIs
Change-Id: I4ab39a6d0bcd1f54337c77b9086f15afdc3e9ea4

Former-commit-id: a9630197ef [formerly 5d4d4d9c22] [formerly a0d645fedf] [formerly cbd753c86d [formerly a0d645fedf [formerly f28d4ba149fe16471a4e10e50f15b684c0d82b9c]]]
Former-commit-id: cbd753c86d
Former-commit-id: b4dd866c832966eaea21d31f64dcf1acd11d09c1 [formerly 19b6eccbd2]
Former-commit-id: 6dcfa3fbf8
2012-07-06 16:04:12 -05:00
Max Schenkelberg
58abd127b7 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 3bff06cf92 [formerly 7d13c7d339] [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962]
Former-commit-id: c6d324aaeb
2012-07-06 16:01:47 -05:00
Ron Anderson
ad85b5174a Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97

Former-commit-id: 9667367c3c [formerly d68ece4d55] [formerly d3e0cd5af8] [formerly e71059c2b9 [formerly d3e0cd5af8 [formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]]
Former-commit-id: e71059c2b9
Former-commit-id: f3270e713227b4f39b8b265a24ecc31d0f507adf [formerly 473e6e9eb2]
Former-commit-id: 60de5ca0f4
2012-07-05 16:32:44 -05:00
Ron Anderson
ead8d20127 Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7

Former-commit-id: 032e9e2a84 [formerly 51a8028105] [formerly 1f871be887] [formerly 593a09daee [formerly 1f871be887 [formerly 8e81e22084031ed702ba294ec94a6bd59926d88c]]]
Former-commit-id: 593a09daee
Former-commit-id: d65ef08709037db775ac4ecbde06abf78d1c5f0e [formerly 9d95a05180]
Former-commit-id: f6e1eb53ce
2012-07-05 15:50:07 -05:00
Ron Anderson
68ddc7056d Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: b4c02fd246 [formerly 936b2cabca] [formerly 058edcf6c6701eca16ffd286f2dfe8065a9ff120 [formerly ff5c7b7498]] [formerly 59a3ebe8ba [formerly ff5c7b7498 [formerly af1332170e28aed53ff91997ce089b20423203d5]]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: deb40e1efbb342a3a1a406a5b1b9de83925bea87 [formerly 0c5199ba03]
Former-commit-id: 5186dcf321
2012-07-05 15:39:05 -05:00
Nate Jensen
d360e0856e Issue #666 fix for ncep metars to share correctly in collaboration session
Change-Id: I829eea313b5870d3df551f9b5224d178528412ae

Former-commit-id: 266af8fac1 [formerly f1a37857b6] [formerly ad2c9b5d3b] [formerly 0b6b48222c [formerly ad2c9b5d3b [formerly b4de13af62ea179577e9dc799c3174d4ce7bd21b]]]
Former-commit-id: 0b6b48222c
Former-commit-id: 78534b2d818f47c8e2eaa625af3e867c3e4c822d [formerly 04254cada4]
Former-commit-id: e634eaf84b
2012-07-03 13:38:31 -05:00
Bryan Kowal
b5a50837f2 Merge "Issue #716 remove dead plugin from features" into development
Former-commit-id: 8a976cad85 [formerly d918ed1a48] [formerly 5211449202] [formerly 5af862f03f [formerly 5211449202 [formerly 479a1c1309a657baa50afaf2e6640e840059a121]]]
Former-commit-id: 5af862f03f
Former-commit-id: 691fa51857b96735fc59867d536b1805145bbf4a [formerly fd8eba8c02]
Former-commit-id: 64e74e9c11
2012-07-02 09:50:55 -05:00
David Gillingham
7dd2101294 Issue #827: Add serialization annotation to id field for TAF ChangeGroup and BufrMosDataLocation classes.
Change-Id: I894932f410865b0d019b2a8017cc157055552e0c

Former-commit-id: 286686e574 [formerly 6d8d87dc9a] [formerly 10beeaa160] [formerly 691f67747e [formerly 10beeaa160 [formerly cf6fdd9cde2a3a0565c7adef2ab11cecdb324ea9]]]
Former-commit-id: 691f67747e
Former-commit-id: 62d55148ec3bd34e0a7734d0885d9edf5bd0be35 [formerly ac108a638c]
Former-commit-id: 42dbc6fb2a
2012-06-29 13:30:25 -05:00
Richard Peter
27304cb1aa Merge "Issue #828: Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC." into development
Former-commit-id: d3554f77fa [formerly 777eea835b] [formerly d53ecb6137] [formerly d9d5b3819a [formerly d53ecb6137 [formerly c53e18d5661bdf49ce94fe090c185c74d1262136]]]
Former-commit-id: d9d5b3819a
Former-commit-id: 6826a71c907b3fbf600b38c15b41b5578b545fcd [formerly 14c6164e73]
Former-commit-id: 9f71e5a6c8
2012-06-29 13:21:26 -05:00
Nate Jensen
d91a0470ad Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7e34a3e6ab [formerly e58404bcb5] [formerly bcedcc51fa] [formerly 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]
Former-commit-id: 7046ba996a
Former-commit-id: 0568bcdd3aeb09c62970a0d7fde73f55fd4d84b8 [formerly 63c5c4dc33]
Former-commit-id: 95bbc6a2d4
2012-06-29 13:19:47 -05:00
Nate Jensen
4a9bf25442 Issue #716 fix uamend script
Change-Id: I663c5dce55a0f7b3f2cd128b526d1d211ad096e7

Former-commit-id: f22bbe30a3 [formerly cf7dfdb044] [formerly 8ee0eb7091] [formerly a9ddd4f194 [formerly 8ee0eb7091 [formerly 090d7432f86c51f9b23ffb6af387f2fbb0142dcb]]]
Former-commit-id: a9ddd4f194
Former-commit-id: bfbb1c906de2e9ad076222ac6281c1afa618d0be [formerly b5bb04abaf]
Former-commit-id: a5e636a590
2012-06-29 13:10:35 -05:00
David Gillingham
5f1773bc2e Issue #828: Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.

Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581

Former-commit-id: d54d8a51ff [formerly aa0ba41cf9] [formerly 3fffc47ba5] [formerly abdcc32b2c [formerly 3fffc47ba5 [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]]
Former-commit-id: abdcc32b2c
Former-commit-id: 84fee91a53f6112fa751e41d8aae9b10d40ff8e0 [formerly ee57b63a0c]
Former-commit-id: 32d5f7d347
2012-06-29 13:01:42 -05:00
David Gillingham
59a1fd31ad Issue #826: Fix TCG and Warning decoders to properly respect ALLOW_ARCHIVE_DATA env variable, fix broken GFE
VTEC notification route.

Change-Id: I48550b9023cc7f251462f0c6620cff352f4512be

Former-commit-id: c4a50f8c5c [formerly fceb86f7be] [formerly 151515b52d] [formerly 1df1bbbf9e [formerly 151515b52d [formerly 151a2069e3bf46f08bc636cf1bd4974b07e65da3]]]
Former-commit-id: 1df1bbbf9e
Former-commit-id: 11ddddea4db6888213f88fbddb369334ac49508c [formerly 617400bc30]
Former-commit-id: 54fa9ad78e
2012-06-29 10:25:09 -05:00
Nate Jensen
b98cc05c01 Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702

Former-commit-id: 314910c88f [formerly eb2c21c15d] [formerly 315594cab4] [formerly 24b40c3392 [formerly 315594cab4 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]
Former-commit-id: 24b40c3392
Former-commit-id: d2911501fc67a32eb2a016f4d84e1503e130e670 [formerly d125185d28]
Former-commit-id: 11f01325e5
2012-06-28 17:57:17 -05:00
Nate Jensen
10c615009b Issue #716 only print mergetool message if it's not set
Change-Id: I7a2e56e58dff3b6b2dcc65a734767d2c707882b8

Former-commit-id: d3d4109e09 [formerly 566280332f] [formerly 76382d8ccd] [formerly 1e761b6716 [formerly 76382d8ccd [formerly d3e7ea521c17f091b37d07f877c728fdb616c4a9]]]
Former-commit-id: 1e761b6716
Former-commit-id: 0a02e42361dc5d52e043e21e521eff50044aa590 [formerly 3fe0f03307]
Former-commit-id: fb7755cc04
2012-06-28 16:16:26 -05:00
Max Schenkelberg
6ef03d0f02 Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: f0f4ad8039 [formerly e1d23a56a9] [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 62bd4a667a [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 034844bd3b9932f93968553e4d47a01992315f8b [formerly 9328717a1a]
Former-commit-id: 544ffdc4ca
2012-06-28 15:29:05 -05:00
Nate Jensen
94d49f9d61 Merge "Issue #821 Fixed editor menu so plugin.xml action contribution items are created every time the menu is shown to make sure any submenus are recreated in the action." into development
Former-commit-id: d45000e600 [formerly 6dcea3d733] [formerly ed08428483] [formerly 24a4ef99a7 [formerly ed08428483 [formerly 41f21e357b6aacc42ff01a93a85f50c68c2c890b]]]
Former-commit-id: 24a4ef99a7
Former-commit-id: 85074a0067f786009e6363ac6c5af480fe9c6d6e [formerly afd37ef8b8]
Former-commit-id: b56d23d072
2012-06-28 14:16:28 -05:00
Ben Steffensmeier
0e3a60ff34 Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: a93f42b3ec [formerly b7326d0979] [formerly 79ba6c2cd5] [formerly 6f2e2b2cea [formerly 79ba6c2cd5 [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: e840f22756ff0b76e4cec15c0dc672b7efda26dc [formerly 1513500d7b]
Former-commit-id: 7238645490
2012-06-28 14:07:48 -05:00
Ben Steffensmeier
3fa351fb39 Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: f9e9d6d938 [formerly e3c0387f6e] [formerly 02e2c7b579] [formerly 881896c21b [formerly 02e2c7b579 [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]
Former-commit-id: 881896c21b
Former-commit-id: 6b4ac8ca33a3ba829b9cd0a5317eb13bdf0c6f14 [formerly b0f5013c7c]
Former-commit-id: 8a86a66376
2012-06-28 13:58:29 -05:00
Max Schenkelberg
e0ab853ca7 Issue #821 Fixed editor menu so plugin.xml action contribution items
are created every time the menu is shown to make sure any submenus are
recreated in the action.

Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382

Former-commit-id: 4b91c8e169 [formerly 53fd2ec047] [formerly 84ae717563] [formerly 668838364d [formerly 84ae717563 [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]
Former-commit-id: 668838364d
Former-commit-id: 42947fd159b2be8315aff7a6c8c72bf8a602e2ec [formerly e3524fd4df]
Former-commit-id: f1eb4b4713
2012-06-28 11:53:21 -05:00
Bryan Kowal
ae096aef72 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71]
Former-commit-id: 3010c15a2a
2012-06-27 18:38:19 -05:00
Bryan Kowal
dfd75b4c72 Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]
Former-commit-id: b4917e6708
2012-06-27 17:21:48 -05:00
Bryan Kowal
6d52b70048 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: 466046f605 [formerly 1e06e23eca] [formerly f7d19019a9] [formerly 98fdfa6f37 [formerly f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 14cc9da242f45d7762d577e57cd1819ba0d08184 [formerly 5874255a05]
Former-commit-id: fca7bf5b45
2012-06-27 16:22:53 -05:00
Bryan Kowal
84d7454642 12.6.1-10 baseline
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 687c8e9968 [formerly 072c88b382] [formerly 5ac91b91fcb594d713bdee32b81fc6426121c541 [formerly 4a17650914]] [formerly 53e5b7c491 [formerly 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]
Former-commit-id: 53e5b7c491
Former-commit-id: cff125fdb6dd2f2050f98afac20ca59352640221 [formerly 62c7de6d3b]
Former-commit-id: 6d2ca51c52
2012-06-27 15:04:34 -05:00
David Gillingham
1c0cd7cf5b Issue #810: turn off Wes2Bridge archiver by default
Change-Id: I1974b81e73b2daab48947d2a44dc9072aba459af

Former-commit-id: b47204fd7e [formerly 89f47d55a4] [formerly 1ddd687bc8] [formerly 12b2403627 [formerly 1ddd687bc8 [formerly ff97ae48126d906463a4a1063782fa3f154fdeeb]]]
Former-commit-id: 12b2403627
Former-commit-id: 6373962d3989fb5cb64576084bda88fbcbd5d671 [formerly 131472c289]
Former-commit-id: 1aff13b76f
2012-06-26 17:58:21 -05:00
David Gillingham
716ad16f90 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 4a32c3b1f1 [formerly 768afb8423] [formerly 2a0ffc5311] [formerly 672d7a2c31 [formerly 2a0ffc5311 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]]
Former-commit-id: 672d7a2c31
Former-commit-id: 75363efdd4a4ca39dfe3ce786fd71a0d72dd5a83 [formerly 235cf57de8]
Former-commit-id: ca54365f87
2012-06-26 17:49:06 -05:00
Brad Gonzales
b202cefa82 Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: 65e32b50e0 [formerly bfc4e1da3c] [formerly c00fb6f089] [formerly c99fa8db33 [formerly c00fb6f089 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]]]
Former-commit-id: c99fa8db33
Former-commit-id: a69a3a9f7d4e5482252a072cd5843c979857c060 [formerly a289b1f008]
Former-commit-id: 2e4c8e88a6
2012-06-26 15:41:14 -05:00
Nate Jensen
344e04b962 Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: d361775776 [formerly 4a389da950] [formerly cfc56f670a] [formerly ab86141e2f [formerly cfc56f670a [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]]
Former-commit-id: ab86141e2f
Former-commit-id: f6e9a24cf415a9e912b0a94cf737d57aaa5039cd [formerly 5ada671511]
Former-commit-id: f90897dc5d
2012-06-26 13:21:49 -05:00
Bryan Kowal
04332dd0ac Issue #704 - update build.properties files for python.
Former-commit-id: 0736ffbf58 [formerly 70b71ec2e3] [formerly dda06c5d8e] [formerly b1a1448256 [formerly dda06c5d8e [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]]
Former-commit-id: b1a1448256
Former-commit-id: 2181604602e3c2db7a4739c25de8ff8888862ef0 [formerly ef557a1fdb]
Former-commit-id: a122cd2458
2012-06-26 10:26:29 -05:00
Nate Jensen
5b535efab9 Merge "Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic." into development
Former-commit-id: d82d9475ae [formerly 41e3543148] [formerly 0f77b9cfbc] [formerly 61b0394381 [formerly 0f77b9cfbc [formerly 2eab85ae7e6ad05e549b173fd026f22b61e8e8a7]]]
Former-commit-id: 61b0394381
Former-commit-id: 85c7091c18b534448a63d2ab758b98ef26e11290 [formerly 1899a9ccc3]
Former-commit-id: c1a216d2f7
2012-06-26 10:24:17 -05:00
Bryan Kowal
48aebbbbf1 Issue #800 - fix build.properties.
Former-commit-id: 757b2d295e [formerly 089710a432] [formerly 0ec62da46e] [formerly 670c7cabb4 [formerly 0ec62da46e [formerly 914838d805b01754cf5947eaa7196b148d2738b5]]]
Former-commit-id: 670c7cabb4
Former-commit-id: d8584c85fac37ae0fe518f642c3eac7844c6af3d [formerly 7ce152ebd8]
Former-commit-id: c35a341f45
2012-06-26 09:42:20 -05:00
Bryan Kowal
eda6ee2ef1 Issue #704 - fix build.properties files.
Former-commit-id: 9f49526e21 [formerly 73d4ec0bfb] [formerly cc1ac5fd2f] [formerly 1e5c9ef92d [formerly cc1ac5fd2f [formerly 7130431b6e279db1c5ed550e0ce42c5fdf4238f1]]]
Former-commit-id: 1e5c9ef92d
Former-commit-id: 00a51ed4e5fc8d8abd126ca8d25f70e14a3b77c6 [formerly b84a44c26b]
Former-commit-id: a1c4fe961a
2012-06-25 16:50:11 -05:00
Lee Venable
bc00de5bce Merge "Issue #666 fixed ncep ovelay resources so recylce works properly" into development
Former-commit-id: 524ac4b16a [formerly 727c5f832c] [formerly 4f6a67ae6e] [formerly 175651d6c5 [formerly 4f6a67ae6e [formerly 536549ae3f5ad1d8b73289f3838d20fc654439aa]]]
Former-commit-id: 175651d6c5
Former-commit-id: ed65ad02a2ebcf15585f6019598f85424882e39d [formerly ca9cf045b5]
Former-commit-id: fea6b9b24d
2012-06-25 15:49:00 -05:00
Ben Steffensmeier
5851764a0f Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 562f0c0dbe [formerly 0855e117cb] [formerly 682edec2cf] [formerly 603d48a017 [formerly 682edec2cf [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]]
Former-commit-id: 603d48a017
Former-commit-id: 1cc4504c383651a63fdc712bd73f5f9ec0ce2e1a [formerly 7ea36122f2]
Former-commit-id: 745b2cd722
2012-06-25 15:22:35 -05:00
Lee Venable
dcae4d93be Merge "Issue #704 fixes to plots/MPE to work better in KML" into development
Former-commit-id: c36061e603 [formerly 12d44ca942] [formerly 8d0f2ae671] [formerly 97b5d9ccea [formerly 8d0f2ae671 [formerly 5ac36fa40f250c4ee856190ac51eea82e68623bb]]]
Former-commit-id: 97b5d9ccea
Former-commit-id: dab0ffad3dc7ce65e4975f4e871104c44e63b572 [formerly 073e1b7fd3]
Former-commit-id: 5f6ce95e29
2012-06-25 15:04:00 -05:00
Max Schenkelberg
d69daee0b5 Issue #666 fixed ncep ovelay resources so recylce works properly
Change-Id: Iedde396d06a86760c1871362b36c08bc3185e27e

Former-commit-id: e2f559b186 [formerly 7053ac6cf9] [formerly 4eee60d5bc] [formerly 7e114e008b [formerly 4eee60d5bc [formerly 1eea078927b999eea1891b56bd2a85ae6044d99f]]]
Former-commit-id: 7e114e008b
Former-commit-id: 25993b86134e9549f49bd7b212a56fc1d47342fa [formerly fe44eaac64]
Former-commit-id: 39b3f85641
2012-06-25 13:17:02 -05:00
Ben Steffensmeier
91dce6f33f Issue #704 fixes to plots/MPE to work better in KML
Former-commit-id: 8111154819 [formerly 2b6e1fa5b6] [formerly 32627cf132] [formerly b01be5085f [formerly 32627cf132 [formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]]
Former-commit-id: b01be5085f
Former-commit-id: 3073c0697a9f0f65fba46a4e3597e79d8029d881 [formerly 67ba3ee6f6]
Former-commit-id: 8517eafdf4
2012-06-22 17:54:31 -05:00
Brad Gonzales
f607efce25 Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly bef2bfa7cc [formerly 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]]
Former-commit-id: bef2bfa7cc
Former-commit-id: b4f9d3dbf97343266eff5cc9488bbf4ee621cb1f [formerly 23ede5fa7b]
Former-commit-id: be195ab805
2012-06-22 15:08:40 -05:00