Commit graph

2735 commits

Author SHA1 Message Date
Richard Peter
f03594dc87 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]]
Former-commit-id: 6d73e25290
Former-commit-id: dcc6ca7202 [formerly 8ac6ae3539] [formerly dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23]]
Former-commit-id: 54bea0b83fc5bd1c3cc475f07d09468710cce778 [formerly 0548ee285d]
Former-commit-id: 75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]]
Former-commit-id: cfcacd20e9
Former-commit-id: bddc4b1bdf [formerly d973d83519] [formerly a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7]]
Former-commit-id: 3332bf3bb5bf9062085e62fc233a2fd0b8b7dbdc [formerly d2dd57fee4]
Former-commit-id: aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Nate Jensen
cf069478fe Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]]
Former-commit-id: fe24e34163
Former-commit-id: 62eb52e295 [formerly 1c6643e7de] [formerly 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94]]
Former-commit-id: a757d160b2e5635526d0c3f28efa98d91764c0cf [formerly 01b25904ad]
Former-commit-id: f0abb60a1b
2013-04-03 14:33:24 -05:00
Lee Venable
13754c533c Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
Former-commit-id: bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]]
Former-commit-id: ff910d99fc
Former-commit-id: 49fc55ce03 [formerly 3d129d4526] [formerly dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1]]
Former-commit-id: cd7a6b03494efcd71e21fc5a0f3ae6206fdcaa20 [formerly 5b0fb8eeaf]
Former-commit-id: 542dfcaf9b
2013-04-03 14:14:41 -05:00
Nate Jensen
5a88c9820b Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
Former-commit-id: 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]]
Former-commit-id: 1bc148b468
Former-commit-id: 0a783718a9 [formerly 2d4dc636ce] [formerly 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0]]
Former-commit-id: 2c852a36d92e9ace1a3bf68a94b1ecc96bc27b30 [formerly ab51de7da5]
Former-commit-id: 2c6e995faf
2013-04-03 14:13:14 -05:00
Nate Jensen
fc40cab9bc Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]]
Former-commit-id: 6c711f037c
Former-commit-id: 10b70e4222 [formerly 6ca17c5a2a] [formerly a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550]]
Former-commit-id: 084203f5ffb0d6a7d8de687bcc1a6caa6ffeaf43 [formerly fb5bce6afe]
Former-commit-id: 0e25d15232
2013-04-03 14:10:53 -05:00
Bryan Kowal
aab5a08bdb Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: ea6a9687f7 [formerly b60bea920c] [formerly 75de255c33338b2c6a36abb8a97bd7559baa6968 [formerly 344237d9ee]]
Former-commit-id: a0d42e4f89e75d56e4c9f0549bc21f3da3691e6b [formerly 962755143e]
Former-commit-id: 1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 42ab5f4244 [formerly 939ff752e8 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]]
Former-commit-id: 42ab5f4244
Former-commit-id: e618c4833f [formerly 93cd16508c] [formerly 95d11ada8c00865cd2e0c7fefde5e05c93de384a [formerly 4fe7bace99]]
Former-commit-id: 0c7c37575eec14f586dc5a62f5d1c1ee24b0f946 [formerly e709933a4f]
Former-commit-id: 6ab8e23421
2013-04-03 14:03:18 -05:00
Ron Anderson
8a2c181df6 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]]
Former-commit-id: b703b4779e
Former-commit-id: a0c34f1750 [formerly 0d57a752dc] [formerly 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389]]
Former-commit-id: f6906d6c665fe19cb44286fdb8ff6ebb5d58db5c [formerly 2222201f43]
Former-commit-id: 3be7ce8bab
2013-04-03 14:01:18 -05:00
Roger Ferrel
89be749f8d 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 e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]]
Former-commit-id: d2aae617b2
Former-commit-id: 3248f4bcf2 [formerly 2b4b10d643] [formerly 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec]]
Former-commit-id: 718544292ebcdbe6476ea274620a8961444112e5 [formerly ad658b46bf]
Former-commit-id: 2cad51c18f
2013-04-03 12:48:18 -05:00
Jonathan Sanchez
7a7a1b7ea0 Issue #1858 Handled creating a follow up when initial was created before
0z but issued after.

