Commit graph

1290 commits

Author SHA1 Message Date
Dustin Johnson
b4a13190ad 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: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Bryan Kowal
c25250edd9 Issue #1318 - fix first dat dependency issue.
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78

Former-commit-id: a4d6021e5f [formerly 079fdb33a0] [formerly a4d6021e5f [formerly 079fdb33a0] [formerly 88a5451ce1 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]]]
Former-commit-id: 88a5451ce1
Former-commit-id: b45ba40abf [formerly 4f36912786]
Former-commit-id: 1b19c0f3c0
2012-11-08 07:27:39 -06:00
Nate Jensen
04c843cb1b Merge "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." into development
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]
Former-commit-id: 6b205399d4
Former-commit-id: 2fe69a5871 [formerly e3208d48a0]
Former-commit-id: 01e11761d8
2012-11-07 18:18:06 -06:00
Lee Venable
374a019df4 Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: c8955b5425 [formerly 36c44db46b] [formerly c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]
Former-commit-id: 8956718961
Former-commit-id: 15842d7d22 [formerly eacc1ca32c]
Former-commit-id: 139ca20a3c
2012-11-07 17:38:21 -06:00
Lee Venable
1202366429 Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development
Former-commit-id: b52b156faa [formerly c2e8c3a50e] [formerly b52b156faa [formerly c2e8c3a50e] [formerly 0dff0bf0b7 [formerly 9efe5208b4383d844c32fb7d8207ce48a04d27d6]]]
Former-commit-id: 0dff0bf0b7
Former-commit-id: d985b1c66e [formerly 7fdfbae106]
Former-commit-id: f865c6c33d
2012-11-07 17:38:03 -06:00
Brad Gonzales
edfed65902 Issue #1309 added units to Aggregate.java and AggregateRecord.java
Amend:
   Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
   Removed Unit from AggregateRecord.java.

Change-Id: If4f6fccb65c584055d68129874a398d6391155e7

