Commit graph

1497 commits

Author SHA1 Message Date
Ben Steffensmeier
a6eacf3bbf Issue #189 fix grib purge issues caused by new purge keys
Former-commit-id: a64a5ba50e [formerly a64a5ba50e [formerly 0e7829283db36cb8f2226d626b4e211efa0a3e1f]]
Former-commit-id: 4a3e2f4f49
Former-commit-id: 629f3e6650
2012-11-01 15:33:15 -05:00
Dustin Johnson
4d9c945388 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: 98d7beae50 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Brad Gonzales
49343a7e3c Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 9137f334b5 [formerly 9137f334b5 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]
Former-commit-id: 20a5fe3577
Former-commit-id: 2ffcd5d684
2012-11-01 11:02:48 -05:00
Richard Peter
1b1fd7d92c Merge "Issue #189 fix the grid deltaScripts to work with static data and fix rollback" into development
Former-commit-id: 2dcc3f39c0 [formerly 2dcc3f39c0 [formerly b8af2ed2192ead1043f56355dc8a9a05ce035c3d]]
Former-commit-id: 31df83ff4d
Former-commit-id: 1bf0b7d23a
2012-10-31 21:28:48 -05:00
Richard Peter
73c74907c4 Merge "Issue #189 a few fixes to grid resources for FFG Mosaic" into development
Former-commit-id: 1d50223763 [formerly 1d50223763 [formerly 6b071a06403eb4c5e979667ce27498f4c7198685]]
Former-commit-id: c5203e276d
Former-commit-id: ac2089dd02
2012-10-31 21:27:55 -05:00
Richard Peter
b0e0896390 Merge "Issue #1257: Update PurgeRules to not be hard linked to path keys" into development
Former-commit-id: cc8433e76a [formerly cc8433e76a [formerly 3eb29df71d71820b5e9f62932874e48ac9849f7d]]
Former-commit-id: 98a014aedd
Former-commit-id: 28d64a4263
2012-10-31 21:26:05 -05:00
Brad Gonzales
6fae286ad2 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 68a3a98547 [formerly 68a3a98547 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]
Former-commit-id: 44e9238fa9
Former-commit-id: 253c19ae05
2012-10-31 21:20:40 -05:00
Richard Peter
940d986f6d Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 275398778f [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
d1a5ee130f Issue #189 fix the grid deltaScripts to work with static data and fix rollback
Former-commit-id: b5f84376f0 [formerly b5f84376f0 [formerly 79dca17198b19df77c7eb1074e492a16516efc22]]
Former-commit-id: c682788130
Former-commit-id: b5431d9ccf
2012-10-31 15:35:51 -05:00
Ben Steffensmeier
b830e7c9c2 Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: 64d4a1add7 [formerly 64d4a1add7 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]
Former-commit-id: 4b121fd7b3
Former-commit-id: bde106e70d
2012-10-31 11:39:32 -05:00
Roger Ferrel
e27cbc2edb Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc

Former-commit-id: d92be142ad [formerly d92be142ad [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]
Former-commit-id: 3c64544822
Former-commit-id: 1e0241e509
2012-10-30 17:09:52 -05:00
Lee Venable
3163b91c70 Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 868fe53216 [formerly 868fe53216 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: 881a8e726b
2012-10-30 16:46:30 -05:00
Lee Venable
2cdc38472f Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 276ce2ad08 [formerly 276ce2ad08 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]
Former-commit-id: e47d1beb09
Former-commit-id: cebd35bb47
2012-10-30 16:45:35 -05:00
Lee Venable
c2f84c7c52 Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: 33525e4dff [formerly 33525e4dff [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 2d3eeeaacf
2012-10-30 16:44:56 -05:00
Roger Ferrel
14d1eb4453 Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527

Former-commit-id: 0c544da917 [formerly 0c544da917 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: c0b480bc7f
2012-10-30 15:19:08 -05:00
Roger Ferrel
fe1af85c72 Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483

Former-commit-id: bc1e462d07 [formerly bc1e462d07 [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]
Former-commit-id: 2fb06a145f
Former-commit-id: 191e4e83db
2012-10-30 14:00:20 -05:00
Roger Ferrel
6c9c5a0a5f Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0

Former-commit-id: 8952e1cef8 [formerly 8952e1cef8 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]
Former-commit-id: e37a097596
Former-commit-id: b93dcebdc0
2012-10-30 12:35:48 -05:00
Ben Steffensmeier
38b0dafe0b merge branch Unifeid_Grid into developement
Former-commit-id: d0a2ed32b5 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
67c0a3ef46 Issue #189 add a Readme to the upgrade scripts.
Former-commit-id: e435502c5f [formerly e435502c5f [formerly 29b9bc18abe3754efe2c9011b381d8924ebb3638]]
Former-commit-id: d61ba36e25
Former-commit-id: 6d1dfbc19a
2012-10-30 12:08:14 -05:00
Roger Ferrel
4637ecd3fa Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620

Former-commit-id: 87d3ff985e [formerly 87d3ff985e [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]
Former-commit-id: 5355b7f620
Former-commit-id: 089e8af498
2012-10-30 10:34:40 -05:00
Lee Venable
00ae0f75a4 Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: a7eb12fd9e [formerly a7eb12fd9e [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]
Former-commit-id: 676856f62f
Former-commit-id: b491922ddc
2012-10-30 10:26:53 -05:00
Roger Ferrel
f4bc26d598 Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: f65213c542 [formerly f65213c542 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]
Former-commit-id: 4a13cfb8a6
Former-commit-id: 551cffe315
2012-10-30 09:00:10 -05:00
Roger Ferrel
8c40af7954 Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c

Former-commit-id: 1d67e245aa [formerly 1d67e245aa [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]
Former-commit-id: 7af20b6130
Former-commit-id: 406de0548d
2012-10-30 08:27:25 -05:00
Bryan Kowal
25d93bf9b8 Relocating projects due to the dependencies of com.raytheon.uf.edex.esb.camel
Former-commit-id: 37777f32ea [formerly 37777f32ea [formerly e451f4b49d393b595ec0314970ffae8834a67425]]
Former-commit-id: 10c8013cc3
Former-commit-id: eed6cb8dad
2012-10-29 17:26:56 -05:00
Roger Ferrel
72be898478 Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class.
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082

Former-commit-id: 55461bc61d [formerly 55461bc61d [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]
Former-commit-id: 4a2ae2f6db
Former-commit-id: 67d404ad87
2012-10-29 13:31:43 -05:00
Steve Harris
e9e3bdbec2 Merge branch 'ss_builds' into development
Former-commit-id: fb46bb053d [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: afb534db67
Former-commit-id: 048c0c88cd
2012-10-29 12:17:12 -05:00
Steve Harris
09f6e43195 12.11.1-12 baseline
Former-commit-id: 8682e4f6ca [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
2012-10-29 12:15:56 -05:00
Lee Venable
497492b70c Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development
Former-commit-id: eb660ac54d [formerly eb660ac54d [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]
Former-commit-id: 4bc57aec7e
Former-commit-id: 79a5d07605
2012-10-29 08:40:34 -05:00
Roger Ferrel
49903040c7 Issue #1287 Changes for non-blocking TimeScalePeriodsDialog.
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049

Former-commit-id: ea2fdbc1b8 [formerly ea2fdbc1b8 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]
Former-commit-id: 99179463f5
Former-commit-id: 22ebd6b55a
2012-10-29 08:09:57 -05:00
Roger Ferrel
5652b7e685 Issue #1287 Changes for non-blocking SiteActivationDlg.
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744

Former-commit-id: 8c5b00fa42 [formerly 8c5b00fa42 [formerly ae1185cb5825915820314fdc48c897676ead8538]]
Former-commit-id: 2ab4a8508a
Former-commit-id: 8fca4cf256
2012-10-29 07:21:00 -05:00
Lee Venable
7ac4bfac5d Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development
Former-commit-id: 6c3b12a9d3 [formerly 6c3b12a9d3 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]
Former-commit-id: ddbed06f64
Former-commit-id: 7621f14d95
2012-10-26 15:28:37 -05:00
Lee Venable
7b4bbc1206 Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development
Former-commit-id: 84e66d2fab [formerly 84e66d2fab [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]
Former-commit-id: 0967a6348b
Former-commit-id: 1407f47d1c
2012-10-26 15:28:07 -05:00
Lee Venable
1f07aee476 Merge "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" into development
Former-commit-id: 173813c954 [formerly 173813c954 [formerly f67e7970061c9bc4dde3b4175dcb9b45d204ff34]]
Former-commit-id: 41c8c88a03
Former-commit-id: bd49530415
2012-10-26 15:25:52 -05:00
Roger Ferrel
21c3e3b387 Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog.
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c

Former-commit-id: af887de89c [formerly af887de89c [formerly a8e412f5d0cd625b6c421b0609bc7149d7386f1a]]
Former-commit-id: 37c7d61195
Former-commit-id: f4b0b6cd56
2012-10-26 15:03:26 -05:00
Roger Ferrel
c7a81f74a9 Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog.
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2

Former-commit-id: c3d2ac5976 [formerly c3d2ac5976 [formerly 15e80fd970393b74f6a320a794004f89bf3619a5]]
Former-commit-id: e2b35d015f
Former-commit-id: 7ce8344826
2012-10-26 14:44:29 -05:00
Roger Ferrel
83ce19bfb8 Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes.
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75

Former-commit-id: 57a547fc66 [formerly 57a547fc66 [formerly 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7]]
Former-commit-id: 7a3149dbb3
Former-commit-id: cd7c3ec006
2012-10-26 14:27:00 -05:00
Brad Gonzales
e1a106fdbb 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: b2656df2f8 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
2012-10-26 14:00:55 -05:00
Roger Ferrel
7cc1520364 Issue #1287 Changes for non-blocking WESaveDialog.
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd

Former-commit-id: 32154a3789 [formerly 32154a3789 [formerly e02ff1c81c669ae0bcf5c068487a9c35bc542ff2]]
Former-commit-id: 51369fbd50
Former-commit-id: f4bd80afef
2012-10-26 09:01:46 -05:00
Roger Ferrel
34d61db4da Issue #1287 Changes for non-blocking WERevertDialog.
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b

Former-commit-id: 117bcc648e [formerly 117bcc648e [formerly 50b20b90ad974962334fb7dbf9c8fa3c369b01a1]]
Former-commit-id: 4d2c234072
Former-commit-id: 3a397258ff
2012-10-26 08:23:04 -05:00
Roger Ferrel
5a3c07823b Issue #1287 Changes for non-blocking PublishDialog.
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2

Former-commit-id: 833b7bb850 [formerly 833b7bb850 [formerly a0b4c4eb635ce39cf1a25c78620d317e59d33061]]
Former-commit-id: 93472a82e5
Former-commit-id: c0497226a6
2012-10-26 07:07:18 -05:00
Ben Steffensmeier
31861c25c7 Issue #189 update grid paths to resemble new grib paths
Former-commit-id: 13cfc7c341 [formerly 13cfc7c341 [formerly 7347ff2138ecbb3ac28a4f09a3e3a42d86f961d7]]
Former-commit-id: 7b03228e5c
Former-commit-id: 6586ebe4b7
2012-10-25 18:03:48 -05:00
Ron Anderson
0e2bac8741 Issue #1260 Fix data loading from NetCDF databases.
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: 3874ac688b [formerly 3874ac688b [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]]
Former-commit-id: ffc8f1567d
Former-commit-id: 141c47d4e0
2012-10-25 16:59:25 -05:00
Ben Steffensmeier
c1e4873727 Issue #189 changes from code review
Former-commit-id: 984d128d33 [formerly 984d128d33 [formerly 449762acbbe74173121e19f5c325104221c083a2]]
Former-commit-id: 7139c80557
Former-commit-id: b0bf62ce6f
2012-10-25 16:33:59 -05:00
Ben Steffensmeier
d2eb23821f Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: b7d61e7543 [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 54f414a7e0
2012-10-25 16:17:54 -05:00
Lee Venable
7172610fa7 Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development
Former-commit-id: de997956f3 [formerly de997956f3 [formerly 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d]]
Former-commit-id: 02ad711e0c
Former-commit-id: 877692bf63
2012-10-25 16:06:53 -05:00
Roger Ferrel
0ddbad2654 Issue #1287 Changes for non-blocking RefSetAppearanceDialog.
Change-Id: I0b3f5e8c57600f3d20a7662404b014adc874e6fc

Former-commit-id: 06b3d2f921 [formerly 06b3d2f921 [formerly 7e64b7aa2a236d07c04b72e1eac2c660e0c87642]]
Former-commit-id: 2b08397e4b
Former-commit-id: d119a1c518
2012-10-25 15:23:45 -05:00
Roger Ferrel
10ef3046a4 Issue #1287 Changes for non-blocking ProductScriptsDialog.
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8

Former-commit-id: 17de26adfb [formerly 17de26adfb [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]
Former-commit-id: 73b4ca43c8
Former-commit-id: af40c442db
2012-10-25 14:13:41 -05:00
Lee Venable
673bb4b340 Merge "Issue #1287 Changes for non-blocking ProcessMonitorDialog." into development
Former-commit-id: c2e1e42e26 [formerly c2e1e42e26 [formerly 711419494f6ec18c3398bdded18b71d0ac4d37ae]]
Former-commit-id: d7ae341df2
Former-commit-id: b5eceeda7f
2012-10-25 14:03:42 -05:00
Nate Jensen
72c9a5a4c7 Merge "Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different." into development
Former-commit-id: c6ca41e7c3 [formerly c6ca41e7c3 [formerly 4187d6fd94a38291047860cc780fb1aa9f59d825]]
Former-commit-id: 10cdbdbd61
Former-commit-id: 3c1463c4d9
2012-10-25 13:39:11 -05:00
Lee Venable
12954b7925 Merge "Issue #1287 Changes SampleSetDialog from review." into development
Former-commit-id: 66dd846674 [formerly 66dd846674 [formerly 7e72d19330025ef611f509c9140103c28cd89b5d]]
Former-commit-id: 4aef416119
Former-commit-id: d6c9359dc9
2012-10-25 13:31:50 -05:00