Former-commit-id: 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly 9c322bf4b7 [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]]
Former-commit-id: 799b8c57ef
Former-commit-id: 689334d2e1 [formerly 7ca110890a] [formerly a8114ff352a146cacee317eae56977b042f8cda5 [formerly bd25782b7a]]
Former-commit-id: 3b57f5d0ff98ca49da8472e1ed3b12ed2f12464a [formerly 30a728e641]
Former-commit-id: 6f25295c90
2013-04-03 11:43:59 -05:00
Ben Steffensmeier
9239e64c15 Issue #1824 Fix Tile Geometry creation.
Former-commit-id: f8db56c0af [formerly fe561d7af0] [formerly fedbc28588] [formerly f8db56c0af [formerly fe561d7af0] [formerly fedbc28588] [formerly cfcc33cd7b [formerly fedbc28588 [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: f2915807a0 [formerly e0bbe368be] [formerly a47a6ce1413348a47ef24247df2a0ba67f2fd485 [formerly 58d81f6556]]
Former-commit-id: 1173cfa28f3150dd6e87469f3aeb1b25a52af127 [formerly 15be152be1]
Former-commit-id: eb98e23be1
2013-04-03 10:59:11 -05:00
Lee Venable
a32d254419 Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1
Former-commit-id: 15c707ac50 [formerly 48433d4d37] [formerly 0693b02556] [formerly 15c707ac50 [formerly 48433d4d37] [formerly 0693b02556] [formerly 7bdf9c3115 [formerly 0693b02556 [formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]]]
Former-commit-id: 7bdf9c3115
Former-commit-id: 503ac4a1c9 [formerly f254b070eb] [formerly f86e075331dbbcb0667795e2fcb2530476ddf632 [formerly ea85582347]]
Former-commit-id: dce2e4ef996aa9a742e585d2999d2f662f5cf493 [formerly 2912d66b16]
Former-commit-id: d5a12212d9
2013-04-02 17:46:48 -05:00
Mike Duff
0f8a831c01 Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly 64cdb3c7fd [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]]
Former-commit-id: 23c8085402
Former-commit-id: a932186e2f [formerly bb14757eed] [formerly ca721abdd76f0ab8bfb9d6237b043b5674132b84 [formerly 3f2f0937ce]]
Former-commit-id: dbd807a7829dd50e060600aa69920cc72d69167b [formerly 5298fb6633]
Former-commit-id: aef1bc779f
2013-04-02 16:22:23 -05:00
Greg Armendariz
2b710f3540 Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]]
Former-commit-id: 54f56fde29
Former-commit-id: 2bfe8fccfd [formerly e3cf306ce4] [formerly d64b8f0c79380e97b0125bf494b7ba124b119a98 [formerly 02e79dfe8a]]
Former-commit-id: 3273e25181a10873df7356911fe3ccbe0a321fe3 [formerly 9ca713f588]
Former-commit-id: e389a3bf6a
2013-04-02 15:00:26 -05:00
Nate Jensen
b65824a812 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly cb6cd91f06 [formerly ab28523a09] [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: c82a67f378 [formerly 1ad5bb1a52] [formerly 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]]
Former-commit-id: da64965f81585567559fad5d0cd0833628607d59 [formerly d1f53fb57e]
Former-commit-id: e0cb68cc06
2013-04-02 14:29:15 -05:00
Bryan Kowal
a3a009e375 Issue #1850 - the ebxml schema will now be created within the metadata database
Former-commit-id: 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 3d13334576 [formerly d6e3d52126] [formerly 8d63244b4e] [formerly 2dbd62e9ce [formerly 8d63244b4e [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: 55b84c59c6 [formerly a57a457c79] [formerly 57767b7c64c0b9fe7114780c1b2b46960afdf9dc [formerly b31ade0770]]
Former-commit-id: 5d201beef6e4982516bfefcc6ee6d05a26d22162 [formerly 94b0191843]
Former-commit-id: 3f9bcfe936
2013-04-02 10:49:46 -05:00
Dustin Johnson
b6c2c0194c 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 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]]
Former-commit-id: 6129d86be4
Former-commit-id: c42ca22867 [formerly 644ed2396d] [formerly e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]]
Former-commit-id: 4466a4fe3eec25da0716798d2d3f9beb6bb0d4f0 [formerly 15ed8a6f58]
Former-commit-id: e57b8314d8
2013-04-01 15:35:51 -05:00
Max Schenkelberg
bb8e2cf3e1 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 a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]]
Former-commit-id: 547190329b
Former-commit-id: 984e67acda [formerly ba262e2bc5] [formerly a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]]
Former-commit-id: 27d68b81294fdcff628db2407a3b0b00c4165e1d [formerly 80b0f7c159]
Former-commit-id: ee60a2a80c
2013-04-01 12:41:50 -05:00
Lee Venable
e77b20af5d Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 7e4696f582 [formerly 58c83b9662] [formerly 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1]]
Former-commit-id: 6cebcfee43829f43dceb8e066a3d5bfe306d66e1 [formerly e66a72fbed]
Former-commit-id: ca38aca6df
2013-04-01 12:26:23 -05:00
Steve Harris
6a3f6359d6 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 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8]
Former-commit-id: ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f 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 d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00
Lee Venable
ad603c0971 Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]]
Former-commit-id: d3390596f4
Former-commit-id: 1c1b083dbf [formerly 4e95ffe2ae] [formerly 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]]
Former-commit-id: e0fe5a0651fea3911879ccab45390dea686a6a64 [formerly e0d1017c14]
Former-commit-id: 631444f8fa
2013-04-01 12:06:16 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
b739c58290 13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 994aab5c6a [formerly 6b75202d07] [formerly 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]]
Former-commit-id: 19e2f3972eced86532b7883214738f39cc0c8612 [formerly c53a305b1e]
Former-commit-id: e61c718b49
2013-04-01 11:39:08 -05:00
Mike Duff
d73a468059 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 0f3223b8b9 [formerly e627279d7c] [formerly 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]]
Former-commit-id: 4837b6fc816588eadba7e1dc8793471d71a914aa [formerly 63489a0873]
Former-commit-id: e07f3971c0
2013-04-01 11:36:53 -05:00
Richard Peter
7132200d1c 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 b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]]
Former-commit-id: 255617199c
Former-commit-id: fcbac13167 [formerly 65f317e56b] [formerly 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]]
Former-commit-id: 2945b0291f595207661a7b4d2aae5bfd1b61f8ec [formerly 58a8049b64]
Former-commit-id: 1b229e3d61
2013-04-01 11:33:59 -05:00
Steve Harris
622caf8d93 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
2013-04-01 11:33:20 -05:00
Max Schenkelberg
aeb8a97b02 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 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]]
Former-commit-id: 51d976e5e2
Former-commit-id: af56d47973 [formerly 8de3a70962] [formerly e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]]
Former-commit-id: 62b962b1d377e7f942551913bb5a435bea8c88c7 [formerly 01c2d29c1b]
Former-commit-id: a29eff544b
2013-04-01 10:19:36 -05:00
Lee Venable
f890984a8a Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ec82403afa [formerly ebfa8ea79c] [formerly 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]]
Former-commit-id: 53437b54152c1d6ef462f859d385b814fbb1d91c [formerly 034e16baa7]
Former-commit-id: 0a5a8d108a
2013-04-01 09:40:59 -05:00
Steve Harris
ca4153d5f5 13.2.1-19 baseline
Former-commit-id: 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]]]
Former-commit-id: fc859547f8
Former-commit-id: 8a561e4b84 [formerly 4525c281f3] [formerly 34cab86a38e7b40b1cbd8dddbfeae07e06a3afb3 [formerly a83eddfe7b]]
Former-commit-id: 2d3ca74ddb9d8c545d7c78bcaf1a55c8279718cf [formerly 999eb26cec]
Former-commit-id: 0ff4cc2cc4
2013-04-01 10:11:24 -04:00
Roger Ferrel
2c4327e525 Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

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

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

Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]]
Former-commit-id: 463407a40e
Former-commit-id: ecdb29cc1d [formerly 8c1116eaae] [formerly b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]]
Former-commit-id: f9e5b103cc66b19c490c084b0f65e71e9a2704bd [formerly c1ffc82920]
Former-commit-id: 791fbba888
2013-03-29 11:35:08 -05:00
Ron Anderson
6323fb90b1 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 d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]]
Former-commit-id: c7cfcf0250
Former-commit-id: ba064a146a [formerly cd0f319ec5] [formerly b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]]
Former-commit-id: 4797511c3c164c1892ecfbe58632bbae5c051a8a [formerly 41b0758084]
Former-commit-id: 8502dee456
2013-03-29 10:48:26 -05:00
Ron Anderson
92a156fe0f Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]]
Former-commit-id: 679bb01764
Former-commit-id: 6cd8d1e8ee [formerly d5e3976dc4] [formerly 905f44a12ebe7347d47fb3a96c6a47ac28a6024f [formerly 96e8f63679]]
Former-commit-id: 4a42a154f1df90e4b82ead30ff3b512563ee1f14 [formerly 22f633b2a1]
Former-commit-id: 1eede44aac
2013-03-29 10:07:37 -05:00
Greg Armendariz
4b042a145d Fix merge issue
Former-commit-id: 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 7382b92b41 [formerly dcd36e64a6] [formerly 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2]]
Former-commit-id: aabec0ec4490b2d78130b37cfd26e0a7ec9b56dd [formerly 57eff9d7bf]
Former-commit-id: 9a8ce1af9e
2013-03-29 09:52:46 -05:00
Greg Armendariz
54fef6c68f Change package location of import
Former-commit-id: 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]]
Former-commit-id: 27345f6edf
Former-commit-id: 54231d5bcc [formerly 05af592718] [formerly 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6]]
Former-commit-id: 8c8f0c979cc0dab06aa749a105aa5767bce4b2d6 [formerly 87e37c990e]
Former-commit-id: 63d746dd77
2013-03-29 09:09:32 -05:00
David Gillingham
7fdc3419ec 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 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: acc3ac1c03 [formerly fddd42615d] [formerly 9f4cd32b5571d903c6b3f5e023a5fb8faddecd4f [formerly dbec0fa00f]]
Former-commit-id: 90bc9337ad9dafe74c0cc603a354d9e435dfdd1e [formerly 0b155a5788]
Former-commit-id: 4c1c4e665e
2013-03-28 17:18:43 -05:00
Nate Jensen
a000719325 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 8092e699e6 [formerly 946323416c] [formerly 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]]
Former-commit-id: a360b60383d40ac29a22e5ea872d7601bf70222f [formerly a6a81a17d6]
Former-commit-id: 1b1d1a48d2
2013-03-28 17:02:14 -05:00
Richard Peter
d18439e5e8 Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
Former-commit-id: b548239f0b [formerly 1228c8cbbc] [formerly b4fea10724] [formerly b548239f0b [formerly 1228c8cbbc] [formerly b4fea10724] [formerly 209d53ee67 [formerly b4fea10724 [formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]]]
Former-commit-id: 209d53ee67
Former-commit-id: 16fcad80cd [formerly affe383cf3] [formerly 82e5c3e6f53c40ac03ff1c4efe1d517532b59faf [formerly 8b0347001d]]
Former-commit-id: 37801977c0bd5597ef5cd0fa5551cf1cc61a4d83 [formerly a087e63bcb]
Former-commit-id: c22b37600a
2013-03-28 16:59:18 -05:00
Steve Harris
20ece0647e Issue #1782 - restore FFPMGenerator.java
Former-commit-id: 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]]
Former-commit-id: 3953f8368b
Former-commit-id: cf60c00cb2 [formerly bec6e9099f] [formerly 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5]]
Former-commit-id: e85be3d04a48ce9d094adad6cc0f9c59b3b531da [formerly 92aa705ebc]
Former-commit-id: ef1e593ebd
2013-03-28 16:06:54 -05:00
Bryan Kowal
3ad26d1b99 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 a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]]
Former-commit-id: e3c39b9be6
Former-commit-id: 0e463b7bc9 [formerly fa5825b0c5] [formerly 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7]]
Former-commit-id: 9645bd3efad403aca10a90570bae4707b44a92e2 [formerly df6d81dfd9]
Former-commit-id: 8cd870d757
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
f8747920e5 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]]
Former-commit-id: 4efa92ff49
Former-commit-id: d7d0ea7264 [formerly 33de9bfc87] [formerly 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]]
Former-commit-id: 006fd150c7d61038086ffa25715d53db4c52c407 [formerly a5e1593213]
Former-commit-id: 788df8fc68
2013-03-28 15:47:36 -05:00
Max Schenkelberg
e6e93dbc2a Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly a308b27c2f [formerly e91406ab10 [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]]
Former-commit-id: a308b27c2f
Former-commit-id: 232655183c [formerly 623c49c3cc] [formerly e4d956e4004a3d775c7a86d2f7a9ed188361fc67 [formerly d9a481f542]]
Former-commit-id: 73b5d3c96bf8dd9ba37e4ab2e38562564605d6ee [formerly 58a5bebb80]
Former-commit-id: b30b72252b
2013-03-28 15:45:31 -05:00
Ron Anderson
80ce55bd3a Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]]
Former-commit-id: b65ecfc151
Former-commit-id: 65dd075089 [formerly 33bcf5fee8] [formerly 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]]
Former-commit-id: 378adfc06dd24afcb2243ae4d39d879540f2cf23 [formerly 5eb1885dbd]
Former-commit-id: bef17d4f03
2013-03-28 13:37:29 -05:00
Steve Harris
0528a1c5d2 Revert "Replaced with formatted version"
This reverts commit 911496b339 [formerly 20c9d653c8] [formerly 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]] [formerly 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]].


Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]]
Former-commit-id: 8400028e11
Former-commit-id: c9dd652973 [formerly 7bd478fc41] [formerly 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]]
Former-commit-id: 7785f0f8379983a18ed3a8ce49a49f5cee5bbfcc [formerly 0074c522bb]
Former-commit-id: 938243eb0b
2013-03-28 13:08:16 -05:00
Dustin Johnson
e275e220bb 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 c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]]]
Former-commit-id: 3991df64ff
Former-commit-id: d37764f722 [formerly 3896cf42f1] [formerly 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4]]
Former-commit-id: d71448462cb9ab117673ae34b2e4a8163533ee0f [formerly 9c4030ea37]
Former-commit-id: be22a59736
2013-03-28 13:07:20 -05:00