Commit graph

29 commits

Author SHA1 Message Date
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
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
Nate Jensen
b4265150dd Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: a421f83b66 [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]
Former-commit-id: a6bd01028c
Former-commit-id: 0857f9334a
2013-07-11 14:25:36 -05:00
Bryan Kowal
8924d8fc22 Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]
Former-commit-id: b4df3267bd
Former-commit-id: 4815b78b6f
2013-07-03 19:36:42 -05:00
Nate Jensen
abb3ff9cec Issue #2142 attempt to fix build
Change-Id: I465de277a20aa354731e45abbb685e108cdb4377

Former-commit-id: 47520c7b30 [formerly 1fb11fbdf7 [formerly a6e205373831d0d029f3a34cc6e34030cc496d9c]]
Former-commit-id: 1fb11fbdf7
Former-commit-id: d5d5c5e674
2013-07-03 13:05:57 -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
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
Bryan Kowal
1b8179bbf2 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 99a5290083 [formerly 047a3de7bd [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]
Former-commit-id: 047a3de7bd
Former-commit-id: 01413b17dd
2013-05-15 12:38:02 -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
Steve Harris
29777b406e 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]
Former-commit-id: 1a6fd7edfd
Former-commit-id: 344054d3e9
2013-05-03 09:20:30 -05:00
Steve Harris
ef5893b279 13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: d33e5861aa
Former-commit-id: 99f4569650
2013-05-02 10:00:38 -05:00
Steve Harris
79567aac51 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
2013-04-24 17:15:55 -05:00
Steve Harris
f9b3430485 13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
0d765a2fcf Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: 2b6aa86371
Former-commit-id: 0d9119a1c7
2013-03-20 13:05:54 -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
e0406d3183 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
2013-02-20 16:19:40 -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
0d8d18d7e2 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
2012-09-13 12:08:11 -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
71b024e3a1 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -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
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
7fa9dbd5fb 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -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
Bryan Kowal
28957b7118 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]
Former-commit-id: 2142afe3f1
Former-commit-id: 971bf802ac
2012-01-20 11:37:38 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00