Commit graph

3251 commits

Author SHA1 Message Date
Greg Armendariz
13ac0b1062 13.5.1-5 baseline
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
2013-07-03 12:20:27 -04:00
Nate Jensen
d97721eda9 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: ae004c8c77 [formerly 7bd12afa02] [formerly ae004c8c77 [formerly 7bd12afa02] [formerly 679bf314e0 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]
Former-commit-id: 679bf314e0
Former-commit-id: 7bb4d66cbf [formerly c8d221b46c]
Former-commit-id: 64a7f0d148
2013-07-03 09:37:05 -05:00
Roger Ferrel
9f8b831148 Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b

Former-commit-id: ebb76daf14 [formerly fab96d28f2] [formerly ebb76daf14 [formerly fab96d28f2] [formerly 752933c7fe [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]
Former-commit-id: 752933c7fe
Former-commit-id: 477d8b0317 [formerly 3c24739b72]
Former-commit-id: 0fb0ff7a5a
2013-07-02 17:27:22 -05:00
Bryan Kowal
c0905c536e Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 2e46748156 [formerly 6a6cdd7f6d] [formerly 2e46748156 [formerly 6a6cdd7f6d] [formerly dc177c90d1 [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]]
Former-commit-id: dc177c90d1
Former-commit-id: 94ecc8119c [formerly 6bbe51aca9]
Former-commit-id: a89ff261d0
2013-07-02 16:12:06 -05:00
Mike Duff
c1abe64b72 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 57d37e9761 [formerly 4399429e74] [formerly 57d37e9761 [formerly 4399429e74] [formerly 2618c1a4e4 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 617abbd8f1 [formerly 82d713083a]
Former-commit-id: 3e20961fe0
2013-07-02 16:08:37 -05:00
Max Schenkelberg
738d6bcae8 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: bc91a9f6de [formerly 9709b0500a] [formerly bc91a9f6de [formerly 9709b0500a] [formerly fef6056519 [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 63d69a5435 [formerly dc78010e74]
Former-commit-id: 1e7b73c44e
2013-07-02 15:22:31 -05:00
Mike Duff
afedebecd4 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: cc4ac57b22 [formerly 655d9eb928] [formerly cc4ac57b22 [formerly 655d9eb928] [formerly 5b676b122d [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]
Former-commit-id: 5b676b122d
Former-commit-id: 70d25a48dd [formerly d87b4bceb5]
Former-commit-id: c07d8ef10d
2013-07-02 12:31:10 -05:00
Roger Ferrel
1d3ee09895 Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 3c31d8c2ac [formerly 41c46e14c0] [formerly 3c31d8c2ac [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: b3437266d7 [formerly 201e62a4ad]
Former-commit-id: ea00a52ebe
2013-07-02 11:14:56 -05:00
Nate Jensen
6c95177bdf Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: c68cf47883 [formerly e4955f094c] [formerly c68cf47883 [formerly e4955f094c] [formerly 01efa33cb9 [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 058e47192a [formerly 150203f5cc]
Former-commit-id: d288dded44
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
28849d2a53 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: 58fcc4c896 [formerly a2328f0e06] [formerly 58fcc4c896 [formerly a2328f0e06] [formerly de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: de24b8b431
Former-commit-id: ab2e2f9a17 [formerly 4e1b0674e4]
Former-commit-id: 5431e5915d
2013-07-02 11:04:26 -05:00
Richard Peter
06ed1bc66c Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: f12b08401f [formerly 37042f0b2a] [formerly f12b08401f [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: aef289d287 [formerly 8e15d6aa0a]
Former-commit-id: f916bba7ad
2013-07-02 10:30:51 -05:00
Roger Ferrel
5eee41410c Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 82b1712714 [formerly c3ebc0cc1c] [formerly 82b1712714 [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]
Former-commit-id: 68be9bd65f
Former-commit-id: ff84f293fd [formerly 933009605a]
Former-commit-id: 68c22b7073
2013-07-01 15:45:14 -05:00
Nate Jensen
86b096bc9b Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
2013-07-01 14:41:05 -05:00
Roger Ferrel
d52ab020d1 Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking.
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 1c3c9e461b [formerly 1e7ae55676] [formerly 1c3c9e461b [formerly 1e7ae55676] [formerly 220818df3a [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]]
Former-commit-id: 220818df3a
Former-commit-id: ee5b120929 [formerly 3cabedbd45]
Former-commit-id: ac04c66be2
2013-07-01 13:03:39 -05:00
Mike Duff
9eb197d124 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 3fed839344 [formerly cd511c1a0c] [formerly 3fed839344 [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 2250983ad8 [formerly 053082cb80]
Former-commit-id: 0f4b98626b
2013-07-01 11:53:07 -05:00
Nate Jensen
89f8162e2b Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: b23dcab913 [formerly f7e743f388] [formerly b23dcab913 [formerly f7e743f388] [formerly 001fba449f [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]
Former-commit-id: 001fba449f
Former-commit-id: 47d3441930 [formerly 0cb9726554]
Former-commit-id: 57d1375eed
2013-07-01 11:29:47 -05:00
Bryan Kowal
29f21e56ee Issue #2153 - fix merge issue for build
Former-commit-id: 756fb4be59 [formerly f052982f8e] [formerly 756fb4be59 [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 08bb604ced [formerly 37a5eb6c69]
Former-commit-id: e6516def2a
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
23fe9db31b Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]].


Former-commit-id: 70ab67c3e5 [formerly c883b4e636] [formerly 70ab67c3e5 [formerly c883b4e636] [formerly 7f74926bb4 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]
Former-commit-id: 7f74926bb4
Former-commit-id: fa0887429d [formerly 41e94abee3]
Former-commit-id: a08032627c
2013-07-01 10:40:48 -05:00
Richard Peter
cca3d4c19b Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: edeb3e255b [formerly 162261c395] [formerly edeb3e255b [formerly 162261c395] [formerly 76bc31aa77 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: f8213c16bd [formerly d3017ca60f]
Former-commit-id: 3d6754337a
2013-07-01 00:04:43 -05:00
Richard Peter
da3eb1e75c Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: da54766cc8 [formerly 53258be797] [formerly da54766cc8 [formerly 53258be797] [formerly 582f38bdd4 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 69f8807963 [formerly 1757da59ee]
Former-commit-id: 7ceb1bb9ab
2013-06-30 23:46:32 -05:00
Brad Gonzales
245de9c408 Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: 2d1c6a0ec5 [formerly ba661b9e39] [formerly 2d1c6a0ec5 [formerly ba661b9e39] [formerly add108398a [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: bc766efb7a [formerly 5c9ce05ce3]
Former-commit-id: c4daf04c32
2013-06-28 13:25:46 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Brad Gonzales
33dc495040 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: 65507d4424 [formerly c28d1e5d4d] [formerly 65507d4424 [formerly c28d1e5d4d] [formerly f4bb78381c [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 6e99019a25 [formerly d842d8d9d0]
Former-commit-id: f51c74e2d4
2013-06-27 17:40:07 -05:00
Brad Gonzales
9a5c3e259d Issue #1965 added File filtering by file date extension in archive purge.
Amend: updated purge cron time to once every hour.
       moved archive.purge.cron to cron.properties.
       removed purge code from DataArchiver.
       added back isHoursToKeep in DataArchiver.
       updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
       updates from peer review.
       updated test cases to work with Roger's refactoring.
       fixes for ArchiveConfigManager createArchive.
       clean up of ArchiveConfigManager purgeFile.

Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519

Former-commit-id: 67b4a2e202 [formerly 137c66539e] [formerly 67b4a2e202 [formerly 137c66539e] [formerly 276f05233f [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]
Former-commit-id: 276f05233f
Former-commit-id: d6fb315096 [formerly 4f54596904]
Former-commit-id: d047e6a137
2013-06-27 11:46:44 -05:00
Dave Hladky
1b6421d4c3 Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: 083dff9e43 [formerly f5d3a5f012] [formerly 083dff9e43 [formerly f5d3a5f012] [formerly ee50b5c7be [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]]
Former-commit-id: ee50b5c7be
Former-commit-id: 08a81cdaaf [formerly 2b90920d8f]
Former-commit-id: 2a57eea47f
2013-06-27 11:07:27 -05:00
Roger Ferrel
6261e65829 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 6f07f6f3bd [formerly ee409c0819] [formerly 6f07f6f3bd [formerly ee409c0819] [formerly f66681f62b [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]
Former-commit-id: f66681f62b
Former-commit-id: 5f35643c2d [formerly 45dcfe3ad8]
Former-commit-id: bec6928ea9
2013-06-27 07:51:56 -05:00
Dave Hladky
11c6036301 Issue #2146 Deleted uneeded jars from crawl4j plugin
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01

Former-commit-id: 2eded94be4 [formerly d92e039e72] [formerly 2eded94be4 [formerly d92e039e72] [formerly d298749486 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]]
Former-commit-id: d298749486
Former-commit-id: e8ac45c21f [formerly 00ed2353ad]
Former-commit-id: ecf2849566
2013-06-26 14:59:22 -05:00
Richard Peter
2952f2b56d Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: e3886246fd [formerly 3a3dc3d208] [formerly e3886246fd [formerly 3a3dc3d208] [formerly 67d052307c [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]
Former-commit-id: 67d052307c
Former-commit-id: 1b00dd48ec [formerly 208b01a167]
Former-commit-id: 575405b14e
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
6cb77b1793 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 570da6f0d5 [formerly 8c14a34f46] [formerly 570da6f0d5 [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 2ce266f7e7 [formerly f26a72afe9]
Former-commit-id: 0d2f556144
2013-06-26 13:24:13 -05:00
Nate Jensen
586cb967aa Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
Former-commit-id: 8cc7eefd84 [formerly a60afe6640] [formerly 8cc7eefd84 [formerly a60afe6640] [formerly 10baafed63 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]
Former-commit-id: 10baafed63
Former-commit-id: 9374463bac [formerly 214fd8689c]
Former-commit-id: b4c6a79741
2013-06-26 11:14:03 -05:00
Richard Peter
18e49d732b Merge "Issue #2144 Switched hibernate to Post GIS config" into development
Former-commit-id: b616339f1d [formerly 8a9feffa82] [formerly b616339f1d [formerly 8a9feffa82] [formerly ad91edf3de [formerly d59f39da96caaf163ceb5bc7055b0412e118875b]]]
Former-commit-id: ad91edf3de
Former-commit-id: 8c968f2120 [formerly dedc9ecda0]
Former-commit-id: 46ef5c884a
2013-06-25 18:22:09 -05:00
Jonathan Sanchez
acad56f72b Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]
Former-commit-id: e4c0188c14
Former-commit-id: d1b63b5a25 [formerly 47505aa013]
Former-commit-id: c4ce4831c2
2013-06-25 15:29:08 -05:00
Roger Ferrel
3419cbaddd Issue #1966 Initial Base configuration files for Dale Morris to test.
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 1e5d68fa1b [formerly 2cfff5c563] [formerly 1e5d68fa1b [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 318de198e5 [formerly ee52f0281c]
Former-commit-id: b681d07346
2013-06-25 13:44:30 -05:00
Dave Hladky
7dda985dd1 Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: b4e41b137d [formerly 5aee30a473] [formerly b4e41b137d [formerly 5aee30a473] [formerly fe5cde7afd [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 34400e34c7 [formerly 671b6ee566]
Former-commit-id: c038109d5d
2013-06-25 13:31:37 -05:00
Dustin Johnson
9b42432838 Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: 5bfef9bb45 [formerly fac7d3a9d9] [formerly 5bfef9bb45 [formerly fac7d3a9d9] [formerly 69c09e530f [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]
Former-commit-id: 69c09e530f
Former-commit-id: da1ad3c8a0 [formerly f67d02a394]
Former-commit-id: c2ed1495ad
2013-06-25 08:33:55 -05:00
Richard Peter
ed15c2edcc Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: ad353c34f9 [formerly d262c02612] [formerly ad353c34f9 [formerly d262c02612] [formerly b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e03283ad4a [formerly af1099b3fb]
Former-commit-id: 8f49eea08f
2013-06-24 18:51:56 -05:00
Richard Peter
9acddf6eeb Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 0fa3bf800d [formerly 744eb64856] [formerly 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: be094a1745 [formerly a7594f8c93]
Former-commit-id: 4b582fef50
2013-06-24 18:36:15 -05:00
Ron Anderson
d7d227a83a Issue #2122 Fix the build
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: ce42bdead7 [formerly f75554f1f7] [formerly ce42bdead7 [formerly f75554f1f7] [formerly f06a8baf2d [formerly bf3b00be422d690aa9646462556607335ef85fc0]]]
Former-commit-id: f06a8baf2d
Former-commit-id: eedb35faed [formerly 6740c9e40f]
Former-commit-id: 740542cd56
2013-06-24 18:03:52 -05:00
Richard Peter
65d1bed2a8 Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
Former-commit-id: a67d190612 [formerly 5f85aefff6] [formerly a67d190612 [formerly 5f85aefff6] [formerly a19a946a24 [formerly ed31841e537d54ead391013919a94c879afd6f77]]]
Former-commit-id: a19a946a24
Former-commit-id: fdad3e08b7 [formerly 8481dd6bce]
Former-commit-id: f55e67c3ad
2013-06-24 17:20:10 -05:00
Max Schenkelberg
539bbe2cb5 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: b4c0d1f715 [formerly 47b55981c8] [formerly b4c0d1f715 [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: c912e8e6c5 [formerly bc4ebb4f08]
Former-commit-id: 20caab72f9
2013-06-24 15:48:37 -05:00
Bryan Kowal
c525056059 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: 2b8984c445 [formerly 5b85217ca2] [formerly 2b8984c445 [formerly 5b85217ca2] [formerly cd2af684ca [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]]
Former-commit-id: cd2af684ca
Former-commit-id: a56679fa2a [formerly 7ebee00dc9]
Former-commit-id: 6cff1f63bb
2013-06-24 14:08:47 -05:00
Nate Jensen
25f4b15072 Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: d5897c323b [formerly 6541a89bf5] [formerly d5897c323b [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]
Former-commit-id: 0479cea2e6
Former-commit-id: 1408ed3e1e [formerly a2c5c2a1a3]
Former-commit-id: 3b22e752aa
2013-06-24 09:12:12 -05:00
Nate Jensen
a103586ecd Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development
Former-commit-id: 8a76694b9f [formerly b1bd29e784] [formerly 8a76694b9f [formerly b1bd29e784] [formerly 69eec45f13 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]
Former-commit-id: 69eec45f13
Former-commit-id: f4a6354929 [formerly a44073cce6]
Former-commit-id: 1c9458d595
2013-06-24 09:10:01 -05:00
Steve Harris
50d4376af7 13.5.1-3 baseline
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: deebdb874a [formerly 810388f00a]
Former-commit-id: 1e939939b5
2013-06-24 09:29:43 -04:00
Mike Duff
0e36cab21f Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: 7b3d79edc9 [formerly f685e73bd2] [formerly 7b3d79edc9 [formerly f685e73bd2] [formerly 14bd577f6c [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]]
Former-commit-id: 14bd577f6c
Former-commit-id: defc6a3080 [formerly 65faaadc7c]
Former-commit-id: a8a4393c82
2013-06-21 14:59:03 -05:00
Dave Hladky
0baba17c1d Issue #2129 mkdirs call added to create directories at instantiation.
Change-Id: I163e3f832e04af17da8a18196a10b50d30b8c83d

Former-commit-id: b781e784f9 [formerly 26398f6fb7] [formerly b781e784f9 [formerly 26398f6fb7] [formerly 0544a0cf88 [formerly b8ae6705e92e8816385cb2fce87175bbb4687d6d]]]
Former-commit-id: 0544a0cf88
Former-commit-id: 1f640b3173 [formerly 57caa68867]
Former-commit-id: fe71c9133d
2013-06-21 11:13:04 -05:00
David Gillingham
d88ca5e0c4 Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 5490893942 [formerly 6b696c9e6a] [formerly 5490893942 [formerly 6b696c9e6a] [formerly 4f6c293a7e [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]]
Former-commit-id: 4f6c293a7e
Former-commit-id: 2e14d2fda4 [formerly 8b7a998bbf]
Former-commit-id: 3a78e38ae5
2013-06-20 16:31:43 -05:00
Dustin Johnson
2fed4b0da0 Issue #2106 Fix setting of data size on gridded subscriptions
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: 71da2985f7 [formerly b486e5f2fe] [formerly 71da2985f7 [formerly b486e5f2fe] [formerly 554b43807e [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]]
Former-commit-id: 554b43807e
Former-commit-id: 7887201ebf [formerly eaa3e47877]
Former-commit-id: 6987235067
2013-06-20 16:00:08 -05:00
Dustin Johnson
a6c7287a74 Issue #1802 Fix event processing in regards to transaction commits/rollbacks
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22

Former-commit-id: a606508cd4 [formerly ecae75ecd8] [formerly a606508cd4 [formerly ecae75ecd8] [formerly a331cd2958 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]
Former-commit-id: a331cd2958
Former-commit-id: cf36003f12 [formerly d2faa3b600]
Former-commit-id: 87e4d9269d
2013-06-20 13:53:04 -05:00
Dave Hladky
0477abf081 Issue #2120 Fixed SSL connection problem
Change-Id: I4a4e277ac75420bbaa621dcddb562e654211436c

Former-commit-id: 4a6248547a [formerly ffc9dc1ac9] [formerly 4a6248547a [formerly ffc9dc1ac9] [formerly 47d18e42ab [formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]]
Former-commit-id: 47d18e42ab
Former-commit-id: b2545d7408 [formerly 5d37e710d7]
Former-commit-id: 806fb4f3db
2013-06-20 12:51:30 -05:00