Commit graph

381 commits

Author SHA1 Message Date
Max Schenkelberg
b57cf3de95 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 41cc45e8fc [formerly 2fc5af010d] [formerly 116cd76f43f817c4146cfbf39bb00d7365fdbc12 [formerly 759ff7bcfd]]
Former-commit-id: 1ff68c0f5f81b9c5c23485ff991688d04f372125 [formerly 961ed891c8]
Former-commit-id: 229e0ee235
2013-08-14 09:20:28 -05:00
Max Schenkelberg
750f71ea98 Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: cc6950107f [formerly 4fdb3c8306] [formerly 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]]
Former-commit-id: 6330e8d0028065ee6a7110c911ee4f47033f7729 [formerly 2178fac70d]
Former-commit-id: 5167a52b65
2013-08-09 14:24:49 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Nate Jensen
8df28785b7 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]]
Former-commit-id: a9f5465c99
Former-commit-id: 5e3e8941ec [formerly 71a7b044ae] [formerly 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]]
Former-commit-id: 9c431ff615154e98cd93cec658459caab3db8cbd [formerly 440756a331]
Former-commit-id: 815087f84e
2013-08-08 14:46:52 -05:00
Greg Armendariz
d37c94464b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b [formerly f777a744e5] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Nate Jensen
6747586438 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 9c6c35e033 [formerly 04d55ac1c0] [formerly 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]]
Former-commit-id: 77dc1df5e9af04c402774c681981e485f8b8553d [formerly 22861240c8]
Former-commit-id: 077c619bbf
2013-08-06 17:17:53 -05:00
Nate Jensen
15684e79a0 Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]]]
Former-commit-id: 842f15ae12
Former-commit-id: 3d38129cff [formerly 584a17828a] [formerly 7f5e7fbcbc7f70e4221c8002d8b026234f9f46b9 [formerly 7d17d965a3]]
Former-commit-id: 7dd2a02508e2776b9a76cff29cd1c400c61f07d0 [formerly 0abec57d0d]
Former-commit-id: 6585abee8e
2013-08-06 09:52:02 -05:00
Max Schenkelberg
dcd752ef2a Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]]
Former-commit-id: f08e2d5edc
Former-commit-id: ebafa449b2 [formerly 541c66a894] [formerly 2a67c02053abdfe27ab400dab9e694161c2fd5f6 [formerly fc60d55637]]
Former-commit-id: da853a3c36419f097b12fdd31666ec8568fe8198 [formerly 71ee818ed0]
Former-commit-id: 424f455607
2013-08-05 16:46:02 -05:00
Steve Harris
a7c6d3b46d 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659 [formerly c7e7c838aa] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04:00
Richard Peter
be84d709e4 Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]]
Former-commit-id: f97a27796d
Former-commit-id: 7f46fbf78f [formerly a67f0bf2da] [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]]
Former-commit-id: 9973bf82bd2bdd62c09a917e8fc0870c0a2147d1 [formerly 5314b90720]
Former-commit-id: 33d4f95c3e
2013-07-31 12:54:12 -05:00
Ron Anderson
6271646c57 Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
Former-commit-id: a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]]
Former-commit-id: 43b5d2193b
Former-commit-id: b407c24483 [formerly 129040ce9b] [formerly 9325a6cfb92f4c6f3ed0e145dbd8e2e7fb061d80 [formerly 8b1eb58de9]]
Former-commit-id: 91076aec36920366d2ab70aa9a8b7fb611ca6594 [formerly 201d9542fe]
Former-commit-id: 9e8a94ae4f
2013-07-30 08:35:06 -05:00
Ron Anderson
f4abc8dfb6 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]]
Former-commit-id: 4aceedceb5
Former-commit-id: 8302ca2e4c [formerly ddecdbf0b8] [formerly 74a9faa9f68a1d5677b8f681b73ca7605d1907ac [formerly b4de3f23a6]]
Former-commit-id: 031680b5c9244735bc01929258d5dedcf60b441e [formerly 493d497091]
Former-commit-id: 1c1340fe37
2013-07-29 18:12:24 -05:00
Richard Peter
4e00a449b7 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: a3d9294d13 [formerly bf99d8fd4d] [formerly 359ee5d1af] [formerly a3d9294d13 [formerly bf99d8fd4d] [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 85884ccfd1 [formerly 43453bcbff] [formerly 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b]]
Former-commit-id: a4aa95423528b7d80ac7bfb1f4727754c4129e0b [formerly 51773c757e]
Former-commit-id: 5665e7eb9e
2013-07-26 14:36:46 -05:00
Greg Armendariz
ab1c49c5c9 Issue #2207 - fix build issues with ncep unit-test directories
Former-commit-id: 3655c16d39 [formerly 777fe464d0] [formerly db65f0c206] [formerly 3655c16d39 [formerly 777fe464d0] [formerly db65f0c206] [formerly 17b8376a72 [formerly db65f0c206 [formerly 766c2983afc0aac22143f86afa0c5eca500d1941]]]]
Former-commit-id: 17b8376a72
Former-commit-id: a8fdc30fd7 [formerly 2ba99579ca] [formerly 7b3cc0e3d1258a1d7f3a2b1c069695d57255f0a1 [formerly dc0e4e4728]]
Former-commit-id: 03461d3694e76f3d190589eaff3c0ed783f6deef [formerly ade6454234]
Former-commit-id: f71f32684f
2013-07-26 09:48:44 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Nate Jensen
f32313b6a2 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]]
Former-commit-id: d364cfe32e
Former-commit-id: 44795095a4 [formerly f110fe5f6f] [formerly c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]]
Former-commit-id: 8543575d14e7cd2b4a3450133c48990eda4cfc72 [formerly 070fa38093]
Former-commit-id: 63ac241687
2013-07-25 14:59:01 -05:00
Nate Jensen
d9f3fb1b22 Issue #2208 moving ncep unit tests to tests project
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

