Commit graph

2330 commits

Author SHA1 Message Date
Nate Jensen
9d1df167be Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]
Former-commit-id: d84f47b609
2013-10-14 15:30:09 -05:00
Lee Venable
bdbbcbb36a Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]
Former-commit-id: f3a9e541a1
Former-commit-id: 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]
Former-commit-id: 87e40ae6b1
2013-10-14 12:42:27 -05:00
Nate Jensen
0059665def Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly 96463c6117296ffe71df938350471c29d4b82158 [formerly abf2fa50b7]] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]
Former-commit-id: 48445dd8cf
2013-10-14 11:42:23 -05:00
Richard Peter
6a0020cf1c Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
2013-10-14 11:15:40 -05:00
Mike Duff
27fd5ba0fa Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
44613a0c61 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]
Former-commit-id: ae94d39ce2
2013-10-11 16:25:28 -05:00
Lee Venable
ca1a404c58 Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]
Former-commit-id: 06a38bd123
Former-commit-id: 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]
Former-commit-id: 3e95f8feb8
2013-10-11 13:02:35 -05:00
Nate Jensen
d3e361eaa4 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
2013-10-11 11:21:18 -05:00
Lee Venable
ffe192037c Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]
Former-commit-id: cec4aecdaa
2013-10-11 11:09:57 -05:00
Brad Gonzales
ff0ec3ddc6 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]
Former-commit-id: bc87f2a168
Former-commit-id: 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]
Former-commit-id: 5825fa41d6
2013-10-11 10:36:53 -05:00
Max Schenkelberg
98b60f0050 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]
Former-commit-id: 01c0e022d5
Former-commit-id: d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]
Former-commit-id: dfd6ffabd8
2013-10-11 10:21:37 -05:00
Lee Venable
2174aea7fc Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]
Former-commit-id: feb40aada0
Former-commit-id: e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]
Former-commit-id: 93b93a6750
2013-10-10 15:29:28 -05:00
Lee Venable
1fa0a9e763 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]
Former-commit-id: 6282814c91
Former-commit-id: 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]
Former-commit-id: 00f14ba5da
2013-10-10 15:26:04 -05:00
Nate Jensen
b3a270b699 Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]
Former-commit-id: c6a8eaa841
Former-commit-id: e7fcbe3bbb07cea6cb476be72d6239106fca7335 [formerly 81d1faa5d4]
Former-commit-id: 8f686c0d94
2013-10-10 15:07:34 -05:00
Slav Korolev
74fb9bb36c Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]
Former-commit-id: 0021d53557
Former-commit-id: 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]
Former-commit-id: bd225735ff
2013-10-10 14:09:37 -04:00
Richard Peter
7dc72f9bba Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]
Former-commit-id: d7db5d0219
Former-commit-id: 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]
Former-commit-id: 3fec426da2
2013-10-10 11:34:11 -05:00
Nate Jensen
4454f61a27 Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184]
Former-commit-id: 91ddf05a6b
2013-10-10 10:57:59 -05:00
Lee Venable
6ac2e88aee Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06]
Former-commit-id: 1b9ed84e9c
2013-10-10 09:48:55 -05:00
Slav Korolev
a1e3716076 Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly c91df51c728a2df7e57ff49ccc29634b41c359b5 [formerly 012497bfef]] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]
Former-commit-id: f0aba7be10
Former-commit-id: 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]
Former-commit-id: 09f00e1d81
2013-10-10 09:34:24 -04:00
Brad Gonzales
74df786a0b Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30