Former-commit-id: 2a0b6ad151 [formerly 577df6943e] [formerly 2a0b6ad151 [formerly 577df6943e] [formerly 4c49c9116d [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]]
Former-commit-id: 4c49c9116d
Former-commit-id: 69d7fe5cd0 [formerly b17893d7e0]
Former-commit-id: c25fc27e89
2012-11-07 15:36:44 -06:00
Roger Ferrel
dda46f3046 Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]
Former-commit-id: 65d10be5d6
Former-commit-id: 42f453ffca [formerly 35f3a3953c]
Former-commit-id: f2f0d2320f
2012-11-07 15:07:47 -06:00
Roger Ferrel
51b57e0dfa Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: 4b0c701d69 [formerly 190922a233] [formerly 4b0c701d69 [formerly 190922a233] [formerly 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6e00b6c35 [formerly d6560d7730]
Former-commit-id: 1d7ee19deb
2012-11-07 14:35:38 -06:00
Lee Venable
c65c92e4d5 Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: 074543d75e [formerly f368b93484] [formerly 074543d75e [formerly f368b93484] [formerly 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]]
Former-commit-id: 297d2bbc9c
Former-commit-id: 412c29f116 [formerly 24dd8a1bc7]
Former-commit-id: c6f4c2e53b
2012-11-07 12:31:39 -06:00
Nate Jensen
96016dbf97 Merge "Issue #1273 product browser can now change order for grid" into development
Former-commit-id: ce706de2d8 [formerly 335939d5c1] [formerly ce706de2d8 [formerly 335939d5c1] [formerly edadd4d018 [formerly f8354c7abdcc3188d1b20ca6804550b7203c7f7f]]]
Former-commit-id: edadd4d018
Former-commit-id: 531114d066 [formerly 3ab1b4ebb7]
Former-commit-id: 1a19901673
2012-11-07 12:26:54 -06:00
Roger Ferrel
9f91e9326e Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91

Former-commit-id: 8bf89ad495 [formerly 82abbbf0b7] [formerly 8bf89ad495 [formerly 82abbbf0b7] [formerly 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]]
Former-commit-id: 974431a13a
Former-commit-id: 35b0dc2cef [formerly c6749e3740]
Former-commit-id: 9f6f6c9c16
2012-11-07 11:27:36 -06:00
Nate Jensen
5783705d57 Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
Former-commit-id: 904120bb43 [formerly 2cf2e79f34] [formerly 904120bb43 [formerly 2cf2e79f34] [formerly 433a79e689 [formerly bab65855839a69e29d90582e021d13ae439242ce]]]
Former-commit-id: 433a79e689
Former-commit-id: 87a1701dd1 [formerly b3ecd946ff]
Former-commit-id: ed96e701d7
2012-11-07 11:04:45 -06:00
Max Schenkelberg
2345861756 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: f069f34a96 [formerly 2f90120248] [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1 [formerly 747ab974e9]
Former-commit-id: 50625b0453
2012-11-07 10:44:42 -06:00
Richard Peter
dfa2c5f943 Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
Former-commit-id: ec86e24f71 [formerly 51638344a8] [formerly ec86e24f71 [formerly 51638344a8] [formerly 67471e4453 [formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]]]
Former-commit-id: 67471e4453
Former-commit-id: ef5c835118 [formerly 9125602f3a]
Former-commit-id: fc8324eb44
2012-11-07 09:32:25 -06:00
Bryan Kowal
cf7ae375b9 Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: cae04523db [formerly 9263a0ac57] [formerly cae04523db [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: d928e2f257 [formerly 2c14ea1bb7]
Former-commit-id: 2cd64bd5cc
2012-11-06 16:13:26 -06:00
Matt Nash
79d997ef52 Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 76cdfc09bb [formerly 9c9db6643a] [formerly 76cdfc09bb [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]]]
Former-commit-id: 284aecc6f9
Former-commit-id: e87cb88d60 [formerly 46f695b72d]
Former-commit-id: fc838f3de2
2012-11-06 14:06:49 -06:00
Richard Peter
6789b4d3af Issue #1257: Fix Tropical Test Tool
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b

Former-commit-id: 449ad67f82 [formerly 45b25ead66] [formerly 449ad67f82 [formerly 45b25ead66] [formerly e3da5faf40 [formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]]
Former-commit-id: e3da5faf40
Former-commit-id: 76102aa826 [formerly 415cc64c14]
Former-commit-id: d1b406ed52
2012-11-06 08:47:41 -06:00
Brad Gonzales
803ac115ff Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
Amend:
   removed groupBy attribute "fileName"
   added LogLevel enum and attribute to Event.java.  Default level is DEBUG.

Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07

Former-commit-id: cbce70fd0b [formerly 6ddd1cbdb3] [formerly cbce70fd0b [formerly 6ddd1cbdb3] [formerly a4bc175653 [formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]
Former-commit-id: a4bc175653
Former-commit-id: 5257f9a81a [formerly ce47edb905]
Former-commit-id: d226ca28c4
2012-11-06 07:31:19 -06:00
Ron Anderson
3bf08b29e5 Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: 5edafa6c86 [formerly 257213e491] [formerly 5edafa6c86 [formerly 257213e491] [formerly 52007a3a00 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]]
Former-commit-id: 52007a3a00
Former-commit-id: 80ef14539e [formerly 1855cb195b]
Former-commit-id: 9614307971
2012-11-05 17:33:06 -06:00
Nate Jensen
7a75a5e116 Merge "Issue #1304 Clear text field when point removed." into development
Former-commit-id: f21a65c7e8 [formerly 1d3c6bc0d7] [formerly f21a65c7e8 [formerly 1d3c6bc0d7] [formerly 8818bb44cd [formerly 85ab423d9116df80d8bab4f095439e52f1fa78d7]]]
Former-commit-id: 8818bb44cd
Former-commit-id: e800054fb4 [formerly 9bfd1c8e8c]
Former-commit-id: 9ea29375ad
2012-11-05 16:33:38 -06:00
Nate Jensen
b88ef74cc5 Merge "Issue #1257: Fix hdf5 purge as well as obs defining multiple default rules. Clean up old purgeRules in deleted plugin. Fix concurrency on ProcessUtil"" into development
Former-commit-id: 4ce1b0f752 [formerly 1c1da71b38] [formerly 4ce1b0f752 [formerly 1c1da71b38] [formerly a6d062fb14 [formerly cc63210970aecee47339eb1bb0d774ed1b5b7f2b]]]
Former-commit-id: a6d062fb14
Former-commit-id: 5a12f4c6df [formerly 0c5589196e]
Former-commit-id: 93ef070578
2012-11-05 16:32:54 -06:00
Richard Peter
03c9846293 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: bb475bdbf3 [formerly 023bed9bcf] [formerly bb475bdbf3 [formerly 023bed9bcf] [formerly 170e205c88 [formerly 3d04fdb509db0a5d46e215bdc2595c07d15575b2]]]
Former-commit-id: 170e205c88
Former-commit-id: c1003242ae [formerly c91ee014f7]
Former-commit-id: 74b9df6f68
2012-11-05 15:19:04 -06:00
Richard Peter
5d008d4078 Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: 04f3a7ee16 [formerly 9d917020b6] [formerly 04f3a7ee16 [formerly 9d917020b6] [formerly d2e47212c6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]]
Former-commit-id: d2e47212c6
Former-commit-id: 365cd1ad33 [formerly 199fbdac90]
Former-commit-id: 092f0b47e5
2012-11-05 14:03:14 -06:00
David Gillingham
7ee48aad3b Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: 4237143dd0 [formerly 11f109976e] [formerly 4237143dd0 [formerly 11f109976e] [formerly e0c7243c74 [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]]
Former-commit-id: e0c7243c74
Former-commit-id: d6bbcbe863 [formerly 73c592ccdc]
Former-commit-id: 80049b2214
2012-11-05 14:00:15 -06:00
Richard Peter
a5d17d624f Merge "Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated." into development
Former-commit-id: 1b753fb500 [formerly 0f38205cb1] [formerly 1b753fb500 [formerly 0f38205cb1] [formerly bfe5dbf75c [formerly 33fea4ad289d7c8b11c01175f3ef2bc820cd26f7]]]
Former-commit-id: bfe5dbf75c
Former-commit-id: e8aa085ca8 [formerly 7994b98f55]
Former-commit-id: a8e6d9e507
2012-11-05 13:47:14 -06:00
Roger Ferrel
70627eb1f3 Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc

Former-commit-id: a6b093c2ce [formerly 921134848b] [formerly a6b093c2ce [formerly 921134848b] [formerly 1f71a3bed7 [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]]
Former-commit-id: 1f71a3bed7
Former-commit-id: 5c241a7e5d [formerly a996839d2c]
Former-commit-id: 7dc93cee73
2012-11-05 12:56:07 -06:00
Roger Ferrel
13ef1ecd20 Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3

Former-commit-id: 120764c5ef [formerly 986766487f] [formerly 120764c5ef [formerly 986766487f] [formerly 3045291a29 [formerly d296028a9a0add9a81836030ff7b65be8883956b]]]
Former-commit-id: 3045291a29
Former-commit-id: 9fada57123 [formerly 2b18983017]
Former-commit-id: f360225043
2012-11-05 11:22:28 -06:00
Ben Steffensmeier
6f54171cfb Issue #189 fix several Unknown Models
Former-commit-id: b04bca36d4 [formerly 579d2e5ba6] [formerly b04bca36d4 [formerly 579d2e5ba6] [formerly 365a2274dd [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]]
Former-commit-id: 365a2274dd
Former-commit-id: 19caacc7b6 [formerly fa29bdf8c0]
Former-commit-id: 2dd884765f
2012-11-02 16:19:46 -05:00
David Gillingham
f4259113fb Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

Former-commit-id: 251f41414a [formerly 0f13b5d0b1] [formerly 251f41414a [formerly 0f13b5d0b1] [formerly ec7a7c1373 [formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]]
Former-commit-id: ec7a7c1373
Former-commit-id: a82f811659 [formerly f998d419d9]
Former-commit-id: fc56b970ff
2012-11-02 15:21:30 -05:00
Ron Anderson
fa5c379be9 Merge "Issue #1260 Added an extra grid cell around the slab to improve interpolation results." into development
Former-commit-id: 2c6bbcafdd [formerly 7a1dc6af0c] [formerly 2c6bbcafdd [formerly 7a1dc6af0c] [formerly aae03ce3f8 [formerly e65b1a378d8eff3df100953c800512b5f9c5c90f]]]
Former-commit-id: aae03ce3f8
Former-commit-id: ed53a921a6 [formerly 8da303506f]
Former-commit-id: 0085c66fb9
2012-11-02 14:48:06 -05:00
Ron Anderson
bd6db98838 Issue #1260 Added an extra grid cell around the slab to improve interpolation results.
Change-Id: I9ffaa42402aa4527946bcc973577bfc7b2232f57

Former-commit-id: 76d15a4749 [formerly c311b0568e] [formerly 76d15a4749 [formerly c311b0568e] [formerly 5a51e70456 [formerly 51bbb17d43e7e458e75f3229ec1521ecc04517e9]]]
Former-commit-id: 5a51e70456
Former-commit-id: 039c04f464 [formerly b888425935]
Former-commit-id: 89d1617ea1
2012-11-02 14:43:32 -05:00
Ron Anderson
67b9c5fd3c Merge "Issue #1236: Add a flag to the textdb command that the automated hurricane tools can use that will force reading/writing from the practice textdb." into development
Former-commit-id: 9213fd4b2e [formerly fac083ce63] [formerly 9213fd4b2e [formerly fac083ce63] [formerly b5328a2ee3 [formerly f8f82c6124063f4e7a65101fcf7a103297721f33]]]
Former-commit-id: b5328a2ee3
Former-commit-id: 1126d6ef05 [formerly f3d5ee4035]
Former-commit-id: 0793d4f305
2012-11-02 12:14:27 -05:00
David Gillingham
f67d591be2 Issue #1236: Add a flag to the textdb command that the automated hurricane tools can use that
will force reading/writing from the practice textdb.

Change-Id: I348fba095d203ac4439a611fca948ae52e2f10cc

Former-commit-id: a98e49351d [formerly 927bae7c59] [formerly a98e49351d [formerly 927bae7c59] [formerly 2dd0c2477f [formerly c6df2952d9d4d3a1ff635fcc3b7208193201d33f]]]
Former-commit-id: 2dd0c2477f
Former-commit-id: 9242fe7d43 [formerly 78467de871]
Former-commit-id: 2072b3c8a0
2012-11-02 11:10:08 -05:00
Richard Peter
5f23128428 Issue #1257: Fix hdf5 purge
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95

Former-commit-id: 8e215f3397 [formerly da5a8fc3d9] [formerly 8e215f3397 [formerly da5a8fc3d9] [formerly 93697faeb1 [formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]]]
Former-commit-id: 93697faeb1
Former-commit-id: d536edf512 [formerly 8096b2f6fb]
Former-commit-id: fd56cb6475
2012-11-02 11:06:27 -05:00
Ben Steffensmeier
a097e0f5cd Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated.
Former-commit-id: 9b6833e497 [formerly a6ef4957d6] [formerly 9b6833e497 [formerly a6ef4957d6] [formerly c1c55fa7aa [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]]
Former-commit-id: c1c55fa7aa
Former-commit-id: 11bd701e0a [formerly e4b81a6829]
Former-commit-id: 0e69ab3385
2012-11-02 10:37:42 -05:00
Ron Anderson
a3d92cd3f9 Merge "Issue #189 fix gfe retrieval of static data" into development
Former-commit-id: db17dcd548 [formerly a4e12e54a9] [formerly db17dcd548 [formerly a4e12e54a9] [formerly df05080714 [formerly a43043963e91e682ff78f370445bbb3e9185456d]]]
Former-commit-id: df05080714
Former-commit-id: 1734cf9e10 [formerly bfd5ddb5cb]
Former-commit-id: f64b89d026
2012-11-01 18:33:12 -05:00
Ben Steffensmeier
6665b24c66 Issue #189 fix gfe retrieval of static data
Former-commit-id: 2cb23de522 [formerly a663497d5b] [formerly 2cb23de522 [formerly a663497d5b] [formerly 743b2b89e3 [formerly d08a637535547c0b037f3a50d86cc0c16ee0ad62]]]
Former-commit-id: 743b2b89e3
Former-commit-id: 1348c2d512 [formerly 1c704a98f5]
Former-commit-id: 3ccd40bfeb
2012-11-01 18:30:05 -05:00
Ron Anderson
ba4f0a4e97 Merge "Issue #1257: Address peer review comment and cleanup bufrmos." into development
Former-commit-id: 86aa15c3d6 [formerly dfc022c59c] [formerly 86aa15c3d6 [formerly dfc022c59c] [formerly 6f4b4624d0 [formerly f11a03f18fa7104b7d920dba8108a582a5f5c967]]]
Former-commit-id: 6f4b4624d0
Former-commit-id: 538bf101bc [formerly ec5bbe2c7d]
Former-commit-id: 21ff43e0d6
2012-11-01 18:08:47 -05:00
Nate Jensen
8c95642473 Merge "Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum." into development
Former-commit-id: 18e03a8c57 [formerly 4fd1111b7b] [formerly 18e03a8c57 [formerly 4fd1111b7b] [formerly ada2d72a9c [formerly 32c1912eef76a513b79e6419ec90c9141dd56479]]]
Former-commit-id: ada2d72a9c
Former-commit-id: 7fc91039ca [formerly e7dfd27bd7]
Former-commit-id: 80900d875a
2012-11-01 17:29:57 -05:00
Richard Peter
a215f6a089 Merge "Issue #1302 Fixes for data delivery merge with development branch." into development
Former-commit-id: 0620aac119 [formerly 1b156820b6] [formerly 0620aac119 [formerly 1b156820b6] [formerly 34aeb3015c [formerly 070f9a24c317292b8069848635045364993d66b7]]]
Former-commit-id: 34aeb3015c
Former-commit-id: ce0848f7e3 [formerly 0e46f72ccb]
Former-commit-id: 4ec6407757
2012-11-01 17:00:34 -05:00
Max Schenkelberg
9bfddb6ab7 Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum.
Change-Id: Iff5460327f799c69800672deb9481e4d65874a62

Former-commit-id: 47e684d0e8 [formerly cbfdfa4818] [formerly 47e684d0e8 [formerly cbfdfa4818] [formerly 9a7a8c0f9c [formerly 361a999d368e183513518e87bd350f3ff26ea8c0]]]
Former-commit-id: 9a7a8c0f9c
Former-commit-id: cbb716190a [formerly 3eebdd0ded]
Former-commit-id: 55f43f66e7
2012-11-01 16:38:10 -05:00
Dustin Johnson
7843e33544 Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 8d5c86f31e [formerly 2f28e19bf6] [formerly 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7b4967b5bb [formerly 7f994472ae]
Former-commit-id: e0c68bde6d
2012-11-01 16:31:14 -05:00
Richard Peter
520db142f2 Issue #1257: Address peer review comment and cleanup bufrmos.
Change-Id: I37f4714a3b350924fd86c016dea7de8aff023def

Former-commit-id: 4910120217 [formerly ed20220923] [formerly 4910120217 [formerly ed20220923] [formerly 12323c1f4e [formerly 2fbcf67a963c3a174a5bd096e3dc11550cdff723]]]
Former-commit-id: 12323c1f4e
Former-commit-id: c0dbf3dd23 [formerly dd20288dbf]
Former-commit-id: 8ef557934d
2012-11-01 16:23:41 -05:00
Ben Steffensmeier
599f5d838b Issue #189 fix grib purge issues caused by new purge keys
Former-commit-id: 93bdc9d407 [formerly a64a5ba50e] [formerly 93bdc9d407 [formerly a64a5ba50e] [formerly 4a3e2f4f49 [formerly 0e7829283db36cb8f2226d626b4e211efa0a3e1f]]]
Former-commit-id: 4a3e2f4f49
Former-commit-id: a48889cb30 [formerly 629f3e6650]
Former-commit-id: a6eacf3bbf
2012-11-01 15:33:15 -05:00
Dustin Johnson
931d94d1de 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: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Brad Gonzales
69e4af9ce2 Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]]
Former-commit-id: 20a5fe3577
Former-commit-id: 4ffe05d37e [formerly 2ffcd5d684]
Former-commit-id: 49343a7e3c
2012-11-01 11:02:48 -05:00
Richard Peter
b8b07cfe89 Merge "Issue #189 fix the grid deltaScripts to work with static data and fix rollback" into development
Former-commit-id: a87b97364a [formerly 2dcc3f39c0] [formerly a87b97364a [formerly 2dcc3f39c0] [formerly 31df83ff4d [formerly b8af2ed2192ead1043f56355dc8a9a05ce035c3d]]]
Former-commit-id: 31df83ff4d
Former-commit-id: 6561e80beb [formerly 1bf0b7d23a]
Former-commit-id: 1b1fd7d92c
2012-10-31 21:28:48 -05:00
Richard Peter
75147f3390 Merge "Issue #189 a few fixes to grid resources for FFG Mosaic" into development
Former-commit-id: b2d3410745 [formerly 1d50223763] [formerly b2d3410745 [formerly 1d50223763] [formerly c5203e276d [formerly 6b071a06403eb4c5e979667ce27498f4c7198685]]]
Former-commit-id: c5203e276d
Former-commit-id: 401cd146e9 [formerly ac2089dd02]
Former-commit-id: 73c74907c4
2012-10-31 21:27:55 -05:00
Richard Peter
852946091e Merge "Issue #1257: Update PurgeRules to not be hard linked to path keys" into development
Former-commit-id: 01e0819e71 [formerly cc8433e76a] [formerly 01e0819e71 [formerly cc8433e76a] [formerly 98a014aedd [formerly 3eb29df71d71820b5e9f62932874e48ac9849f7d]]]
Former-commit-id: 98a014aedd
Former-commit-id: 684046dd24 [formerly 28d64a4263]
Former-commit-id: b0e0896390
2012-10-31 21:26:05 -05:00
Brad Gonzales
78fbf32245 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: 75e77feb58 [formerly 68a3a98547] [formerly 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]]
Former-commit-id: 44e9238fa9
Former-commit-id: 7807eca270 [formerly 253c19ae05]
Former-commit-id: 6fae286ad2
2012-10-31 21:20:40 -05:00