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

2238 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Kowal
01d571a088 Issue #1750 - include the qpidd service script in the rpm installations 
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: c3936dd50e [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]
Former-commit-id: 21fa510eaa
Former-commit-id: db39a45c88
 2013-03-25 16:52:33 -05:00
Richard Peter
bcb5b0b73e Merge "Issue #1802 Refactored DD transaction management" into development 
Former-commit-id: c3268aa02c [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]
Former-commit-id: 5c92140024
Former-commit-id: 351f08dba3
 2013-03-25 15:37:18 -05:00
Bryan Kowal
e41f926ac2 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode. 
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 9e647beded [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]
Former-commit-id: 6758a9a50d
Former-commit-id: 4c02dabb3d
 2013-03-25 15:23:32 -05:00
Bryan Kowal
99a3e25b3d Issue #1661 - yajsw will now log to both the console and log file indefinitely 
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: c55efaadb0 [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]
Former-commit-id: a6cd17feeb
Former-commit-id: c4cec34e47
 2013-03-25 15:23:31 -05:00
Benjamin Phillippe
c250bda12b Issue #1802 Refactored DD transaction management 
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: b10b1150be [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]
Former-commit-id: af05feb5a7
Former-commit-id: 4d1a8805ab
 2013-03-25 15:15:38 -05:00
Richard Peter
fecf49708c Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development 
Former-commit-id: 7b8931ed16 [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]
Former-commit-id: 3239c176fa
Former-commit-id: 911a371329
 2013-03-25 14:45:06 -05:00
Richard Peter
66a28e9315 Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development 
Former-commit-id: 1b7e9e41ce [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]
Former-commit-id: 3de0400969
Former-commit-id: 50254dc8d1
 2013-03-22 16:26:52 -05:00
Dustin Johnson
dcc7e44250 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development 
Former-commit-id: dcfbb43eb3 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]
Former-commit-id: 8651ca3d76
Former-commit-id: 0596d43d99
 2013-03-22 15:28:57 -05:00
Dustin Johnson
e4c51bad63 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development 
Former-commit-id: 11478e870d [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]
Former-commit-id: ed017996a0
Former-commit-id: 9e63142576
 2013-03-22 15:28:20 -05:00
Max Schenkelberg
34134b3c62 Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe. 
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: ea26d0de84 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
 2013-03-22 10:54:44 -05:00
