Commit graph

3100 commits

Author SHA1 Message Date
Richard Peter
4711199fe2 Merge "Issue #2133 - qpid is now a wrapped java application; incremented qpid release" into development
Former-commit-id: fa04a866a2 [formerly 620838babe] [formerly fbd6bb6421] [formerly 06f1945cbb [formerly fbd6bb6421 [formerly 44da96f5c268100f1e923b1f54120635c45d644c]]]
Former-commit-id: 06f1945cbb
Former-commit-id: a6d83d3575d83c67c9470ca59ff81044725b6e4b [formerly 89856968a8]
Former-commit-id: d1c70fdff5
2013-07-05 13:47:20 -05:00
Bryan Kowal
27686fad8b Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 705f7197809a3a559d87c56da87de7baa0ca23a6 [formerly 5e4350392b]
Former-commit-id: ad1d8e35e0
2013-07-03 19:36:42 -05:00
Bryan Kowal
3c0cb232c2 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]
Former-commit-id: 56c7afbc0f
2013-07-03 15:55:53 -05:00
Bryan Kowal
4076dec94a Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: c087e22ce2 [formerly f484a47d43] [formerly 63345a298b] [formerly 9f632d9e2d [formerly 63345a298b [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]]]
Former-commit-id: 9f632d9e2d
Former-commit-id: f3b3951a079ee2c3525215ec62394bf5fd3f4f19 [formerly 4a492c0059]
Former-commit-id: 588503289a
2013-07-03 15:35:12 -05:00
Nate Jensen
aa6f46efd6 Merge "Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified." into development
Former-commit-id: 22ee16a803 [formerly d883392d05] [formerly f13bd6391a] [formerly 6465fb58ad [formerly f13bd6391a [formerly 929f2145983f183722dbeacbbf996b78179657c6]]]
Former-commit-id: 6465fb58ad
Former-commit-id: 490a3b990cacecdc884502035e965659982a0e8d [formerly 6a9b54cd4e]
Former-commit-id: 0cb178f835
2013-07-03 13:32:49 -05:00
Greg Armendariz
b727fab06d Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 425f676b5a [formerly 7f6ae6bca4] [formerly 40d7855af0] [formerly 27ba2d1d3c [formerly 40d7855af0 [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]]]
Former-commit-id: 27ba2d1d3c
Former-commit-id: 02da8c26502280bd3b12ab7a8202f3d0ecf41d14 [formerly 3360d5f0b2]
Former-commit-id: a695123c7d
2013-07-03 13:23:05 -05:00
Nate Jensen
671a9a81ef Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 3bb2890812 [formerly b7ddbeed41] [formerly d4261fcc45] [formerly 6b93db235f [formerly d4261fcc45 [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]]]
Former-commit-id: 6b93db235f
Former-commit-id: 0f31486a4098733feacb024f5bbfc2b05fa3cab2 [formerly 8793ca3101]
Former-commit-id: b688000175
2013-07-03 13:10:39 -05:00
Nate Jensen
f7920f833c Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: abb3ff9cec [formerly d5d5c5e674] [formerly 1fb11fbdf7] [formerly 47520c7b30 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]]
Former-commit-id: 47520c7b30
Former-commit-id: 6cc45042cab77ebaeffcf4ae395f265095604db7 [formerly 577292d8d5]
Former-commit-id: 1bd4d15d7a
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
679ef95297 Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: af51ecc7c9 [formerly 2d8e1e5e6c] [formerly 60ab89a3c68b3137496a7647972e3494926dcd06 [formerly a868d3d0b5]] [formerly 53d969d0db [formerly a868d3d0b5 [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]]]
Former-commit-id: 53d969d0db
Former-commit-id: f9fb487f9e5019b31c24a98c3d01a0959d8527a4 [formerly dde0846fc3]
Former-commit-id: b18f4bbe89
2013-07-03 12:44:45 -05:00
Bryan Kowal
b94334199e Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]
Former-commit-id: 1c49dff18e
Former-commit-id: fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]
Former-commit-id: c9fa275089
2013-07-03 11:25:46 -05:00
Nate Jensen
614cdb58a8 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 7b6481ba36 [formerly ae004c8c77] [formerly 7bd12afa02] [formerly 679bf314e0 [formerly 7bd12afa02 [formerly d679aae13498d67d79a1134275f1016699583e1f]]]
Former-commit-id: 679bf314e0
Former-commit-id: 0681c396fa825b8599c62566e72b40ac503776b2 [formerly c8d221b46c]
Former-commit-id: 7bb4d66cbf
2013-07-03 09:37:05 -05:00
Roger Ferrel
2f5994b297 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: 8cab528dc8 [formerly ebb76daf14] [formerly fab96d28f2] [formerly 752933c7fe [formerly fab96d28f2 [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]]]
Former-commit-id: 752933c7fe
Former-commit-id: 0187d6cc339bec8a38231e4fb72a3c74d9c45138 [formerly 3c24739b72]
Former-commit-id: 477d8b0317
2013-07-02 17:27:22 -05:00
Max Schenkelberg
358ad28927 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: fa03e3f2ef [formerly bc91a9f6de] [formerly 9709b0500a] [formerly fef6056519 [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 41e73cad8a29f48a4d17728ff37661b0f76dc35e [formerly dc78010e74]
Former-commit-id: 63d69a5435
2013-07-02 15:22:31 -05:00
Mike Duff
d09183f6d7 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: d82c72b52b [formerly cc4ac57b22] [formerly 655d9eb928] [formerly 5b676b122d [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]]
Former-commit-id: 5b676b122d
Former-commit-id: d2cd687662b0530ea34852c00595d332ebbac558 [formerly d87b4bceb5]
Former-commit-id: 70d25a48dd
2013-07-02 12:31:10 -05:00
Richard Peter
45070c3a98 Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: 2764b2edf4 [formerly f12b08401f] [formerly 37042f0b2a] [formerly a3bd7b3e9c [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 63a1c03ad480f03852b9a9486718f0c5cb33e35e [formerly 8e15d6aa0a]
Former-commit-id: aef289d287
2013-07-02 10:30:51 -05:00
Nate Jensen
cce5d8e8ff Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]
Former-commit-id: 5a6b0f99cc
2013-07-01 14:41:05 -05:00
Mike Duff
93bbabda66 Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: 44e60899d3 [formerly 3fed839344] [formerly cd511c1a0c] [formerly 5c7fd77f98 [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 6861a04120f0e5954cbc5868c9ecf103bfd55a3d [formerly 053082cb80]
Former-commit-id: 2250983ad8
2013-07-01 11:53:07 -05:00
Richard Peter
5bcfa6048d 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: 2368697938 [formerly edeb3e255b] [formerly 162261c395] [formerly 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f]
Former-commit-id: f8213c16bd
2013-07-01 00:04:43 -05:00
Richard Peter
0da7509e6d 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: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]
Former-commit-id: 69f8807963
2013-06-30 23:46:32 -05:00
Brad Gonzales
fb8caf6e22 Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: f95cf443d5 [formerly 2d1c6a0ec5] [formerly 6e50d5db4002b3feebcb544d0d67167622133263 [formerly ba661b9e39]] [formerly add108398a [formerly ba661b9e39 [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3]
Former-commit-id: bc766efb7a
2013-06-28 13:25:46 -05:00
Steve Harris
43bb696901 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Brad Gonzales
1c6ca60919 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: aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]
Former-commit-id: 6e99019a25
2013-06-27 17:40:07 -05:00
Brad Gonzales
df7670676b 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: 90f363d722 [formerly 67b4a2e202] [formerly c4b2f73dd1daaad9333db436ba709a2fa135112c [formerly 137c66539e]] [formerly 276f05233f [formerly 137c66539e [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]
Former-commit-id: 276f05233f
Former-commit-id: ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904]
Former-commit-id: d6fb315096
2013-06-27 11:46:44 -05:00
Dave Hladky
9637e9c427 Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

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

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

Former-commit-id: 9f621ed6f6 [formerly 2eded94be4] [formerly d92e039e72] [formerly d298749486 [formerly d92e039e72 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]]
Former-commit-id: d298749486
Former-commit-id: dc3c08fc586f55d74f5997ba1f7d8bdaee7b0ba7 [formerly 00ed2353ad]
Former-commit-id: e8ac45c21f
2013-06-26 14:59:22 -05:00
Richard Peter
59789a3885 Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: 45956fdcaa [formerly e3886246fd] [formerly 3a3dc3d208] [formerly 67d052307c [formerly 3a3dc3d208 [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]
Former-commit-id: 67d052307c
Former-commit-id: 705e64d8c7547f55a4b9ebb9c95b3b9faf82cc18 [formerly 208b01a167]
Former-commit-id: 1b00dd48ec
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
9906f30ff0 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]
Former-commit-id: 6db28c32a5
Former-commit-id: b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9]
Former-commit-id: 2ce266f7e7
2013-06-26 13:24:13 -05:00
Nate Jensen
a56dc79f87 Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
Former-commit-id: 9282a3be3b [formerly 8cc7eefd84] [formerly a60afe6640] [formerly 10baafed63 [formerly a60afe6640 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]
Former-commit-id: 10baafed63
Former-commit-id: 81b3d5ac13949746ea2fab31914ba17a9472bd55 [formerly 214fd8689c]
Former-commit-id: 9374463bac
2013-06-26 11:14:03 -05:00
Richard Peter
350804e7f4 Merge "Issue #2144 Switched hibernate to Post GIS config" into development
Former-commit-id: 6bd546714c [formerly b616339f1d] [formerly 8a9feffa82] [formerly ad91edf3de [formerly 8a9feffa82 [formerly d59f39da96caaf163ceb5bc7055b0412e118875b]]]
Former-commit-id: ad91edf3de
Former-commit-id: 16947784ce2c607d53a7a1ee83a309f7883b0bcd [formerly dedc9ecda0]
Former-commit-id: 8c968f2120
2013-06-25 18:22:09 -05:00
Jonathan Sanchez
7ed0d5d135 Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

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

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

Former-commit-id: 22c8646d12 [formerly b4e41b137d] [formerly 5aee30a473] [formerly fe5cde7afd [formerly 5aee30a473 [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 7c233606d6e544311ac333659bb714ce5abd5e6b [formerly 671b6ee566]
Former-commit-id: 34400e34c7
2013-06-25 13:31:37 -05:00
Dustin Johnson
84ecc6dec4 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: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]
Former-commit-id: 69c09e530f
Former-commit-id: 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]
Former-commit-id: da1ad3c8a0
2013-06-25 08:33:55 -05:00
Richard Peter
bf6e4c1f71 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: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]
Former-commit-id: e03283ad4a
2013-06-24 18:51:56 -05:00
Richard Peter
46ee2f5dd7 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: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Ron Anderson
384984d8a8 Issue #2122 Fix the build
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: 74750fa37b [formerly ce42bdead7] [formerly f75554f1f7] [formerly f06a8baf2d [formerly f75554f1f7 [formerly bf3b00be422d690aa9646462556607335ef85fc0]]]
Former-commit-id: f06a8baf2d
Former-commit-id: 14fe49bdf1189dc5b03eb0cc16d702b0f272039f [formerly 6740c9e40f]
Former-commit-id: eedb35faed
2013-06-24 18:03:52 -05:00
Richard Peter
331f7d8c7d Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
Former-commit-id: 8aee8dc9b3 [formerly a67d190612] [formerly 5f85aefff6] [formerly a19a946a24 [formerly 5f85aefff6 [formerly ed31841e537d54ead391013919a94c879afd6f77]]]
Former-commit-id: a19a946a24
Former-commit-id: ee8cacd99e8607bef0978c83c423e6fe4d72f038 [formerly 8481dd6bce]
Former-commit-id: fdad3e08b7
2013-06-24 17:20:10 -05:00
Max Schenkelberg
6b4982e8a3 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: 78c0e1684e [formerly b4c0d1f715] [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: 81f10786b9755a530e3615de10b091e1f0022d78 [formerly bc4ebb4f08]
Former-commit-id: c912e8e6c5
2013-06-24 15:48:37 -05:00
Bryan Kowal
e74d5231f4 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: 03366c8be3 [formerly 2b8984c445] [formerly 5b85217ca2] [formerly cd2af684ca [formerly 5b85217ca2 [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]]]
Former-commit-id: cd2af684ca
Former-commit-id: 3739eeb144367fe4496f4f3576c97a105d3ba985 [formerly 7ebee00dc9]
Former-commit-id: a56679fa2a
2013-06-24 14:08:47 -05:00
Nate Jensen
b1f538f69a Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 8f7c1424db [formerly d5897c323b] [formerly 6541a89bf5] [formerly 0479cea2e6 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]]
Former-commit-id: 0479cea2e6
Former-commit-id: 3e82d8ce1477d01da11ffd5777d74864cdbaed97 [formerly a2c5c2a1a3]
Former-commit-id: 1408ed3e1e
2013-06-24 09:12:12 -05:00
Nate Jensen
0740757d72 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: c144eb1e15 [formerly 8a76694b9f] [formerly b1bd29e784] [formerly 69eec45f13 [formerly b1bd29e784 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]
Former-commit-id: 69eec45f13
Former-commit-id: f61565e208a6a4f9b5ba66da9365773b2a0eaa1e [formerly a44073cce6]
Former-commit-id: f4a6354929
2013-06-24 09:10:01 -05:00
Steve Harris
e1a5587dd0 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Mike Duff
c180323417 Issue #2132 - Fix drawing lat/long box for madis point data
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

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

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

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

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

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

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

Former-commit-id: 76ffd26a2a [formerly 4a6248547a] [formerly ffc9dc1ac9] [formerly 47d18e42ab [formerly ffc9dc1ac9 [formerly 85d7c148e78a61025fa52f8c0996f99ab6075392]]]
Former-commit-id: 47d18e42ab
Former-commit-id: a15be669f33bfbbd824bd50023487023cff935d3 [formerly 5d37e710d7]
Former-commit-id: b2545d7408
2013-06-20 12:51:30 -05:00
Ben Steffensmeier
f318fef863 Issue #2128 ensure setDataURI sets the dataURI.
Former-commit-id: 2598b08d69 [formerly b507b6b1fd] [formerly f02b073cc8] [formerly 68bb07f5fa [formerly f02b073cc8 [formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]]
Former-commit-id: 68bb07f5fa
Former-commit-id: 8ff11c8549d6d75928d3a0627db7abad67a6caeb [formerly 69f1d9d812]
Former-commit-id: 38f7211e99
2013-06-20 11:11:37 -05:00