Commit graph

46 commits

Author SHA1 Message Date
Richard Peter
5e5047cc4f 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: e1aa1aa51e2325b005604aa971e842bccfcd8375
2013-08-14 15:23:18 -05:00
Max Schenkelberg
5ab8b6e2c6 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: fe1b35711ec55a022027bb8ff1a27924b3926911
2013-08-14 09:20:28 -05:00
Nate Jensen
15405cab1b Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f

Conflicts:

	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java


Former-commit-id: 0f66e6b3e5999f5f1f97b74b157838c598110cb2
2013-08-13 12:27:02 -05:00
Max Schenkelberg
49381ac481 Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5

Former-commit-id: 1cdd5eab835f2df85f8ebc82d0bea79bca3977da
2013-08-12 17:37:15 -05:00
Max Schenkelberg
0f3c791120 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: 5c707a35dcaedf5ae37119e56503aa8af59631fc
2013-08-09 14:24:49 -05:00
Greg Armendariz
29b823fee4 13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Steve Harris
3bece5e5d0 13.5.1-8 baseline
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Nate Jensen
22438766b4 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 399d44a62df1c54e94d93d4e0b198db976104143
2013-07-22 12:20:43 -05:00
Richard Peter
15d1a6eab0 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: 293586df88f53c2ddf6f7586bf71719298728022
2013-07-22 09:40:18 -05:00
Richard Peter
7e08c04383 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7
2013-07-18 21:46:25 -05:00
Steve Harris
bf58a81b38 13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Dave Hladky
84dae0a6b8 Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 251cf3cca7c6653300f115083aa860444fee0ea9
2013-07-17 15:18:49 -05:00
Max Schenkelberg
63421a4819 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
2013-07-15 14:26:15 -05:00
Steve Harris
70e4ff30a6 13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
63803c1424 13.5.1-3 baseline
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
adb779323d 13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
2013-06-17 15:01:22 -04:00
Steve Harris
998961612c 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
87b9712009 13.4.1-13 baseline
Former-commit-id: f79327d3865cb0fa7812d5fba896c1a46013badf
2013-05-29 16:30:09 -04:00
Steve Harris
2edee36158 13.4.1-11 baseline
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Steve Harris
19866e7032 13.4.1-8 baseline
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
2013-05-14 09:21:41 -04:00
Steve Harris
4c6ff79e71 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
85bbf6d242 13.4.1-5 baseline
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
2013-05-03 09:29:14 -05:00
Steve Harris
d33e5861aa 13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
2013-05-02 10:00:38 -05:00
Steve Harris
54afedf617 13.4.1-3 baseline
Former-commit-id: 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd
2013-04-29 12:25:07 -05:00
Steve Harris
2f517b7713 13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
7bf9966dcb 13.3.1-17 baseline
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
9022c500ce 13.3.1-14 baseline
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
2013-03-27 17:59:34 -05:00
Steve Harris
0be473728a 13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
3a4c7931e1 13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
71e8990021 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
d0752de66c 13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
2013-02-07 16:00:39 -06:00
Steve Harris
83e9157df7 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
d3497e47eb 12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steve Harris
a96d35a1fa 12.10.1-5 baseline
Former-commit-id: 28dc700c3ef97a134c8871c2c52086fe7db43035
2012-09-17 15:42:31 -05:00
Steve Harris
6eb6b0909b 12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
2012-08-30 14:36:12 -05:00
Steve Harris
3adc50a783 12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
2012-08-30 14:28:27 -05:00
Steve Harris
61f269f54c 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
dcda3a2290 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
fd2abfb6f1 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
2c0ff851ca 12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Steve Harris
b13cbb7e00 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
9f8cb727a5 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
67a5a68300 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Steve Harris
c8aae98741 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Matt Nash
66be3bec40 Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00