Commit graph

3212 commits

Author SHA1 Message Date
Bryan Kowal
f484a47d43 Issue #2164 - fix 13.6.1 wes2bridge build
Former-commit-id: 9f632d9e2d [formerly 31b29f11b0e60c0741f69be824093d4f76961eb5]
Former-commit-id: 63345a298b
2013-07-03 15:35:12 -05:00
Ben Steffensmeier
808941ac45 Issue #2154 Ensure all resource groups get removed from the time matcher.
Former-commit-id: 519d0f3ef8 [formerly f652fd3f3126f04c2ced9ceb027875a47ea23f51]
Former-commit-id: a7bfd8ee28
2013-07-03 14:42:59 -05:00
Nate Jensen
d883392d05 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: 6465fb58ad [formerly 929f2145983f183722dbeacbbf996b78179657c6]
Former-commit-id: f13bd6391a
2013-07-03 13:32:49 -05:00
Greg Armendariz
7f6ae6bca4 Merge "Issue #2142 attempt to fix build" into development
Former-commit-id: 27ba2d1d3c [formerly d41ed7c37f51551fd426a56a5e7762424fd00167]
Former-commit-id: 40d7855af0
2013-07-03 13:23:05 -05:00
Nate Jensen
b7ddbeed41 Merge "Issue #2159 Synchronize TimeCache access in D2DTimeMatcher. Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55" into development
Former-commit-id: 6b93db235f [formerly c9dd4fe32a28f20a3d5883d767787f37598e435d]
Former-commit-id: d4261fcc45
2013-07-03 13:10:39 -05:00
Nate Jensen
d5d5c5e674 Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: 47520c7b30 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]
Former-commit-id: 1fb11fbdf7
2013-07-03 13:05:57 -05:00
Ben Steffensmeier
2d8e1e5e6c Issue #2159 Synchronize TimeCache access in D2DTimeMatcher.
Change-Id: I9116ced28775294385ea9ea92a1e63bf2fefff55

Former-commit-id: 53d969d0db [formerly 3eaca3d7a18ab9c8ab601fc7ed9fb899eced1134]
Former-commit-id: a868d3d0b5
2013-07-03 12:44:45 -05:00
Bryan Kowal
34efd01a4f Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 1c49dff18e [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]
Former-commit-id: c2b54d7c31
2013-07-03 11:25:46 -05:00
Greg Armendariz
82aabf1066 13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]
Former-commit-id: 492f92ef7b
2013-07-03 12:20:27 -04:00
Nate Jensen
ae004c8c77 Merge "Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code." into development
Former-commit-id: 679bf314e0 [formerly d679aae13498d67d79a1134275f1016699583e1f]
Former-commit-id: 7bd12afa02
2013-07-03 09:37:05 -05:00
Roger Ferrel
ebb76daf14 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: 752933c7fe [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]
Former-commit-id: fab96d28f2
2013-07-02 17:27:22 -05:00
Bryan Kowal
2e46748156 Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: dc177c90d1 [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]
Former-commit-id: 6a6cdd7f6d
2013-07-02 16:12:06 -05:00
Mike Duff
57d37e9761 Issue #2132 - review comments
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 2618c1a4e4 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]
Former-commit-id: 4399429e74
2013-07-02 16:08:37 -05:00
Max Schenkelberg
bc91a9f6de 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: fef6056519 [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]
Former-commit-id: 9709b0500a
2013-07-02 15:22:31 -05:00
Mike Duff
cc4ac57b22 Issue #2160 - Fix for MPE display 7x7 dialog, field changes
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

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

Former-commit-id: 7d3362d2b5 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]
Former-commit-id: 41c46e14c0
2013-07-02 11:14:56 -05:00
Nate Jensen
c68cf47883 Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: 01efa33cb9 [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]
Former-commit-id: e4955f094c
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
58fcc4c896 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]
Former-commit-id: a2328f0e06
2013-07-02 11:04:26 -05:00
Richard Peter
f12b08401f Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development
Former-commit-id: a3bd7b3e9c [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]
Former-commit-id: 37042f0b2a
2013-07-02 10:30:51 -05:00
Roger Ferrel
82b1712714 Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

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

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

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

Former-commit-id: 5c7fd77f98 [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]
Former-commit-id: cd511c1a0c
2013-07-01 11:53:07 -05:00
Nate Jensen
b23dcab913 Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: 001fba449f [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]
Former-commit-id: f7e743f388
2013-07-01 11:29:47 -05:00
Bryan Kowal
756fb4be59 Issue #2153 - fix merge issue for build
Former-commit-id: 9c1aaa2bf5 [formerly 25560718fb861f13ff8701b9458a6b18adf523be]
Former-commit-id: f052982f8e
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
70ab67c3e5 Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]].


