Richard Peter
|
7455465049
|
Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
Former-commit-id: 3a859792ae [formerly 4a32664d5e [formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]
Former-commit-id: 4a32664d5e
Former-commit-id: 3d7af2ceb3
|
2013-09-24 12:57:48 -05:00 |
|
Richard Peter
|
fb9a34e22a
|
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]
Former-commit-id: 92a45d77bb
Former-commit-id: 4b934caa41
|
2013-09-24 12:29:16 -05:00 |
|
Steve Harris
|
3cb4574635
|
13.5.2-6 baseline
Former-commit-id: 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3821475d4e
Former-commit-id: 059549438a
|
2013-09-23 10:03:15 -04:00 |
|
Richard Peter
|
9fe5b9f098
|
Issue #2368: Fix durable jms configurations
Change-Id: I0167e5f0dd5caea72c5f4220979fd9b55375b3c4
Former-commit-id: 152d8654ef [formerly b6fd367b68 [formerly f611b9afdf541b5fa632fe27755a69f16b871f68]]
Former-commit-id: b6fd367b68
Former-commit-id: ed7a62911e
|
2013-09-18 21:20:54 -05:00 |
|
Richard Peter
|
449692aeff
|
Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: a5a7816b98 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]
Former-commit-id: 5111debc92
Former-commit-id: b803359eb4
|
2013-09-15 13:44:17 -05:00 |
|
Richard Peter
|
df374f45aa
|
Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: da4faa645d [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]
Former-commit-id: 4b6e4fcd3a
Former-commit-id: a0d6ce6dbb
|
2013-09-12 13:47:43 -05:00 |
|
Richard Peter
|
04c64843dd
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 80e7b265dd [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]
Former-commit-id: 41550aaf9f
Former-commit-id: feeddb503f
|
2013-09-12 12:48:36 -05:00 |
|
Steve Harris
|
3d0b711ccf
|
13.5.2-4 baseline
Former-commit-id: 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: e3c935d48b
Former-commit-id: 595e7bc0d9
|
2013-09-12 11:13:59 -04:00 |
|
Richard Peter
|
713d540d81
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 7175e78cf7 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]
Former-commit-id: 592218edb8
Former-commit-id: ff660a78c7
|
2013-09-03 11:51:27 -05:00 |
|
Richard Peter
|
181df35afc
|
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]
Former-commit-id: 5e5047cc4f
Former-commit-id: 1f32ef9c7a
|
2013-08-14 15:23:18 -05:00 |
|
Greg Armendariz
|
814f7fdcdd
|
13.5.1-11 baseline
Former-commit-id: 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: ea7b22500e
Former-commit-id: c402dbf6e9
|
2013-08-07 14:34:27 -04:00 |
|
Nate Jensen
|
4b14026435
|
Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702
Former-commit-id: 15fae243c9 [formerly 8d1e19f2df [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]
Former-commit-id: 8d1e19f2df
Former-commit-id: 2103294b75
|
2013-07-25 12:29:46 -05:00 |
|
Richard Peter
|
19dacc32c1
|
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: c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: 15d1a6eab0
Former-commit-id: 401ed88e44
|
2013-07-22 09:40:18 -05:00 |
|
Steve Harris
|
67299457b1
|
13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: bf58a81b38
Former-commit-id: 630705aa3f
|
2013-07-18 12:07:22 -04:00 |
|
Nate Jensen
|
87bfe94322
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]
Former-commit-id: 5264d3a5b8
Former-commit-id: 188d76ea71
|
2013-07-18 09:53:53 -05:00 |
|
Max Schenkelberg
|
cd88054e2b
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
|
2013-07-15 14:26:15 -05:00 |
|
Greg Armendariz
|
ed9da994c7
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: 492f92ef7b
Former-commit-id: 82aabf1066
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
2487a8b435
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
5eef22fd4d
|
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: c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]
Former-commit-id: 81fc4fa753
Former-commit-id: c0f95eb55a
|
2013-06-19 10:16:06 -05:00 |
|
Steve Harris
|
7fe15db2f8
|
13.5.1-2 baseline
Former-commit-id: 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: adb779323d
Former-commit-id: bc60b22f00
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
5d99df9969
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
a150d8b90b
|
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: 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]
Former-commit-id: 571757b2a6
Former-commit-id: 64cf1aedb1
|
2013-06-06 15:46:23 -05:00 |
|
Steve Harris
|
ffcce90f3f
|
13.4.1-14 baseline
Former-commit-id: 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: c749e122eb
Former-commit-id: be236eb722
|
2013-06-06 15:15:27 -04:00 |
|
Nate Jensen
|
00fbfbe7e5
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
04d6f6654d
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
e8ebe1a123
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
4ae00040e3
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d74936ef3e
Former-commit-id: 65b9bafed7
|
2013-05-23 10:06:28 -05:00 |
|
Nate Jensen
|
c5e226e268
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 08b9ce4c62
Former-commit-id: 1fcbeb41c9
|
2013-05-14 16:16:13 -05:00 |
|
Richard Peter
|
207c17d5af
|
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: c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: a12830f762
Former-commit-id: 2c009eb618
|
2013-05-13 17:11:05 -05:00 |
|
Steve Harris
|
81bc07bff4
|
13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 4c6ff79e71
Former-commit-id: 8072752c77
|
2013-05-13 12:58:10 -04:00 |
|
Ben Steffensmeier
|
7c91a83521
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 4209e014d8
Former-commit-id: dab2af2df5
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
6f374b35d0
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
408234ee2b
|
13.3.1-11 baseline
Former-commit-id: 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 9cdd90e382
Former-commit-id: 2edab61540
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
4eef6862d6
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
e4a1c61ad5
|
13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
d176ec1f38
|
13.2.1-8 baseline
Former-commit-id: 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
7d2e979c51
|
13.2.1-3 baseline
Former-commit-id: 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 7435527b25
Former-commit-id: a5a0da5c02
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
1d4d25b49b
|
13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
e8f4a2f031
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
8b74846a1b
|
12.12.1-12 baseline
Former-commit-id: 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: e8e41630e8
Former-commit-id: 89def5cf03
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
6e44abdba1
|
12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
04da0dbf50
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: c12ee14e66
Former-commit-id: 75901860c2
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
ddc923e3e0
|
12.10.1-4 baseline
Former-commit-id: 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 791ef6cedf
Former-commit-id: 9cd1f3ec0f
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
77cbd6c1e5
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
2e804fc8c4
|
12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
b242dd98d6
|
12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
32fdf6ed3b
|
12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
2f10c7a1e4
|
12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
4767b0e069
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
760ead2047
|
12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
|
2012-03-30 08:38:33 -05:00 |
|