Former-commit-id: cf4dce1b2d [formerly 38fa2ca855] [formerly 838554cf98] [formerly cf4dce1b2d [formerly 38fa2ca855] [formerly 838554cf98] [formerly d7be59a97e [formerly 838554cf98 [formerly b027914534dc808a616e2b5b2ee55ed3dd304b2e]]]]
Former-commit-id: d7be59a97e
Former-commit-id: 7697ce9f79 [formerly 891484b533] [formerly 940cac296935adfd05d57f0ec83d385a448d267b [formerly 43f8386f7c]]
Former-commit-id: 38c8b123a3a0046457bc63cba5c27c1a5a3a2e40 [formerly 8c5980fe73]
Former-commit-id: cabd53c511
2013-07-25 13:28:27 -05:00
Nate Jensen
8dd49daed8 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: c869207445 [formerly 7c438bd944] [formerly 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8]]
Former-commit-id: 03082558b26f67648b804696198cf0f48e47ed8f [formerly fa24302a76]
Former-commit-id: 3aba42df34
2013-07-23 12:28:07 -05:00
Richard Peter
77829569ba Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: fc28bf67bb [formerly 3879c810db] [formerly fa6a457cd0] [formerly fc28bf67bb [formerly 3879c810db] [formerly fa6a457cd0] [formerly 00aeeb338b [formerly fa6a457cd0 [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]]]
Former-commit-id: 00aeeb338b
Former-commit-id: a138619ea8 [formerly 55730a775c] [formerly 2fcab6ba0629d543c3db0c87536593cdc6fea382 [formerly b5e8abbcab]]
Former-commit-id: 8e0ed508d0f5c25c766be224268c2067ba7e030b [formerly c079e1d161]
Former-commit-id: 3644f1a0eb
2013-07-22 16:37:43 -05:00
Nate Jensen
10633d245d Issue #2142 fix ncep features
Change-Id: I3d13c58e450d7b0b41f41f608986537b51c3b4ca

Former-commit-id: 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 07dfc5d206 [formerly 747cab2eaf [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]]]
Former-commit-id: 07dfc5d206
Former-commit-id: df039291f6 [formerly 682bf1ea10] [formerly 3998b8ee2da3132c813de94e8a202f05ea32d3ad [formerly 2e92cf7bc1]]
Former-commit-id: ccff5fd6cfcbdd014b832a5b70b9bbfe91444532 [formerly edb3e81718]
Former-commit-id: fc9a9f990b
2013-07-22 14:17:17 -05:00
Richard Peter
1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Ben Steffensmeier
07017164f1 Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: 095f200bd9 [formerly e11099ff24] [formerly ad0cefc7fa] [formerly 095f200bd9 [formerly e11099ff24] [formerly ad0cefc7fa] [formerly 9c55581ad2 [formerly ad0cefc7fa [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]]]
Former-commit-id: 9c55581ad2
Former-commit-id: 8045e0c18c [formerly f6eb262152] [formerly 7fbf5157984fd1fdbb4718c783654069ee6d1a47 [formerly a4f75b68d4]]
Former-commit-id: da394c61610b65100d8f3a206295fd77adbf1e4a [formerly 71a32933c4]
Former-commit-id: c584a6797d
2013-07-19 11:53:23 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
2d6737f52c Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9 [formerly 93713d9698] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a]
Former-commit-id: 06502f57ef
2013-07-18 09:53:53 -05:00
Ben Steffensmeier
146c9553f2 Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 117412c096 [formerly e8b22db364] [formerly a655380bad] [formerly 117412c096 [formerly e8b22db364] [formerly a655380bad] [formerly 0bc5aca64b [formerly a655380bad [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]]]]
Former-commit-id: 0bc5aca64b
Former-commit-id: 1138c8e3be [formerly 15a8153547] [formerly 0f349ed1c25cf9258c35204b753d35cd4cd64ded [formerly 466b24a577]]
Former-commit-id: dd00301f4af38fc68f855987ecbe5d7658d62abd [formerly bd06f84084]
Former-commit-id: 9450df2daf
2013-07-16 15:50:14 -05:00
Max Schenkelberg
ad32bbd91d Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Greg Armendariz
df73c0e2e9 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Greg Armendariz
5e1549062b 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06 [formerly d899faec3d] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Ben Steffensmeier
5c0ec55d70 Issue #1869 Fix plot sampling.
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 9e23a71d84 [formerly 570da6f0d5] [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 9906f30ff0 [formerly 2ce266f7e7] [formerly b33a1c795a47c684e688769e932048e39d11d241 [formerly f26a72afe9]]
Former-commit-id: cfbc87543d974e56cf4a0535842654c9970b1607 [formerly 0d2f556144]
Former-commit-id: 6cb77b1793
2013-06-26 13:24:13 -05:00
Richard Peter
7ef16a186e 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 f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Nate Jensen
d2ef59e9ad Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]]
Former-commit-id: c4283b0336
Former-commit-id: ff64bf589b [formerly afae330d8a] [formerly 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]]
Former-commit-id: 9cbc7ddc24e78fbf205d00560788cdfa1249462a [formerly 73c0514c3d]
Former-commit-id: 8091cae89d
2013-06-19 10:16:06 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Bryan Kowal
cc081eef7e Issue #1927 - webapps will now self-identify themselves
Former-commit-id: 85e8a629cb [formerly 1a083a2cfc] [formerly 9bd2741e22] [formerly 85e8a629cb [formerly 1a083a2cfc] [formerly 9bd2741e22] [formerly 5056e2a0fa [formerly 9bd2741e22 [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]]]
Former-commit-id: 5056e2a0fa
Former-commit-id: b8c1830d3f [formerly 16bf16c04d] [formerly 7b11c6cd300b33c08a7d730784d27a1a20220458 [formerly baffa90082]]
Former-commit-id: 7b1c0ad8d889638c9f3e2700e6aa3de12f469a3c [formerly d143d33045]
Former-commit-id: 5679726334
2013-06-07 13:47:20 -05:00
Steve Harris
f3ba607c69 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]]
Former-commit-id: 2327205cb7
Former-commit-id: 78f0921f63 [formerly 8b78f538d3] [formerly bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348]]
Former-commit-id: 5ebd8157d1a24184df8083fedec285c5bce096ea [formerly abfd0b9ead]
Former-commit-id: 18fdb31920
2013-06-06 15:46:23 -05:00
Steve Harris
c57686831a 13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]]
Former-commit-id: 18b90226a2
Former-commit-id: f7316ae4bd [formerly cebc1ddb63] [formerly a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]]
Former-commit-id: 1e747c10c7b7049ff47d3fe068c65055d7ab4a0e [formerly 8ec7524cbb]
Former-commit-id: d46b0413fb
2013-06-06 15:15:27 -04:00
Nate Jensen
cf843cfa42 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]]
Former-commit-id: fc691cbb2f
Former-commit-id: fde771fa01 [formerly ab10e0072d] [formerly 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]]
Former-commit-id: 73458acdcd0744f3e4a6cc7ea7fac5b0d28ee6a0 [formerly 3588ed1899]
Former-commit-id: 528ab65a66
2013-05-29 16:19:28 -05:00
Nate Jensen
88f9c45cf0 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
2013-05-29 14:49:43 -05:00
Nate Jensen
8777604fdd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 768a7dad60 [formerly 452858b86f] [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]]
Former-commit-id: 4de98fe7068aa6e779321f9fb2a37687751247da [formerly 74081dd140]
Former-commit-id: f9d85ac8a9
2013-05-29 09:20:53 -05:00
Nate Jensen
de2f575c94 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Nate Jensen
94c13665a9 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: b8e6b1a083 [formerly 882296f823] [formerly c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]]
Former-commit-id: ec0257ca11e61995af3a0f051f104254321c312f [formerly 0f319b9721]
Former-commit-id: 73290b1bb6
2013-05-23 10:06:28 -05:00
Steve Harris
6a5b97e11e Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
2013-05-22 16:13:08 -05:00
Steve Harris
cf67535a3a 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
2013-05-22 16:42:39 -04:00
Richard Peter
c7eba20f0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]]
Former-commit-id: b4344d3c04
Former-commit-id: b3c32889b1 [formerly 1bbddf8fdf] [formerly 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]]
Former-commit-id: a7440882bd726d94a23b78fb9f3b0850a75ef7d5 [formerly b3688d78d1]
Former-commit-id: 7d73a32b0a
2013-05-21 13:07:51 -05:00
Richard Peter
c8484145dd Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd]
Former-commit-id: 7966576f23
2013-05-21 12:11:21 -05:00
Ben Steffensmeier
20d086140b Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]]
Former-commit-id: 931e76ae59
Former-commit-id: bd89419f5e [formerly 30eb486e45] [formerly b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]]
Former-commit-id: 2c5b16494b7aca40f1b0a8f7493dcb483fd2f2cf [formerly 9bac8c566c]
Former-commit-id: 4687ddcd62
2013-05-20 18:00:32 -05:00
Steve Harris
0b9bf76434 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244 [formerly 7e04d8cd13] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82]
Former-commit-id: b41118326c
2013-05-20 10:52:47 -04:00
Nate Jensen
6b9fa8445b Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
2013-05-14 16:16:13 -05:00