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

2359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roger Ferrel
3248f4bcf2 Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. 
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec]
Former-commit-id: 2b4b10d643
 2013-04-03 12:48:18 -05:00
Nate Jensen
c82a67f378 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development 
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly e8b5b33c4c8ab18f2df27e54bff8de6a2458c098 [formerly f57358cff8]] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]
Former-commit-id: 1ad5bb1a52
 2013-04-02 14:29:15 -05:00
Bryan Kowal
55b84c59c6 Issue #1850 - the ebxml schema will now be created within the metadata database 
Former-commit-id: 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 2dbd62e9ce [formerly 8d63244b4e [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: 57767b7c64c0b9fe7114780c1b2b46960afdf9dc [formerly b31ade0770]
Former-commit-id: a57a457c79
 2013-04-02 10:49:46 -05:00
Dustin Johnson
c42ca22867 Issue #1841 Split up Subscription hierarchy in support of shared subscriptions. 
Amend:
   Use TimeUtil.newGmtCalendar() and remove whitespace only change
   Add TODO for point data types.

Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3

Former-commit-id: 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]
Former-commit-id: 644ed2396d
 2013-04-01 15:35:51 -05:00
Max Schenkelberg
984e67acda Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development. 
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]
Former-commit-id: ba262e2bc5
 2013-04-01 12:41:50 -05:00
Lee Venable
7e4696f582 Merge "Issue #1830 - Don't allow base level config files for FFMP" into development 
Former-commit-id: 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1]
Former-commit-id: 58c83b9662
 2013-04-01 12:26:23 -05:00
Steve Harris
47c7f66f2b Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]
Former-commit-id: 7b27767d7e
 2013-04-01 12:19:04 -05:00
Steve Harris
12055591ea Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1 
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]
Former-commit-id: f85a1ab9ab
 2013-04-01 12:15:04 -05:00
Lee Venable
1c1b083dbf Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development 
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]
Former-commit-id: 4e95ffe2ae
 2013-04-01 12:06:16 -05:00
Steve Harris
a6ff543f88 13.3.1-17 baseline 
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]
Former-commit-id: ef413da5f7
 2013-04-01 12:04:56 -05:00
Steve Harris
994aab5c6a 13.3.1-16 baseline 
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]
Former-commit-id: 6b75202d07
 2013-04-01 11:39:08 -05:00
Mike Duff
0f3223b8b9 Issue #1830 - Don't allow base level config files for FFMP 
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]
Former-commit-id: e627279d7c
 2013-04-01 11:36:53 -05:00
Richard Peter
fcbac13167 Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development 
Former-commit-id: b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]
Former-commit-id: 65f317e56b
 2013-04-01 11:33:59 -05:00
Steve Harris
4df1b4aeae 13.3.1-15 baseline 
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]
Former-commit-id: 2bf790aae3
 2013-04-01 11:33:20 -05:00
Max Schenkelberg
af56d47973 Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile 
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]
Former-commit-id: 8de3a70962
 2013-04-01 10:19:36 -05:00
Lee Venable
ec82403afa Merge "Issue #1790 Changes for non-blocking StationListDlg." into development 
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]
Former-commit-id: ebfa8ea79c
 2013-04-01 09:40:59 -05:00
Roger Ferrel
b78126a764 Issue #1790 Changes for non-blocking StationProfileDlg. 
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 9aeb83700b132f9f7b7a467ee07c274704d24266 [formerly 944d03615e]
Former-commit-id: 86e21acae2
 2013-03-29 17:11:02 -05:00
Ben Steffensmeier
d2fa8b7c0c Issue #1799 fix modal tools again. 
Former-commit-id: 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 788f9b6d4dfdc20ad93f496e50d5d0160cd0daa5 [formerly 7082466303]
Former-commit-id: 11e6afa5fa
 2013-03-29 14:30:54 -05:00
Roger Ferrel
e536a10191 Issue #1790 Changes for non-blocking StationListDlg. 
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11]
Former-commit-id: ba0060522f
 2013-03-29 13:46:51 -05:00
Roger Ferrel
ecdb29cc1d Issue #1790 Last of the bug fixes. Reviewer changes 
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]
Former-commit-id: 8c1116eaae
 2013-03-29 11:35:08 -05:00
Ron Anderson
ba064a146a Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled. 
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]
Former-commit-id: cd0f319ec5
 2013-03-29 10:48:26 -05:00
Ron Anderson
6cd8d1e8ee Issue #1774 Fix invalid unit strings in parameterInfo files. 
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]
Former-commit-id: 679bb01764
Former-commit-id: 905f44a12ebe7347d47fb3a96c6a47ac28a6024f [formerly 96e8f63679]
Former-commit-id: d5e3976dc4
 2013-03-29 10:07:37 -05:00
