Commit graph

278 commits

Author SHA1 Message Date
Nate Jensen
5e3e8941ec Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: a9f5465c99
Former-commit-id: 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]
Former-commit-id: 71a7b044ae
2013-08-08 14:46:52 -05:00
Greg Armendariz
75d1e77f1b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]
Former-commit-id: f777a744e5
2013-08-08 15:34:01 -04:00
Nate Jensen
9c6c35e033 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 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]
Former-commit-id: 04d55ac1c0
2013-08-06 17:17:53 -05:00
Nate Jensen
3d38129cff Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]]
Former-commit-id: 842f15ae12
Former-commit-id: 7f5e7fbcbc7f70e4221c8002d8b026234f9f46b9 [formerly 7d17d965a3]
Former-commit-id: 584a17828a
2013-08-06 09:52:02 -05:00
Max Schenkelberg
ebafa449b2 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 f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]
Former-commit-id: f08e2d5edc
Former-commit-id: 2a67c02053abdfe27ab400dab9e694161c2fd5f6 [formerly fc60d55637]
Former-commit-id: 541c66a894
2013-08-05 16:46:02 -05:00
Steve Harris
7fc384a659 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]
Former-commit-id: c7e7c838aa
2013-08-01 09:20:23 -04:00
Richard Peter
7f46fbf78f 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 f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]
Former-commit-id: a67f0bf2da
2013-07-31 12:54:12 -05:00
Ron Anderson
b407c24483 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 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]
Former-commit-id: 43b5d2193b
Former-commit-id: 9325a6cfb92f4c6f3ed0e145dbd8e2e7fb061d80 [formerly 8b1eb58de9]
Former-commit-id: 129040ce9b
2013-07-30 08:35:06 -05:00
Ron Anderson
8302ca2e4c 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 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]
Former-commit-id: 4aceedceb5
Former-commit-id: 74a9faa9f68a1d5677b8f681b73ca7605d1907ac [formerly b4de3f23a6]
Former-commit-id: ddecdbf0b8
2013-07-29 18:12:24 -05:00
Richard Peter
85884ccfd1 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: a3d9294d13 [formerly bf99d8fd4d] [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b]
Former-commit-id: 43453bcbff
2013-07-26 14:36:46 -05:00
Greg Armendariz
a8fdc30fd7 Issue #2207 - fix build issues with ncep unit-test directories
Former-commit-id: 3655c16d39 [formerly 777fe464d0] [formerly 031a78ed9d855f46df5db87bfcf16c99fc1ebcb4 [formerly db65f0c206]] [formerly 17b8376a72 [formerly db65f0c206 [formerly 766c2983afc0aac22143f86afa0c5eca500d1941]]]
Former-commit-id: 17b8376a72
Former-commit-id: 7b3cc0e3d1258a1d7f3a2b1c069695d57255f0a1 [formerly dc0e4e4728]
Former-commit-id: 2ba99579ca
2013-07-26 09:48:44 -05:00
Steve Harris
340e7bab60 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
2013-07-26 09:02:34 -04:00
Nate Jensen
44795095a4 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 d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]
Former-commit-id: f110fe5f6f
2013-07-25 14:59:01 -05:00
Nate Jensen
7697ce9f79 Issue #2208 moving ncep unit tests to tests project
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

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

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

Former-commit-id: 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 07dfc5d206 [formerly 747cab2eaf [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]]
Former-commit-id: 07dfc5d206
Former-commit-id: 3998b8ee2da3132c813de94e8a202f05ea32d3ad [formerly 2e92cf7bc1]
Former-commit-id: 682bf1ea10
2013-07-22 14:17:17 -05:00
Richard Peter
4c53471f8e 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 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]
Former-commit-id: e7ec068c7e
2013-07-22 09:40:18 -05:00
Ben Steffensmeier
8045e0c18c Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

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

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]
Former-commit-id: b767760a9c
Former-commit-id: 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]
Former-commit-id: 93713d9698
2013-07-18 09:53:53 -05:00
Ben Steffensmeier
1138c8e3be Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 117412c096 [formerly e8b22db364] [formerly a655380bad] [formerly 0bc5aca64b [formerly a655380bad [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]]]
Former-commit-id: 0bc5aca64b
Former-commit-id: 0f349ed1c25cf9258c35204b753d35cd4cd64ded [formerly 466b24a577]
Former-commit-id: 15a8153547
2013-07-16 15:50:14 -05:00
Max Schenkelberg
f025c05d04 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 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
2013-07-15 14:26:15 -05:00
Greg Armendariz
f23d42e977 13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
2013-07-10 10:04:22 -04:00
Greg Armendariz
d5bea0fc06 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
2013-07-03 12:20:27 -04: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
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
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
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
Nate Jensen
ff64bf589b 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 c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]
Former-commit-id: afae330d8a
2013-06-19 10:16:06 -05:00
Steve Harris
0f83e19dab 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
2013-06-17 15:01:22 -04:00
Steve Harris
43b7a9b410 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Bryan Kowal
b8c1830d3f Issue #1927 - webapps will now self-identify themselves
Former-commit-id: 85e8a629cb [formerly 1a083a2cfc] [formerly 9bd2741e22] [formerly 5056e2a0fa [formerly 9bd2741e22 [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]]
Former-commit-id: 5056e2a0fa
Former-commit-id: 7b11c6cd300b33c08a7d730784d27a1a20220458 [formerly baffa90082]
Former-commit-id: 16bf16c04d
2013-06-07 13:47:20 -05:00
Steve Harris
78f0921f63 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 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348]
Former-commit-id: 8b78f538d3
2013-06-06 15:46:23 -05:00
Steve Harris
f7316ae4bd 13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]
Former-commit-id: cebc1ddb63
2013-06-06 15:15:27 -04:00
Nate Jensen
fde771fa01 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

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

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Nate Jensen
768a7dad60 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 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
2013-05-29 09:20:53 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

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

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]
Former-commit-id: 882296f823
2013-05-23 10:06:28 -05:00
Steve Harris
d477564678 Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]
Former-commit-id: 389eefd1f9
2013-05-22 16:13:08 -05:00
Steve Harris
fb41995981 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]
Former-commit-id: b745b332ae
2013-05-22 16:42:39 -04:00
Richard Peter
b3c32889b1 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]
Former-commit-id: 1bbddf8fdf
2013-05-21 13:07:51 -05:00
Richard Peter
ffe0b35085 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 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]
Former-commit-id: 76f11f00ae
2013-05-21 12:11:21 -05:00
Ben Steffensmeier
bd89419f5e Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]
Former-commit-id: 30eb486e45
2013-05-20 18:00:32 -05:00
Steve Harris
ac83fff244 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
2013-05-20 10:52:47 -04:00
Nate Jensen
575b6335c3 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 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]
Former-commit-id: dac803ca07
2013-05-14 16:16:13 -05:00
Steve Harris
fddef92bf3 13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]
Former-commit-id: 5465764527
2013-05-14 09:21:41 -04:00
Richard Peter
994357c357 Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]
Former-commit-id: 6c09ab9bdf
2013-05-13 17:11:05 -05:00
Ben Steffensmeier
4f488940de Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]
Former-commit-id: 79015595ee
Former-commit-id: d2f613e06b0e271020b7c52b497bdf43641096be [formerly 1c51f0b5f2]
Former-commit-id: 9cf071338e
2013-05-08 18:39:25 -05:00