Former-commit-id: 7f74926bb4 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]
Former-commit-id: c883b4e636
2013-07-01 10:40:48 -05:00
Richard Peter
edeb3e255b 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: 76bc31aa77 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]
Former-commit-id: 162261c395
2013-07-01 00:04:43 -05:00
Richard Peter
da54766cc8 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: 582f38bdd4 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]
Former-commit-id: 53258be797
2013-06-30 23:46:32 -05:00
Brad Gonzales
2d1c6a0ec5 Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: add108398a [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]
Former-commit-id: ba661b9e39
2013-06-28 13:25:46 -05:00
Steve Harris
c56be8a332 13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
2013-06-28 09:46:25 -04:00
Brad Gonzales
65507d4424 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: f4bb78381c [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]
Former-commit-id: c28d1e5d4d
2013-06-27 17:40:07 -05:00
Brad Gonzales
67b4a2e202 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: 276f05233f [formerly 2094b7f9fde97873c759da217498bcf62254a287]
Former-commit-id: 137c66539e
2013-06-27 11:46:44 -05:00
Dave Hladky
083dff9e43 Issue #2096 First steps to getting CAVE to display MADIS data
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

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

Former-commit-id: f66681f62b [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]
Former-commit-id: ee409c0819
2013-06-27 07:51:56 -05:00
Dave Hladky
2eded94be4 Issue #2146 Deleted uneeded jars from crawl4j plugin
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01

Former-commit-id: d298749486 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]
Former-commit-id: d92e039e72
2013-06-26 14:59:22 -05:00
Richard Peter
e3886246fd Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1
Former-commit-id: 67d052307c [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]
Former-commit-id: 3a3dc3d208
2013-06-26 13:25:39 -05:00
Ben Steffensmeier
570da6f0d5 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 6db28c32a5 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]
Former-commit-id: 8c14a34f46
2013-06-26 13:24:13 -05:00
Nate Jensen
8cc7eefd84 Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1
Former-commit-id: 10baafed63 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]
Former-commit-id: a60afe6640
2013-06-26 11:14:03 -05:00
Richard Peter
b616339f1d Merge "Issue #2144 Switched hibernate to Post GIS config" into development
Former-commit-id: ad91edf3de [formerly d59f39da96caaf163ceb5bc7055b0412e118875b]
Former-commit-id: 8a9feffa82
2013-06-25 18:22:09 -05:00
Jonathan Sanchez
ab8acf06e1 Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

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

Former-commit-id: c10f5c8d65 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]
Former-commit-id: 2cfff5c563
2013-06-25 13:44:30 -05:00
Dave Hladky
b4e41b137d Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: fe5cde7afd [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]
Former-commit-id: 5aee30a473
2013-06-25 13:31:37 -05:00
Dustin Johnson
5bfef9bb45 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: 69c09e530f [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]
Former-commit-id: fac7d3a9d9
2013-06-25 08:33:55 -05:00
Richard Peter
ad353c34f9 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: b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]
Former-commit-id: d262c02612
2013-06-24 18:51:56 -05:00
Richard Peter
0fa3bf800d 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: 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]
Former-commit-id: 744eb64856
2013-06-24 18:36:15 -05:00
Ron Anderson
ce42bdead7 Issue #2122 Fix the build
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: f06a8baf2d [formerly bf3b00be422d690aa9646462556607335ef85fc0]
Former-commit-id: f75554f1f7
2013-06-24 18:03:52 -05:00
Richard Peter
a67d190612 Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development
Former-commit-id: a19a946a24 [formerly ed31841e537d54ead391013919a94c879afd6f77]
Former-commit-id: 5f85aefff6
2013-06-24 17:20:10 -05:00
Max Schenkelberg
b4c0d1f715 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: 2f03c38ca0 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]
Former-commit-id: 47b55981c8
2013-06-24 15:48:37 -05:00
Bryan Kowal
2b8984c445 Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7
Former-commit-id: cd2af684ca [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]
Former-commit-id: 5b85217ca2
2013-06-24 14:08:47 -05:00
Nate Jensen
d5897c323b Merge "Issue #2122 Cleaned up dependencies for satellite" into development
Former-commit-id: 0479cea2e6 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]
Former-commit-id: 6541a89bf5
2013-06-24 09:12:12 -05:00