Dustin Johnson
|
c6dbe1bc0c
|
Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234]
Former-commit-id: 6d21c445c2
|
2012-11-14 14:41:57 -06:00 |
|
Steve Harris
|
ccb16b9b44
|
12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
|
2012-11-14 14:19:20 -06:00 |
|
Ben Steffensmeier
|
88ccafacce
|
Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 069028be40 [formerly 47759f025b] [formerly 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6]]
Former-commit-id: e4d04345db41c59b5fd45edf11fdb36401df1850 [formerly 84abe4fa4f]
Former-commit-id: e57c669f2e
|
2012-11-14 12:22:53 -06:00 |
|
Ben Steffensmeier
|
8399158199
|
Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]]
Former-commit-id: fbed67a208
Former-commit-id: b664a9e649 [formerly d75b59622a] [formerly b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6]]
Former-commit-id: fe88c86a07e948a680250c58c72bfa9ef94a60ca [formerly 40a07f8998]
Former-commit-id: 35b855635f
|
2012-11-08 14:34:55 -06:00 |
|
Dustin Johnson
|
eb82c7672b
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
|
2012-11-08 09:57:16 -06:00 |
|
Steve Harris
|
94cd5a1388
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
|
2012-11-07 12:41:20 -06:00 |
|
Dustin Johnson
|
4bc4d95b21
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
|
2012-11-01 13:36:06 -05:00 |
|
Richard Peter
|
0f2e6c97fe
|
Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: b2989eb90f [formerly 5787d6278d] [formerly 275398778f] [formerly b2989eb90f [formerly 5787d6278d] [formerly 275398778f] [formerly 886375172b [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]]]
Former-commit-id: 886375172b
Former-commit-id: 44b6afb10a [formerly 998278caf7] [formerly 3ba6f5a7f032d4b04a9f1b4905d76eb04a5920a4 [formerly bd1d87363a]]
Former-commit-id: 3ec2c0f1f1a74b387da0ad28f03a1512c353c3f8 [formerly 940d986f6d]
Former-commit-id: 7df04375f1
|
2012-10-31 18:19:44 -05:00 |
|
Ben Steffensmeier
|
3e225faa8b
|
merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 0ee5726a56 [formerly 1d94435220] [formerly e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]]
Former-commit-id: 51550491838571c9141b390aa875633f1c0b19a4 [formerly 38b0dafe0b]
Former-commit-id: 1931b503a2
|
2012-10-30 12:24:54 -05:00 |
|
Ben Steffensmeier
|
84ee3cecaa
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61]
Former-commit-id: 86562637f0
|
2012-10-25 12:22:11 -05:00 |
|
Ben Steffensmeier
|
e54800b299
|
Issue #189 modify nsharp to use grid data.
Former-commit-id: ed69bb3056 [formerly 190e27205c] [formerly 52c37c114a] [formerly ed69bb3056 [formerly 190e27205c] [formerly 52c37c114a] [formerly db1efee514 [formerly 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]]]
Former-commit-id: db1efee514
Former-commit-id: 4e23c22262 [formerly 525fbd457b] [formerly 71ee5529caf13280126c3faa03641d031c6db9a7 [formerly b9cd33b79b]]
Former-commit-id: 12bb661225b5687cd685be940f2cd591b147fda6 [formerly 3f608d0843]
Former-commit-id: 1db5421cd7
|
2012-10-24 13:07:41 -05:00 |
|
Steve Harris
|
92be4d5105
|
12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c]
Former-commit-id: 13cdd55545
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Richard Peter
|
695869ce5b
|
Issue #1257: Fix NSharp point retrieval
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4
Former-commit-id: c3961853ba [formerly ca878b536f] [formerly 25fe0aef5b] [formerly c3961853ba [formerly ca878b536f] [formerly 25fe0aef5b] [formerly 3fa2a8b894 [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]]]
Former-commit-id: 3fa2a8b894
Former-commit-id: 6185a78fec [formerly 13bffbc202] [formerly 9953f61860789b9448d8609f799d6617079d6167 [formerly d434d967dd]]
Former-commit-id: b627e06233b12e82e53271f30a0f602ac3a5fba8 [formerly a8b4b8ac8b]
Former-commit-id: dd0b4bae3d
|
2012-10-15 19:40:20 -05:00 |
|
Richard Peter
|
9c9e23d8a2
|
Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f
Former-commit-id: 202c7b885e [formerly 12bcfbda80] [formerly ca0c9b7502] [formerly 202c7b885e [formerly 12bcfbda80] [formerly ca0c9b7502] [formerly bcb0560291 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]]
Former-commit-id: bcb0560291
Former-commit-id: 6c0bfb9858 [formerly 46870808e0] [formerly a9406efb61625c7381ceb47856f2fa57a257622d [formerly ce85c8e1a6]]
Former-commit-id: cc07adda4c70d3d12938f64d2565a522222ba657 [formerly 881582885c]
Former-commit-id: 61892fee88
|
2012-10-15 09:52:14 -05:00 |
|
Ben Steffensmeier
|
51d1c03c36
|
Merge branch 'ss_builds' into Unified_Grid
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
|
2012-10-12 12:45:50 -05:00 |
|
Ben Steffensmeier
|
b0b69f3ac8
|
Issue #1217 commit code from Ncep to fix the problem
Former-commit-id: ca08938dbb [formerly 71704d7298] [formerly d566733aae] [formerly ca08938dbb [formerly 71704d7298] [formerly d566733aae] [formerly bb7b9d18e0 [formerly d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]]]]
Former-commit-id: bb7b9d18e0
Former-commit-id: cb49001901 [formerly 4da0a25cfb] [formerly 2ec55cc9a61cacc71d429ddf935ef1b3bc14bc11 [formerly 75d1e65c29]]
Former-commit-id: 9a2c7f6adc332173f6454404c0637806022a5d7d [formerly 18e2457845]
Former-commit-id: d4de806443
|
2012-10-09 16:20:39 -05:00 |
|
Ben Steffensmeier
|
907dfd4141
|
Issue #1131 merge latest changes to nsharp from ncep
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320
Former-commit-id: 53024843e6 [formerly 95f23ebe70] [formerly b266c68be3] [formerly 53024843e6 [formerly 95f23ebe70] [formerly b266c68be3] [formerly 01a13dee33 [formerly b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]]]]
Former-commit-id: 01a13dee33
Former-commit-id: 5db7179015 [formerly a11df022cf] [formerly 72c17846701edfb3c6dba4f2a7886e2bba0634d9 [formerly c367592b02]]
Former-commit-id: 404fec31a0b742a08b2eba8a4322bef6f83c8c9d [formerly 642f58ca49]
Former-commit-id: 54f592bf89
|
2012-09-28 15:35:11 -05:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Ben Steffensmeier
|
4dec69329a
|
Issue #1213 update nsharp resources to clear target on dispose.
Former-commit-id: 6594ab0fbf [formerly cfc9e5e78c] [formerly 60ca8a3011] [formerly 6594ab0fbf [formerly cfc9e5e78c] [formerly 60ca8a3011] [formerly 752a0078d4 [formerly 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]]]]
Former-commit-id: 752a0078d4
Former-commit-id: 1aba06d15a [formerly b4be61cead] [formerly 9774aad7fe69585f7286f46b443de05cc8c6a51e [formerly 1df5ee74aa]]
Former-commit-id: a11e8248006420fc2cc07b4a864e33b3aff746d2 [formerly 190f0754fb]
Former-commit-id: 610515500d
|
2012-09-25 10:54:57 -05:00 |
|
Ben Steffensmeier
|
2c73e5a2d3
|
Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly 2606f968cb [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]]]
Former-commit-id: 2606f968cb
Former-commit-id: 81b569a8f8 [formerly b83ca44d6b] [formerly ffd63f3c9e74adbc96cb48f93c0afa5f9de5a89a [formerly 036aa08f2c]]
Former-commit-id: 2196697644a1958a810f83bd43efdccc96f18efc [formerly 8fc544b44f]
Former-commit-id: c43b7c1dd7
|
2012-09-20 17:28:54 -05:00 |
|
Ben Steffensmeier
|
f13ba32307
|
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]]
Former-commit-id: 05849f634d
Former-commit-id: 6af74b843c [formerly 6b058ace34] [formerly 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]]
Former-commit-id: f3894ca9c56c5ba2f1f317fbf84aa3eceec77726 [formerly a28984c40c]
Former-commit-id: 9509d72ef9
|
2012-09-18 15:19:05 -05:00 |
|
Max Schenkelberg
|
6b5b4197a0
|
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 1e81c703f1 [formerly 52e812ec0e] [formerly 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]]
Former-commit-id: 0f1fad1da8c7a5d1787cda72eb269efb5b9cde6d [formerly 1badd11cdb]
Former-commit-id: fbc35a39d4
|
2012-09-11 16:27:41 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
46d05b60a1
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789]
Former-commit-id: f8e7459dfb
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
bc97cf788a
|
12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
7f13d82b95
|
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d]
Former-commit-id: 3f44e46a6f
|
2012-08-27 09:53:55 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Ben Steffensmeier
|
25e6e3adba
|
Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 8e971abbd8 [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]]]
Former-commit-id: 8e971abbd8
Former-commit-id: 89255891cc [formerly f6e7d795f9] [formerly a03fb3fc1578ffe96414fa4161300406218521d7 [formerly 2c5cfe6d98]]
Former-commit-id: e64790314b952168035c3cd21dd3de3e53fbe357 [formerly d9f68af5ad]
Former-commit-id: 322d74aab7
|
2012-08-17 16:16:20 -05:00 |
|
Steve Harris
|
31353e2296
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
dd62566e7c
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]]
Former-commit-id: a1071e3204
Former-commit-id: 9cce94e63a [formerly dbe07ca70c] [formerly c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]]
Former-commit-id: a822a26595a3bbeeeebb85b374d317db53bd3919 [formerly d507458b9b]
Former-commit-id: b62ac9c78e
|
2012-08-06 08:23:04 -05:00 |
|
Steve Harris
|
5d5bcddfd2
|
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628]
Former-commit-id: 078b4fff3c
|
2012-08-01 12:43:12 -05:00 |
|
Steve Harris
|
1098368e19
|
12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
|
2012-08-01 10:45:37 -05:00 |
|
Nate Jensen
|
bcc764dacf
|
Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64
Former-commit-id: 3db2a3fe6a [formerly 8539a075bb] [formerly ae7c427b4b] [formerly 3db2a3fe6a [formerly 8539a075bb] [formerly ae7c427b4b] [formerly 69f51e6e87 [formerly ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]]]
Former-commit-id: 69f51e6e87
Former-commit-id: ed7692a863 [formerly 9ca861b827] [formerly 76be324e1c5161d8977d3d5548eb7c51a3c3a8af [formerly 00bbb6c8a3]]
Former-commit-id: 25ff35bec05711927f8eae4ff9b442b281934ce9 [formerly eb9ce43883]
Former-commit-id: 27a8aefbf3
|
2012-07-31 10:02:39 -05:00 |
|
Nate Jensen
|
06b3b8368d
|
Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]]
Former-commit-id: 4a2841b287
Former-commit-id: 6d8ac0455e [formerly 7d478ac74c] [formerly 3ab4b622030a864dcf04c61605009347c3550e9a [formerly 8fa0eb70db]]
Former-commit-id: bc2d3c00a3e2d4d029b3e992acb5ae8618d96464 [formerly 04a7e5a8c0]
Former-commit-id: e1321b8bc9
|
2012-07-31 08:57:54 -05:00 |
|
Steve Harris
|
2e4db7ecaf
|
Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.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.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.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
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
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.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.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/com.raytheon.uf.edex.tafqueue.ecl
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/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26 [formerly 9e4df42326] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f]
Former-commit-id: 84d0f1fbb6
|
2012-07-27 14:44:44 -05:00 |
|
Steve Harris
|
23dc8deeb0
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
|
2012-07-19 16:20:40 -05:00 |
|
Bryan Kowal
|
0e31c23ec4
|
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 ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]]
Former-commit-id: 3b7c761f99
Former-commit-id: e07c3c20b5 [formerly 470511d9a3] [formerly 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]]
Former-commit-id: 281f96fab761d65add6971c8397918fee705ea1a [formerly f64ce786e2]
Former-commit-id: 7077599e8d
|
2012-07-11 12:44:32 -05:00 |
|
Steve Harris
|
461e720c3e
|
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 a456af38fa [formerly 8fff0d7e53] [formerly 479ccdbed2] [formerly 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]]
Former-commit-id: 9454393d13
Former-commit-id: 1e747f0a42 [formerly 45ac1d4d51] [formerly 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174]]
Former-commit-id: fd07c26e5ac59302fff491238a67bd3c1240158d [formerly 19475ea67b]
Former-commit-id: 1d367f861a
|
2012-07-10 09:29:33 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Nate Jensen
|
7cf94a99a7
|
Issue #666 fix for ncep metars to share correctly in collaboration session
Change-Id: I829eea313b5870d3df551f9b5224d178528412ae
Former-commit-id: 266af8fac1 [formerly f1a37857b6] [formerly ad2c9b5d3b] [formerly 266af8fac1 [formerly f1a37857b6] [formerly ad2c9b5d3b] [formerly 0b6b48222c [formerly ad2c9b5d3b [formerly b4de13af62ea179577e9dc799c3174d4ce7bd21b]]]]
Former-commit-id: 0b6b48222c
Former-commit-id: d360e0856e [formerly e634eaf84b] [formerly 78534b2d818f47c8e2eaa625af3e867c3e4c822d [formerly 04254cada4]]
Former-commit-id: b9251d335801e985e822a150f896ee96724540ff [formerly bbe37540ef]
Former-commit-id: d396c0d341
|
2012-07-03 13:38:31 -05:00 |
|
David Gillingham
|
f8acfde27e
|
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 d54d8a51ff [formerly aa0ba41cf9] [formerly 3fffc47ba5] [formerly abdcc32b2c [formerly 3fffc47ba5 [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]]]
Former-commit-id: abdcc32b2c
Former-commit-id: 5f1773bc2e [formerly 32d5f7d347] [formerly 84fee91a53f6112fa751e41d8aae9b10d40ff8e0 [formerly ee57b63a0c]]
Former-commit-id: 9f3b1f781fc6fcb797d69e285bb8a5a0f79324bf [formerly 4b2e1f9f23]
Former-commit-id: 19b62a3711
|
2012-06-29 13:01:42 -05:00 |
|
Bryan Kowal
|
e05b247e3b
|
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 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
|
2012-06-27 17:21:48 -05:00 |
|
Bryan Kowal
|
0a831eac6c
|
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 466046f605 [formerly 1e06e23eca] [formerly f7d19019a9] [formerly 98fdfa6f37 [formerly f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 6d52b70048 [formerly fca7bf5b45] [formerly 14cc9da242f45d7762d577e57cd1819ba0d08184 [formerly 5874255a05]]
Former-commit-id: 650eaadb877692d07a1f2570ef156c89bb187e9d [formerly 2ea8bed91e]
Former-commit-id: 4fb7e68f4b
|
2012-06-27 16:22:53 -05:00 |
|
Bryan Kowal
|
f21e18aaa1
|
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 4a17650914] [formerly 687c8e9968 [formerly 072c88b382] [formerly 4a17650914] [formerly 53e5b7c491 [formerly 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 84d7454642 [formerly 6d2ca51c52] [formerly cff125fdb6dd2f2050f98afac20ca59352640221 [formerly 62c7de6d3b]]
Former-commit-id: cb7d3ce5625e79bff6eb725517fbfb48c3c44620 [formerly 718062f386]
Former-commit-id: ee40decf54
|
2012-06-27 15:04:34 -05:00 |
|
Brad Gonzales
|
34af88f6f6
|
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 65e32b50e0 [formerly bfc4e1da3c] [formerly c00fb6f089] [formerly c99fa8db33 [formerly c00fb6f089 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]]]]
Former-commit-id: c99fa8db33
Former-commit-id: b202cefa82 [formerly 2e4c8e88a6] [formerly a69a3a9f7d4e5482252a072cd5843c979857c060 [formerly a289b1f008]]
Former-commit-id: 681a860da5021457f92691c5ef0ce36e35c6a18b [formerly c7b518803f]
Former-commit-id: c0a73511e5
|
2012-06-26 15:41:14 -05:00 |
|
Nate Jensen
|
b554fb3ba4
|
Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: d361775776 [formerly 4a389da950] [formerly cfc56f670a] [formerly d361775776 [formerly 4a389da950] [formerly cfc56f670a] [formerly ab86141e2f [formerly cfc56f670a [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]]]
Former-commit-id: ab86141e2f
Former-commit-id: 344e04b962 [formerly f90897dc5d] [formerly f6e9a24cf415a9e912b0a94cf737d57aaa5039cd [formerly 5ada671511]]
Former-commit-id: 0bdca8a98736e99702bb0e311c8e848f5aab65ee [formerly 3c7a10a698]
Former-commit-id: 06bb6ef640
|
2012-06-26 13:21:49 -05:00 |
|
Bryan Kowal
|
01f5fcf1dc
|
Issue #704 - update build.properties files for python.
Former-commit-id: 0736ffbf58 [formerly 70b71ec2e3] [formerly dda06c5d8e] [formerly 0736ffbf58 [formerly 70b71ec2e3] [formerly dda06c5d8e] [formerly b1a1448256 [formerly dda06c5d8e [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]]]
Former-commit-id: b1a1448256
Former-commit-id: 04332dd0ac [formerly a122cd2458] [formerly 2181604602e3c2db7a4739c25de8ff8888862ef0 [formerly ef557a1fdb]]
Former-commit-id: 253c3539edb7a378876896d07853c38cbc7c24d1 [formerly 6fd5f9303d]
Former-commit-id: bc580915da
|
2012-06-26 10:26:29 -05:00 |
|
Max Schenkelberg
|
77d6f07cd5
|
Issue #666 fixed ncep ovelay resources so recylce works properly
Change-Id: Iedde396d06a86760c1871362b36c08bc3185e27e
Former-commit-id: e2f559b186 [formerly 7053ac6cf9] [formerly 4eee60d5bc] [formerly e2f559b186 [formerly 7053ac6cf9] [formerly 4eee60d5bc] [formerly 7e114e008b [formerly 4eee60d5bc [formerly 1eea078927b999eea1891b56bd2a85ae6044d99f]]]]
Former-commit-id: 7e114e008b
Former-commit-id: d69daee0b5 [formerly 39b3f85641] [formerly 25993b86134e9549f49bd7b212a56fc1d47342fa [formerly fe44eaac64]]
Former-commit-id: 7b5b153216dccc04b1e9c815818ab7117ebd60d1 [formerly ede1c4126d]
Former-commit-id: 2cf0a3fca4
|
2012-06-25 13:17:02 -05:00 |
|
Brad Gonzales
|
72ecbdf701
|
Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly 8c008a7a2c [formerly b0c29466de] [formerly 3799026523] [formerly bef2bfa7cc [formerly 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]]]
Former-commit-id: bef2bfa7cc
Former-commit-id: f607efce25 [formerly be195ab805] [formerly b4f9d3dbf97343266eff5cc9488bbf4ee621cb1f [formerly 23ede5fa7b]]
Former-commit-id: eb6582678c91dbf7b3c2eec91e02dbee47158e20 [formerly 7f0f751018]
Former-commit-id: faa1ca2995
|
2012-06-22 15:08:40 -05:00 |
|