Former-commit-id: 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]
Former-commit-id: 61448cc04a
Former-commit-id: 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]
Former-commit-id: aff77aa148
2013-10-09 17:58:12 -05:00
Lee Venable
32ddffea14 Issue #2447 - fixed color memory leak.
Former-commit-id: 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 8d341f499d [formerly 527f88ddac [formerly fe59f0923caa13c089edb683611b986522476539]]]
Former-commit-id: 8d341f499d
Former-commit-id: a9303f9b91f65f21c748b5e607cdaa2dcbd3375d [formerly 717ba7e08e]
Former-commit-id: 481bc0875e
2013-10-09 10:07:37 -05:00
Richard Peter
873d2bf184 Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]
Former-commit-id: 0e7dccd18f
2013-10-08 10:59:50 -05:00
Richard Peter
af9c4be87a Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]
Former-commit-id: 94d0913bd9
2013-10-08 09:45:27 -05:00
Lee Venable
fc98572a27 Issue #2443 - fixed image memory leak.
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]
Former-commit-id: 47f8200757
Former-commit-id: 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]
Former-commit-id: 03c4e9a287
2013-10-08 09:39:00 -05:00
Richard Peter
55c9d3f470 Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]
Former-commit-id: 80dd506d10
2013-10-07 16:19:11 -05:00
Lee Venable
ca281660c6 Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly 5081bbd0ab [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]
Former-commit-id: b1d02c6a49
Former-commit-id: e2df9e89f7153660d6c4bffe212ef2cb3e805d3e [formerly 4060fa7e0b]
Former-commit-id: ee63fc9004
2013-10-07 14:13:56 -05:00
Lee Venable
54975835b5 Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly c01eb85e53 [formerly eeee5c7948 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]
Former-commit-id: c01eb85e53
Former-commit-id: 44f2874ed6741bb80dbe72b605f855a78f686c71 [formerly 72a6650958]
Former-commit-id: 18bbfeb4cb
2013-10-07 13:56:50 -05:00
Lee Venable
9502d31555 Issue #2437 - fixed color memory leak.
Former-commit-id: 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly a4be7633a6 [formerly 604f8f86a4 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]
Former-commit-id: a4be7633a6
Former-commit-id: e3d05cf966b9b910eaf401e19cf70c624f4713f0 [formerly b3efbb97c1]
Former-commit-id: 046a0a764d
2013-10-07 13:55:54 -05:00
Ben Steffensmeier
c476f76088 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: 4e37571a61 [formerly bae5c951d4] [formerly f4c616fbff] [formerly 4e998f2576 [formerly f4c616fbff [formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]
Former-commit-id: 4e998f2576
Former-commit-id: 2ba961c0a05f3ff564c22df12d8a167d66547f34 [formerly 76c73c10af]
Former-commit-id: 8428550b79
2013-10-07 12:04:19 -05:00
Bryan Kowal
4cd2815705 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: cfd39d5e5c [formerly 6e05c00981] [formerly 0698d28222] [formerly 82d61b53d4 [formerly 0698d28222 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: d267346cd6171a83369a2844a809a17c5af0f381 [formerly 551b501e2e]
Former-commit-id: 5cd20aed43
2013-10-07 11:52:58 -05:00
Lee Venable
82dc36a619 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 3235852e78 [formerly 0eff818ede] [formerly c1991c5c66] [formerly 7bd1fec82e [formerly c1991c5c66 [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: 562ab2641867c75dba6e4590b19f96ce08f546ee [formerly bdd28e1e09]
Former-commit-id: a55d310ebe
2013-10-07 09:30:45 -05:00
Nate Jensen
b91262e079 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: 8ed4f41938 [formerly be1385b705] [formerly adc774bee9] [formerly c36c50d189 [formerly adc774bee9 [formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: c894f0c1c606778947fd465b7a239d04dcad6edd [formerly 10ba6f231a]
Former-commit-id: 01997dd1fb
2013-10-07 09:30:31 -05:00
Lee Venable
ccbc44f9d3 Issue #2436 - disposed of the sort color
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]
Former-commit-id: 2ed106cac4
2013-10-07 09:11:25 -05:00
Dave Hladky
87574fd68a Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]
Former-commit-id: 21239525ea
2013-10-04 10:36:27 -05:00
Steve Harris
9e5ad5cd96 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]
Former-commit-id: 21b84f0290
2013-10-04 11:30:03 -04:00
Bryan Kowal
020566233e Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3]
Former-commit-id: d4eba48f94
2013-10-04 09:47:59 -05:00
Mike Duff
e1017e7ce8 Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d]
Former-commit-id: 2261f9ff61
2013-10-04 09:27:30 -05:00
Richard Peter
72a46c6756 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: ae5f215b7e [formerly f52fdf1916] [formerly 5adf4298ef] [formerly bc3843dc75 [formerly 5adf4298ef [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: cd6bc6d12c65aaf24ab02fb94462ec677ce9cce2 [formerly f7a7228e09]
Former-commit-id: 8694f13766
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
ecbfb28dd5 Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 759829c4bb [formerly 7f7aa20d0a] [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 236b3fe05f [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 58059d168eebf3a630d52b3ac6f4dd734e1de30b [formerly d4670d19b1]
Former-commit-id: 69eec8d4c6
2013-10-03 16:30:13 -05:00
Nate Jensen
86ddc9d15c Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650

Former-commit-id: 4347fe1d46 [formerly ee134db130] [formerly 3f24b9e424] [formerly 42fee320ab [formerly 3f24b9e424 [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]
Former-commit-id: 42fee320ab
Former-commit-id: 21bad7f950e722fad0361157366fe92dc449fa51 [formerly 160d1fbb01]
Former-commit-id: 82e0af6a9c
2013-10-03 15:18:55 -05:00
Roger Ferrel
91b64293fe Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]
Former-commit-id: 220769dab0
2013-10-03 12:33:26 -05:00
Max Schenkelberg
9e14571020 Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
Amend: Accepted ticket.

Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830

Former-commit-id: fe7051816e [formerly 780ac0129f] [formerly e3f6b1ea21] [formerly 866c851b47 [formerly e3f6b1ea21 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 00101432c385c23ffd439ab94c020a849e2c2d13 [formerly ba25f56dbe]
Former-commit-id: 43b7cb3107
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
075a394152 Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 1aa1f72b68 [formerly 860258e49c] [formerly ff06ea1c5a] [formerly 20853f7333 [formerly ff06ea1c5a [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]
Former-commit-id: 20853f7333
Former-commit-id: d31fc0b096d78305c15905ad2838ab76dd9d9f67 [formerly 6c7c693581]
Former-commit-id: bf0642450c
2013-10-03 10:36:47 -05:00
Bryan Kowal
9d5ae53748 Issue #2295 - CAVE updates for ALR
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc

Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76

Former-commit-id: 763aad00be [formerly 4342c463b2] [formerly aa8691edfd] [formerly 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927]
Former-commit-id: 6c60d06f9f
2013-10-02 15:49:17 -05:00
Ben Steffensmeier
428afa32f7 Issue #2404 move grid reprojection style rules to common.
Former-commit-id: 2117878f10 [formerly a95f0dbac4] [formerly a75361ad34] [formerly 32a01070f9 [formerly a75361ad34 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]
Former-commit-id: 32a01070f9
Former-commit-id: f52511bb3d7e8809dd3a38dc82d418a570719e4c [formerly 59d7c79c20]
Former-commit-id: 95b1c01650
2013-10-02 10:33:23 -05:00
Roger Ferrel
a6316240e5 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]
Former-commit-id: 34ea90f18a
2013-10-01 16:36:34 -05:00
Nate Jensen
cc4b86a7c4 Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
Former-commit-id: e0fb7611a3 [formerly 68c8f9addd] [formerly 265b6e7e61] [formerly 6cd79464ef [formerly 265b6e7e61 [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]
Former-commit-id: 6cd79464ef
Former-commit-id: 90d47dafdaac70bbece8a61b2bcc06fe50ccdf5e [formerly 64d66cf406]
Former-commit-id: c4018373f1
2013-10-01 15:19:56 -05:00
Richard Peter
1e05051167 Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50

Former-commit-id: 21d44cc52a [formerly 75b0f19d87] [formerly bb9488bb92] [formerly f4e71b65d3 [formerly bb9488bb92 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 7e26aa18c7f56b191ba44b8bf661be4364edc8a9 [formerly 39ae6d437d]
Former-commit-id: 3514194d3b
2013-10-01 15:06:34 -05:00
Richard Peter
64d062aa4b Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: 1eb943d331 [formerly 984785ce5e] [formerly e45689dbc7] [formerly add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a]
Former-commit-id: aa2eda2c38
2013-10-01 14:22:33 -05:00
Nate Jensen
1d651281da Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: 97c2f14ad4 [formerly f529c077c6] [formerly effa4f4f26] [formerly 3e7dc7782f [formerly effa4f4f26 [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: 9a175ca9dd613a376d9b2a4105b8dc30b47ee828 [formerly 4e6f5afc57]
Former-commit-id: e1c35952c9
2013-10-01 11:25:45 -05:00