Richard Peter
|
85fc9c773b
|
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: 15d1a6eab0 [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: c6386e306f
Former-commit-id: 12993d9539
|
2013-07-22 09:40:18 -05:00 |
|
Steve Harris
|
eff4fb29dd
|
13.5.1-7 baseline
Former-commit-id: bf58a81b38 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
|
2013-07-18 12:07:22 -04:00 |
|
Nate Jensen
|
175a28da9a
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: 5264d3a5b8 [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]
Former-commit-id: b767760a9c
Former-commit-id: c77936c6c0
|
2013-07-18 09:53:53 -05:00 |
|
Max Schenkelberg
|
a47f187f4f
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 63421a4819 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 50825200a1
Former-commit-id: 1610826d2e
|
2013-07-15 14:26:15 -05:00 |
|
Greg Armendariz
|
dc881f4ed8
|
13.5.1-5 baseline
Former-commit-id: 492f92ef7b [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: ea7ac37930
Former-commit-id: 869922cb82
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
c183e08922
|
13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
73c0514c3d
|
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: 81fc4fa753 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]
Former-commit-id: c4283b0336
Former-commit-id: a9c077f0a9
|
2013-06-19 10:16:06 -05:00 |
|
Steve Harris
|
332a74c4de
|
13.5.1-2 baseline
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
146c5e8940
|
13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
abfd0b9ead
|
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: 571757b2a6 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]
Former-commit-id: 2327205cb7
Former-commit-id: 035d74b348
|
2013-06-06 15:46:23 -05:00 |
|
Steve Harris
|
8ec7524cbb
|
13.4.1-14 baseline
Former-commit-id: c749e122eb [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: 18b90226a2
Former-commit-id: dee685e3c7
|
2013-06-06 15:15:27 -04:00 |
|
Nate Jensen
|
3588ed1899
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: f3258e77f7 [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6214f529a7
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
4eb941dacb
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 99b4a21414 [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 3f3e0a788d
Former-commit-id: a1f314948f
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
9689640192
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: 1978133177 [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 49b20e5d20
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
0f319b9721
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: d74936ef3e [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 91c8b9ac1d
|
2013-05-23 10:06:28 -05:00 |
|
Nate Jensen
|
925339b84c
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 08b9ce4c62 [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
|
2013-05-14 16:16:13 -05:00 |
|
Richard Peter
|
f7470fbd8f
|
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: a12830f762 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: c5040038d3
Former-commit-id: bcf4dcc810
|
2013-05-13 17:11:05 -05:00 |
|
Steve Harris
|
dffa6d3bdc
|
13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
|
2013-05-13 12:58:10 -04:00 |
|
Ben Steffensmeier
|
7e721fb860
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 4209e014d8 [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 79015595ee
Former-commit-id: 1c51f0b5f2
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
f1d156779a
|
13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
b5e3a7dda6
|
13.3.1-11 baseline
Former-commit-id: 9cdd90e382 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 373d13df39
Former-commit-id: d868003067
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
c6f379f59a
|
13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
1f98e01c57
|
13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
edac913af7
|
13.2.1-8 baseline
Former-commit-id: f81b382c04 [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
082e66584a
|
13.2.1-3 baseline
Former-commit-id: 7435527b25 [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
05bdc0ecd2
|
13.1.2-6 baseline
Former-commit-id: 8e5f9e0e6c [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
b6fa9b4858
|
13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
190378beeb
|
12.12.1-12 baseline
Former-commit-id: e8e41630e8 [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
560f0d9cc3
|
12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
e72b6d5da6
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: c12ee14e66 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
451459d8cb
|
12.10.1-4 baseline
Former-commit-id: 791ef6cedf [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 92cc2d8605
Former-commit-id: b4d2a0e8dd
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
9b5c2094ed
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
e86949a8d3
|
12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
9aabe438b9
|
12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
d5fa61041b
|
12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
9054c5ab6c
|
12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
8cd5974f4c
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
2e0f4b241b
|
12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
21d2361f00
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
377dcd10b9
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|