Greg Armendariz
7382b92b41 Fix merge issue 
Former-commit-id: 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2]
Former-commit-id: dcd36e64a6
 2013-03-29 09:52:46 -05:00
Greg Armendariz
54231d5bcc Change package location of import 
Former-commit-id: 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]
Former-commit-id: 27345f6edf
Former-commit-id: 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6]
Former-commit-id: 05af592718
 2013-03-29 09:09:32 -05:00
David Gillingham
acc3ac1c03 Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database. 
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: 9f4cd32b5571d903c6b3f5e023a5fb8faddecd4f [formerly dbec0fa00f]
Former-commit-id: fddd42615d
 2013-03-28 17:18:43 -05:00
Nate Jensen
8092e699e6 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1 
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]
Former-commit-id: 946323416c
 2013-03-28 17:02:14 -05:00
Richard Peter
16fcad80cd Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development 
Former-commit-id: b548239f0b [formerly 1228c8cbbc] [formerly b4fea10724] [formerly 209d53ee67 [formerly b4fea10724 [formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]]
Former-commit-id: 209d53ee67
Former-commit-id: 82e5c3e6f53c40ac03ff1c4efe1d517532b59faf [formerly 8b0347001d]
Former-commit-id: affe383cf3
 2013-03-28 16:59:18 -05:00
Steve Harris
cf60c00cb2 Issue #1782 - restore FFPMGenerator.java 
Former-commit-id: 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]
Former-commit-id: 3953f8368b
Former-commit-id: 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5]
Former-commit-id: bec6e9099f
 2013-03-28 16:06:54 -05:00
Bryan Kowal
0e463b7bc9 Issue #1750 - qpid updates for compatibility with operational servers 
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Former-commit-id: a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]
Former-commit-id: e3c39b9be6
Former-commit-id: 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7]
Former-commit-id: fa5825b0c5
 2013-03-28 16:00:27 -05:00
Ben Steffensmeier
d7d0ea7264 Issue #1799 fix activation of tools for new perspectives. 
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]
Former-commit-id: 33de9bfc87
 2013-03-28 15:47:36 -05:00
Max Schenkelberg
232655183c Issue #1638 Added persistIndex route that only persists and indexes 
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly a308b27c2f [formerly e91406ab10 [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]
Former-commit-id: a308b27c2f
Former-commit-id: e4d956e4004a3d775c7a86d2f7a9ed188361fc67 [formerly d9a481f542]
Former-commit-id: 623c49c3cc
 2013-03-28 15:45:31 -05:00
Ron Anderson
65dd075089 Issue #1774 Fix D2D accumulative parameter time ranges 
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]
Former-commit-id: 33bcf5fee8
 2013-03-28 13:37:29 -05:00
Steve Harris
c9dd652973 Revert "Replaced with formatted version" 
This reverts commit 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].


Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]
Former-commit-id: 7bd478fc41
 2013-03-28 13:08:16 -05:00
Dustin Johnson
d37764f722 Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development 
Former-commit-id: c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]]
Former-commit-id: 3991df64ff
Former-commit-id: 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4]
Former-commit-id: 3896cf42f1
 2013-03-28 13:07:20 -05:00
Greg Armendariz
4887191329 Replaced with formatted version 
Former-commit-id: 410e8bcbf1 [formerly ff977fc882] [formerly 8bb353ce02dff9b06eeb5ac6c69fd4fd83c9630c [formerly b741680965]] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]
Former-commit-id: e074710e0a
 2013-03-28 12:59:43 -05:00
