Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Richard Peter
|
8af8fc4503
|
Issue #1421: Make hdf5 and database purge the same, update H5pyDataStore
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7
Former-commit-id: 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 548b521f3f [formerly 3d4fb31161] [formerly 513dd75a23] [formerly 08919e73c3 [formerly 513dd75a23 [formerly fb25e736d298225d217a1775891a65de7e0bd50c]]]]
Former-commit-id: 08919e73c3
Former-commit-id: bcf2592bf1 [formerly e2007e61e1] [formerly a2ffba67b6efe6ed162228db4c9f67b3e99a3233 [formerly f7859723e5]]
Former-commit-id: de55462bfcfa800aad684c68d8bbf0ac46a8ab9d [formerly bf19dcd216]
Former-commit-id: 9b15f27832
|
2012-12-13 11:02:07 -06:00 |
|
Steve Harris
|
25facfa9a7
|
12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]]
Former-commit-id: 28018b8d9b
Former-commit-id: d2da55254b [formerly 8a41d325d2] [formerly e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]]
Former-commit-id: b37b8565f1ec8f0e35f587d2337f734e0608c210 [formerly 8ada406bfe]
Former-commit-id: a10d7d3041
|
2012-12-06 09:12:15 -06:00 |
|
Ben Steffensmeier
|
b57a30d18d
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
|
2012-11-13 16:00:19 -06:00 |
|
Dustin Johnson
|
2a67e36e56
|
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 67e02347b5 [formerly 1220f5167e] [formerly ddaa681d8a] [formerly 67e02347b5 [formerly 1220f5167e] [formerly ddaa681d8a] [formerly 9784b563cf [formerly ddaa681d8a [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]]
Former-commit-id: 9784b563cf
Former-commit-id: 0eb86d565e [formerly d0867fedef] [formerly 4d6abc650d9441b7590743271c86e80abcff2657 [formerly 9bb53555a9]]
Former-commit-id: 4d8009edd28c60ab7a3978054089c3f8ebdd0b7f [formerly cd392c40bf]
Former-commit-id: 1ac34361b4
|
2012-11-08 12:00:15 -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 |
|
Max Schenkelberg
|
3a1cefc612
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863 [formerly 5a5bd522a1] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453]
Former-commit-id: 2345861756
|
2012-11-07 10:44:42 -06:00 |
|
Richard Peter
|
9eb6774757
|
Issue #1257: Fix Tropical Test Tool
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b
Former-commit-id: 76e97d7ab4 [formerly 449ad67f82] [formerly 45b25ead66] [formerly 76e97d7ab4 [formerly 449ad67f82] [formerly 45b25ead66] [formerly e3da5faf40 [formerly 45b25ead66 [formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]]]
Former-commit-id: e3da5faf40
Former-commit-id: 977450cdfb [formerly 76102aa826] [formerly dd02dbc917361787e7d1e6779798e6d39049b7dd [formerly 415cc64c14]]
Former-commit-id: fb7117074b745314a6805b95e86e4d1c8189f425 [formerly d1b406ed52]
Former-commit-id: 6789b4d3af
|
2012-11-06 08:47:41 -06:00 |
|
Richard Peter
|
c628bba7ec
|
Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"
Change-Id: I984bb34f88ecda1e57ccac462acbced7240846a0
Former-commit-id: e04bb21d8f [formerly bb475bdbf3] [formerly 023bed9bcf] [formerly e04bb21d8f [formerly bb475bdbf3] [formerly 023bed9bcf] [formerly 170e205c88 [formerly 023bed9bcf [formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]]]
Former-commit-id: 170e205c88
Former-commit-id: f92d88ada5 [formerly c1003242ae] [formerly b1f1b7df73c76c3045a4cb2591ef3d94ed2a4b56 [formerly c91ee014f7]]
Former-commit-id: d04d4edee85c6ddeba9df350c409b10b4826af31 [formerly 74b9df6f68]
Former-commit-id: 03c9846293
|
2012-11-05 15:19:04 -06:00 |
|
Richard Peter
|
11b14bdde0
|
Issue #1257: Fix hdf5 purge
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95
Former-commit-id: 33a0eb5bba [formerly 8e215f3397] [formerly da5a8fc3d9] [formerly 33a0eb5bba [formerly 8e215f3397] [formerly da5a8fc3d9] [formerly 93697faeb1 [formerly da5a8fc3d9 [formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]]]]
Former-commit-id: 93697faeb1
Former-commit-id: 9af7b8a7eb [formerly d536edf512] [formerly 2bed02d49bf2b8105e3ed155f40d83ff1c451851 [formerly 8096b2f6fb]]
Former-commit-id: f25f79e5a2759deed602dbebc3f91689d4fd6469 [formerly fd56cb6475]
Former-commit-id: 5f23128428
|
2012-11-02 11:06:27 -05:00 |
|
Richard Peter
|
6c09434ee0
|
Issue #1257: Address peer review comment and cleanup bufrmos.
Change-Id: I37f4714a3b350924fd86c016dea7de8aff023def
Former-commit-id: d98783100a [formerly 4910120217] [formerly ed20220923] [formerly d98783100a [formerly 4910120217] [formerly ed20220923] [formerly 12323c1f4e [formerly ed20220923 [formerly 2fbcf67a963c3a174a5bd096e3dc11550cdff723]]]]
Former-commit-id: 12323c1f4e
Former-commit-id: 72e963e986 [formerly c0dbf3dd23] [formerly cd1baf116c49c74bdda818aea40c2dd552d5b440 [formerly dd20288dbf]]
Former-commit-id: 228b34f5d00acdd522d7bc95984dd493962744b2 [formerly 8ef557934d]
Former-commit-id: 520db142f2
|
2012-11-01 16:23:41 -05: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 |
|
Brad Gonzales
|
e6bb9385b9
|
Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats
update the edex feature and edex build.xml to include the edex stat projects.
Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4
Former-commit-id: 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 1ba2a25bce [formerly d26119c383] [formerly b2656df2f8] [formerly 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]]
Former-commit-id: 24fc32ee14
Former-commit-id: ff6f910a9d [formerly 781265a6a8] [formerly ddba220564f0c36e18583d0653bc164afe5c183b [formerly 5949c8b09c]]
Former-commit-id: a76485ccacebffc316c6acd73b16f63a1cb16d68 [formerly e1a106fdbb]
Former-commit-id: 673749c4b9
|
2012-10-26 14:00:55 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
James Korman
|
69ea8eb155
|
Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 226ff6ea65 [formerly 1166a7cbb1] [formerly 38a2e426d9] [formerly 226ff6ea65 [formerly 1166a7cbb1] [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 9d1df24a3d [formerly 16643cb1bc] [formerly 6dc3f6ecbe7383c692d6eefe822b05fbf5ec6557 [formerly 5df52e38f9]]
Former-commit-id: 967ff70261bbd4155e4dd62e6d814c16e6491f67 [formerly 41a80adfb1]
Former-commit-id: c901590446
|
2012-07-31 13:38:23 -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 |
|
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
|
f4338dc6f5
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 345f682e22 [formerly a1ba6c10be] [formerly e32406ca8a] [formerly 345f682e22 [formerly a1ba6c10be] [formerly e32406ca8a] [formerly a4c6095b76 [formerly e32406ca8a [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]]]
Former-commit-id: a4c6095b76
Former-commit-id: dcb8a248f9 [formerly 76afa5d4b6] [formerly 85539ae32db819c9b82455e5e760e9e64caf1669 [formerly 3b2d570834]]
Former-commit-id: 8d7c431d2e3e9292fbc6c2dedb465feedb50fc52 [formerly f4346e7e01]
Former-commit-id: 9d984deb1f
|
2012-06-19 13:17:17 -05:00 |
|
Bryan Kowal
|
07ac1a35a1
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 181cd0b024 [formerly 5db24885ba] [formerly f43b37604ae27b981a3dbd819486fddea450376c [formerly fd8be91fed]]
Former-commit-id: 878c85d017dfd6c22ee3a919a58b96535172278c [formerly f390151c0b]
Former-commit-id: 96e82f60e5
|
2012-06-19 13:15:53 -05:00 |
|
Nate Jensen
|
aaf15c2354
|
Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: f930006834 [formerly 619b70f7fc] [formerly ae384ddf24] [formerly f930006834 [formerly 619b70f7fc] [formerly ae384ddf24] [formerly bb1ea105d2 [formerly ae384ddf24 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]]
Former-commit-id: bb1ea105d2
Former-commit-id: 21872217ff [formerly d7841cef54] [formerly ee6822d87212c2fe60739255b82ed1d9cd41f416 [formerly 244ca1b88b]]
Former-commit-id: 30ddaf4d3253d037ec108181694224c138cd9300 [formerly 31160b8485]
Former-commit-id: 05a77b1536
|
2012-06-18 17:20:48 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
2f6ae50479
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Dave Hladky
|
8f500ff6d6
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: 9ae2445f9f [formerly a1a3a361dd] [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]]
Former-commit-id: 07953e4b449645e4adcfef80f1595ec0513eb00f [formerly d2e16d486b]
Former-commit-id: 7fc0c65ef4
|
2012-04-30 13:43:34 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
David Gillingham
|
531c37f6fb
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]]
Former-commit-id: b056e18757
Former-commit-id: f2b58b2f16 [formerly ea7a55ad8d] [formerly 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]]
Former-commit-id: 2dfb07d58a5928ce4fb055932bcc4ae63a274440 [formerly d85d78f180]
Former-commit-id: e8d336e205
|
2012-01-26 17:38:43 -06:00 |
|
Dave Hladky
|
92cce91d94
|
Issue #15 Wes2Bridge time settings
Former-commit-id: bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]]
Former-commit-id: b03b324ead
Former-commit-id: 36d48978af [formerly 4e8acfaba3] [formerly 2479f0c7510c79fa38a277d7f43ba5ff441b9d5a [formerly 2d53cfbe41]]
Former-commit-id: 89a6fd5528f6dc78ffeaa8483a1da240cdbab071 [formerly 8553b8a654]
Former-commit-id: 1061ccbc4c
|
2012-01-25 10:53:51 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|