Dustin Johnson
e39187c0ce Issue #1815 Move DD phase3 code to 5-Data_Delivery 
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 8956d1ac17 [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 1b1bd69b89
 2013-03-22 10:04:21 -05:00
Richard Peter
1cb743c14a Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client 
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 9fdeb37a48 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: 704bc86cf5
 2013-03-21 18:21:53 -05:00
Nate Jensen
4a8974e6a0 Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development 
Former-commit-id: e4c1e86d55 [formerly e4c1e86d55 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]
Former-commit-id: 44f8ba8943
Former-commit-id: 84e8a30ad7
 2013-03-21 17:06:37 -05:00
Dustin Johnson
0f4ec00790 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription 
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: f8870c8946 [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]
Former-commit-id: c4d4e37cad
Former-commit-id: d58306a92e
 2013-03-21 16:14:49 -05:00
Nate Jensen
5d0194d7a3 Merge "Issue #1808 perspective specific actions take priority" into development 
Former-commit-id: d6d7b081cf [formerly d6d7b081cf [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]
Former-commit-id: 255b2dbd29
Former-commit-id: 7821b86e87
 2013-03-21 15:07:57 -05:00
Greg Armendariz
559136f546 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development 
Former-commit-id: 6af1a22e56 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]
Former-commit-id: 85113a66b6
Former-commit-id: ccabddace6
 2013-03-21 12:55:59 -05:00
Dustin Johnson
c23347b58d Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development 
Former-commit-id: 54bbf500de [formerly 54bbf500de [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]
Former-commit-id: c2373812bd
Former-commit-id: b822c6398f
 2013-03-21 12:35:40 -05:00
Dustin Johnson
67f055ca39 Issue #1794 Use a queue to hold ncf retrieval transfers 
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: b29eb94780 [formerly b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]
Former-commit-id: ebce91c15d
Former-commit-id: c88d9dd6cf
 2013-03-21 12:28:00 -05:00
Bryan Kowal
6e9c94566c Issue #1750 - add clean scriptlet to pgadmin3 rpm specification 
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 4e37fa6627 [formerly 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]]
Former-commit-id: 5b15c6fcaa
Former-commit-id: 8141f49211
 2013-03-21 10:04:29 -05:00
Bryan Kowal
5ca46505e0 Issue #1663 - awips2-database will no longer install site-specific databases. 
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: ab135933da [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]
Former-commit-id: 722d068105
Former-commit-id: 5ab931d15e
 2013-03-21 09:50:48 -05:00
Max Schenkelberg
5175c821bd Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator. 
Amend: Added header comments and more unused code

Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686

Former-commit-id: b2e374c7fb [formerly b2e374c7fb [formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]
Former-commit-id: 5109641194
Former-commit-id: 21b8c130c2
 2013-03-20 17:38:02 -05:00
Bryan Kowal
5eae24b949 Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development 
Former-commit-id: 0479eb0cc1 [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]
Former-commit-id: 3baebb684b
Former-commit-id: 374bd51fb0
 2013-03-20 16:53:18 -05:00
Nate Jensen
54e7989366 Issue #1808 perspective specific actions take priority 
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072

Former-commit-id: c1ddc02b10 [formerly c1ddc02b10 [formerly d69f2087948a54618c6f22878d575b6760950909]]
Former-commit-id: de3aea9afb
Former-commit-id: a5f4b4f0ad
 2013-03-20 16:27:31 -05:00
Steve Harris
a91fcf98a2 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e2496455b2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
 2013-03-20 16:09:26 -05:00
Steve Harris
8065161896 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: fa15f03e1b [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
 2013-03-20 16:06:20 -05:00
Steve Harris
f2cc967a4f 13.3.1-10 baseline 
Former-commit-id: 073687d9a9 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
 2013-03-20 15:53:01 -05:00
Max Schenkelberg
924e27f51f Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE. 
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: c6db3ce43b [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 2e10fd83f6
 2013-03-20 14:10:52 -05:00
Steve Harris
6d4512fa3a Merge branch 'omaha_13.3.1' into development 
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 36df63be5c [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]
Former-commit-id: cb5ea76f98
Former-commit-id: 104e6e79e8
 2013-03-20 13:45:11 -05:00
Richard Peter
ff1b1598e6 Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1 
Former-commit-id: 3b8e2ff0d3 [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]
Former-commit-id: adbe7b91cc
Former-commit-id: 3bad342dca
 2013-03-20 13:32:33 -05:00
Ben Steffensmeier
57d19b0d66 Issue #1804 Remove empty data structures from radar hdf5. 
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: ee7204c05c [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]
Former-commit-id: 82499f839d
Former-commit-id: 3e2a41d1d2
 2013-03-20 13:26:33 -05:00
Dustin Johnson
4481b1e830 Merge "Issue #1796 updated some headers, general cleanup" into development 
Former-commit-id: e5bcff21cb [formerly e5bcff21cb [formerly 327283da3d779b976d1fdc118c74f00047d79062]]
Former-commit-id: e7bfdebd41
Former-commit-id: e3f3ce2773
 2013-03-20 13:17:10 -05:00
Ben Steffensmeier
498d153e40 Issue #1804 Switch bzip2 cots package to jbzip2. 
Former-commit-id: 2b6aa86371 [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: ed544fc17c
Former-commit-id: 646b61f653
 2013-03-20 13:05:54 -05:00
Dave Hladky
8299b2872a Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: 90f7f2110b [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
 2013-03-20 12:41:33 -05:00
Dave Hladky
7046f31351 Issue #1796 updated some headers, general cleanup 
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 5362771743 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]
Former-commit-id: 38494cec16
Former-commit-id: 8a46d43216
 2013-03-20 12:17:08 -05:00
Richard Peter
b07fe81ec7 Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development 
Former-commit-id: 15c2a0af44 [formerly 15c2a0af44 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]]
Former-commit-id: 4ffeeded42
Former-commit-id: a96ae13475
 2013-03-20 10:01:51 -05:00
Greg Armendariz
f524f52f0b Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development 
Former-commit-id: 65e9035d82 [formerly 65e9035d82 [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]]
Former-commit-id: 82af4a9f5c
Former-commit-id: 7943b05ea6
 2013-03-20 09:55:49 -05:00
Dave Hladky
87728badf5 Issue #1796 Fixed the test 
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: d9078b438a [formerly d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]
Former-commit-id: b4eb7b17a9
Former-commit-id: b43c821a33
 2013-03-19 17:22:00 -05:00
Roger Ferrel
71834c493c Issue #1807 Change DbQueryHandler to include order by informaton in the query. 
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: b32ac22ef8 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]
Former-commit-id: 4f889b6999
Former-commit-id: a838aa2d74
 2013-03-19 16:24:22 -05:00
David Gillingham
2e57b9f262 Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434. 
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 843f474af8 [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 5f8c8a80f8
 2013-03-19 16:06:25 -05:00
Richard Peter
6852771ec6 Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1 
Former-commit-id: 6046872ab5 [formerly 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]
Former-commit-id: a421cfe73e
Former-commit-id: cf395cfb39
 2013-03-19 15:34:36 -05:00
Steve Harris
65f522fc87 13.3.1-9 baseline 
Former-commit-id: 468ae82305 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
 2013-03-19 14:22:56 -05:00
Ben Steffensmeier
044eeebe97 Issue #1804 Cache db queries in radar decoder. 
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 7b83f6bdfa [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]
Former-commit-id: 5d2d834cf7
Former-commit-id: ff0e5696e8
 2013-03-19 14:11:36 -05:00
Bryan Kowal
cb78a6af53 Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base 
Former-commit-id: cbe9b30266 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]
Former-commit-id: 74b4bb0891
Former-commit-id: 7628860bfe
 2013-03-19 13:27:38 -05:00
Richard Peter
1bf2c48011 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1 
Former-commit-id: 4ce10bced9 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]
Former-commit-id: 3a92747518
Former-commit-id: c955b3b640
 2013-03-19 13:24:28 -05:00
Dustin Johnson
889953c712 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development 
Former-commit-id: 5b4035fb11 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 8363eba409
Former-commit-id: e0b6e6187e
 2013-03-19 13:09:48 -05:00
Dave Hladky
64f8c46e64 Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development! 
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: ddb23ae59f [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: f0244f54a4
 2013-03-19 13:08:14 -05:00
Mike Duff
144223ed9b Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen 
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: b115d3611c [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]
Former-commit-id: 058064ce0d
Former-commit-id: 7e66c8e46d
 2013-03-19 10:10:01 -05:00
Bryan Kowal
959e8b717f Issue #1805 - slightly modified viz feature build order 
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: f325038538 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]
Former-commit-id: f0eb7d3285
Former-commit-id: 54113e9b29
 2013-03-18 18:15:26 -05:00
Ben Steffensmeier
e176478c7a Issue #1804 Remove AlphanumericValues from radar HDF5. 
Former-commit-id: 6c741a9ab3 [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 86dffab17d
Former-commit-id: dfe8de96f2
 2013-03-18 17:16:44 -05:00
Steve Harris
22bb7ecd33 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b8f0635ad6 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
 2013-03-18 16:52:00 -05:00