Dustin Johnson
a5bb46da22 Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development 
Former-commit-id: 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 51bf00bf1c [formerly 8583a5f785 [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: 9d4afc316993b2f4357647dcee834eee6af6bfcd [formerly db5a8b9865]
Former-commit-id: ee26b669e3
 2013-03-28 12:25:12 -05:00
Dustin Johnson
ce4b93027c Issue #1840 Fix merge error that removed .classpath 
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly a4e4df02b0 [formerly ab42673848 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]
Former-commit-id: a4e4df02b0
Former-commit-id: 150bcdf38ca3c079cb25192b6b11f9b215ca5226 [formerly 902986256d]
Former-commit-id: 85d6a19a5e
 2013-03-28 12:14:47 -05:00
Dustin Johnson
65f6842341 Issue #1840 Fix merge error that removed .classpath 
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

Former-commit-id: e28ea4d3ef [formerly 5e0073f1f9] [formerly 680d2984e1] [formerly 695c83669e [formerly 680d2984e1 [formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]
Former-commit-id: 695c83669e
Former-commit-id: 49686481ddfb365c4542534bf9b1daede1aa694b [formerly 25b6eb0eb9]
Former-commit-id: d0056996cd
 2013-03-28 12:13:23 -05:00
Benjamin Phillippe
8bfd5868ca Issue #1802: Eliminated a call to new on StatsDao in AggregateManager 
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: c63337ac35 [formerly ec880b7923] [formerly ed9cb5f8f6] [formerly 6640a65a51 [formerly ed9cb5f8f6 [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]
Former-commit-id: 6640a65a51
Former-commit-id: 3ca6f8d97c36c44404ce7fb69a9938ea70b43c36 [formerly c4496475a6]
Former-commit-id: af5827f1de
 2013-03-28 12:08:57 -05:00
Greg Armendariz
35041aac30 Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1 
Former-commit-id: cea8e5309e [formerly b543b515d9] [formerly a48365165b] [formerly 943426fd00 [formerly a48365165b [formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]]
Former-commit-id: 943426fd00
Former-commit-id: 6ef530e98d51e37155a6fd3738dfdf4ebe9de859 [formerly 05d1d16500]
Former-commit-id: 10823802da
 2013-03-28 12:05:07 -05:00
Dustin Johnson
6ad3355dad Issue #1839 Change build.edex build.xml to support building work assignment features after main build 
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 1365d5c9af [formerly 3be6669f1b [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]
Former-commit-id: 1365d5c9af
Former-commit-id: c88cf84fe3b042c261af4f646c01752674a7c487 [formerly 83f6fb720c]
Former-commit-id: 1960bcbf11
 2013-03-28 11:43:24 -05:00
Bryan Kowal
b3e4b32a20 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep 
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles


Former-commit-id: d8b1984283 [formerly 5fe808757f] [formerly c592e8a877] [formerly 955b5c84d3 [formerly c592e8a877 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]]
Former-commit-id: 955b5c84d3
Former-commit-id: a12041d3a7c9c7077cb0b926732f1947bc7372ae [formerly 7a6f32796b]
Former-commit-id: 1a11fef532
 2013-03-28 10:42:51 -05:00
Max Schenkelberg
0bd1554e20 Issue #1638 Fix merge error 
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea]
Former-commit-id: abcf4bf569
 2013-03-28 10:20:54 -05:00
Ben Steffensmeier
7b4a3d369a Issue #1821 recalculate 6 hours to be longer. 
Former-commit-id: c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly efbdd3aa8c [formerly a9cec71222 [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: c4ade474503e6a9399c1f1ee86362c6279fef943 [formerly 403da9bfb9]
Former-commit-id: e1a619e030
 2013-03-28 10:16:11 -05:00
Lee Venable
9b754cf557 Merge "Issue #1790 Bug fixes for SCAN." into development 
Former-commit-id: 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]
Former-commit-id: 167fa6eadf
Former-commit-id: bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7]
Former-commit-id: 655f06cb65
 2013-03-28 10:04:34 -05:00
Bryan Kowal
cf87439189 Issue #1821 - re-compile grib2.so 32-bit and 64-bit 
Former-commit-id: d3a2525705 [formerly 203a3d5200] [formerly 7622471ed01b2742f90976cf09d5b178db585bbf [formerly da99727625]] [formerly 2da2b370db [formerly da99727625 [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]]
Former-commit-id: 2da2b370db
Former-commit-id: e0118a2e7c08a69d3c453f036763cc1d265db530 [formerly 998fbe8769]
Former-commit-id: 131e260337
 2013-03-28 09:48:27 -05:00
Roger Ferrel
57b5bf2d45 Issue #1790 Bug fixes for SCAN. 
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly e204276c17 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]
Former-commit-id: e204276c17
Former-commit-id: 14207e5f65d2b40c1876b607562886d07b1c2186 [formerly 216fa1b23b]
Former-commit-id: 380846374f
 2013-03-28 09:16:24 -05:00
Roger Ferrel
1c3089a826 Issue #1790 bug fix for GFE dialogs in ticket 1353. 
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612

Former-commit-id: bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly 4db9e20fbf [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: a281f6a3b00ef8635f1bebf4a15f140bf56982a7 [formerly b95a38db32]
Former-commit-id: a8872882ae
 2013-03-28 09:04:10 -05:00
Greg Armendariz
8d335839e6 Add source variable 
Former-commit-id: 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly d0d889f11d [formerly 8800080d2a [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]
Former-commit-id: d0d889f11d
Former-commit-id: da1c2ea08a80b36673131e488158b2c4a2af18db [formerly 24fea6f45d]
Former-commit-id: 44fcd1a8db
 2013-03-28 08:56:50 -05:00
Steve Harris
b7beed13a5 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]
Former-commit-id: 6e48567370
 2013-03-27 22:16:15 -05:00