Commit graph

615 commits

Author SHA1 Message Date
Bryan Kowal
b4917e6708 Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
2012-06-27 17:21:48 -05:00
Bryan Kowal
fca7bf5b45 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: 1e06e23eca [formerly f7d19019a9] [formerly 98fdfa6f37 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 5874255a05
2012-06-27 16:22:53 -05:00
Bryan Kowal
6d2ca51c52 12.6.1-10 baseline
Conflicts:
	cave/build/static/common/cave/etc/ncep/AttributeSetGroups/ModelFcstGridContours/1000-500_thkn.attr
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/IImagingExtension.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.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/dialogs/FFMPTableCellData.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.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/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.npp.feature/com.raytheon.uf.viz.npp.feature.ecl
	cave/com.raytheon.uf.viz.npp.viirs/.classpath
	cave/com.raytheon.uf.viz.npp.viirs/.project
	cave/com.raytheon.uf.viz.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.npp.viirs/com.raytheon.uf.viz.npp.viirs.ecl
	cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/widgets/ScaleWidget.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/AbstractRadarResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	cots/org.jboss.cache/.project
	deltaScripts/12.5.1/drop_gfe_tables.sh
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendQueue.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/SendIscTransactions.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/ClimoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/HLSTopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/TopoDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/com.raytheon.uf.common.dataplugin.npp.viirs.ecl
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.common.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.project
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSSpatialMessageData.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/gov.noaa.nws.ost.edex.plugin.regionalsat.ecl
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/cave_static/site/AFC/menus/satellite/regionalsat/baseRegionalComposite.xml
	ncep/gov.noaa.nws.ncep.common.staticdata/.classpath
	ncep/gov.noaa.nws.ncep.common.staticdata/.project
	ncep/gov.noaa.nws.ncep.common.staticdata/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.common.staticdata/build.properties
	ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.project
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/build.properties
	ncep/gov.noaa.nws.ncep.gempak.parameters.core/gov.noaa.nws.ncep.gempak.parameters.core.ecl
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metParameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/ClimDayTemp.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/DayTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/HeightAboveSeaLevel.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/NightTempAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/POP12HrsAnomaly.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms12hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms24hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms2hr.java
	ncep/gov.noaa.nws.ncep.metParameters/src/gov/noaa/nws/ncep/metparameters/UncondProbOfTstorms6hr.java
	ncep/gov.noaa.nws.ncep.staticdataprovider/.classpath
	ncep/gov.noaa.nws.ncep.staticdataprovider/.project
	ncep/gov.noaa.nws.ncep.staticdataprovider/.settings/org.eclipse.jdt.core.prefs
	ncep/gov.noaa.nws.ncep.staticdataprovider/gov.noaa.nws.ncep.staticdataprovider.ecl
	ncep/gov.noaa.nws.ncep.viz.customProjection/.classpath
	ncep/gov.noaa.nws.ncep.viz.customProjection/.project
	ncep/gov.noaa.nws.ncep.viz.customProjection/gov.noaa.nws.ncep.viz.customProjection.ecl
	rpms/awips2.core/Installer.ldm/component.spec

Change-Id: Ib8015bb11aef0561ff3b3bc426b51b5c8ee8ef4a

Former-commit-id: 072c88b382 [formerly 4a17650914] [formerly 53e5b7c491 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]
Former-commit-id: 53e5b7c491
Former-commit-id: 62c7de6d3b
2012-06-27 15:04:34 -05:00
David Gillingham
1aff13b76f Issue #810: turn off Wes2Bridge archiver by default
Change-Id: I1974b81e73b2daab48947d2a44dc9072aba459af

Former-commit-id: 89f47d55a4 [formerly 1ddd687bc8] [formerly 12b2403627 [formerly ff97ae48126d906463a4a1063782fa3f154fdeeb]]
Former-commit-id: 12b2403627
Former-commit-id: 131472c289
2012-06-26 17:58:21 -05:00
David Gillingham
ca54365f87 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 768afb8423 [formerly 2a0ffc5311] [formerly 672d7a2c31 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]
Former-commit-id: 672d7a2c31
Former-commit-id: 235cf57de8
2012-06-26 17:49:06 -05:00
Brad Gonzales
2e4c8e88a6 Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: bfc4e1da3c [formerly c00fb6f089] [formerly c99fa8db33 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]]
Former-commit-id: c99fa8db33
Former-commit-id: a289b1f008
2012-06-26 15:41:14 -05:00
Nate Jensen
f90897dc5d Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: 4a389da950 [formerly cfc56f670a] [formerly ab86141e2f [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]]
Former-commit-id: ab86141e2f
Former-commit-id: 5ada671511
2012-06-26 13:21:49 -05:00
Bryan Kowal
a122cd2458 Issue #704 - update build.properties files for python.
Former-commit-id: 70b71ec2e3 [formerly dda06c5d8e] [formerly b1a1448256 [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]
Former-commit-id: b1a1448256
Former-commit-id: ef557a1fdb
2012-06-26 10:26:29 -05:00
Nate Jensen
c1a216d2f7 Merge "Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic." into development
Former-commit-id: 41e3543148 [formerly 0f77b9cfbc] [formerly 61b0394381 [formerly 2eab85ae7e6ad05e549b173fd026f22b61e8e8a7]]
Former-commit-id: 61b0394381
Former-commit-id: 1899a9ccc3
2012-06-26 10:24:17 -05:00
Bryan Kowal
c35a341f45 Issue #800 - fix build.properties.
Former-commit-id: 089710a432 [formerly 0ec62da46e] [formerly 670c7cabb4 [formerly 914838d805b01754cf5947eaa7196b148d2738b5]]
Former-commit-id: 670c7cabb4
Former-commit-id: 7ce152ebd8
2012-06-26 09:42:20 -05:00
Bryan Kowal
a1c4fe961a Issue #704 - fix build.properties files.
Former-commit-id: 73d4ec0bfb [formerly cc1ac5fd2f] [formerly 1e5c9ef92d [formerly 7130431b6e279db1c5ed550e0ce42c5fdf4238f1]]
Former-commit-id: 1e5c9ef92d
Former-commit-id: b84a44c26b
2012-06-25 16:50:11 -05:00
Lee Venable
fea6b9b24d Merge "Issue #666 fixed ncep ovelay resources so recylce works properly" into development
Former-commit-id: 727c5f832c [formerly 4f6a67ae6e] [formerly 175651d6c5 [formerly 536549ae3f5ad1d8b73289f3838d20fc654439aa]]
Former-commit-id: 175651d6c5
Former-commit-id: ca9cf045b5
2012-06-25 15:49:00 -05:00
Ben Steffensmeier
745b2cd722 Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 0855e117cb [formerly 682edec2cf] [formerly 603d48a017 [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]
Former-commit-id: 603d48a017
Former-commit-id: 7ea36122f2
2012-06-25 15:22:35 -05:00
Lee Venable
5f6ce95e29 Merge "Issue #704 fixes to plots/MPE to work better in KML" into development
Former-commit-id: 12d44ca942 [formerly 8d0f2ae671] [formerly 97b5d9ccea [formerly 5ac36fa40f250c4ee856190ac51eea82e68623bb]]
Former-commit-id: 97b5d9ccea
Former-commit-id: 073e1b7fd3
2012-06-25 15:04:00 -05:00
Max Schenkelberg
39b3f85641 Issue #666 fixed ncep ovelay resources so recylce works properly
Change-Id: Iedde396d06a86760c1871362b36c08bc3185e27e

Former-commit-id: 7053ac6cf9 [formerly 4eee60d5bc] [formerly 7e114e008b [formerly 1eea078927b999eea1891b56bd2a85ae6044d99f]]
Former-commit-id: 7e114e008b
Former-commit-id: fe44eaac64
2012-06-25 13:17:02 -05:00
Ben Steffensmeier
8517eafdf4 Issue #704 fixes to plots/MPE to work better in KML
Former-commit-id: 2b6e1fa5b6 [formerly 32627cf132] [formerly b01be5085f [formerly f1d440729b4e436e879219abaaaf7fa0e04d4ef6]]
Former-commit-id: b01be5085f
Former-commit-id: 67ba3ee6f6
2012-06-22 17:54:31 -05:00
Brad Gonzales
be195ab805 Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: b0c29466de [formerly 3799026523] [formerly bef2bfa7cc [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]]
Former-commit-id: bef2bfa7cc
Former-commit-id: 23ede5fa7b
2012-06-22 15:08:40 -05:00
Steve Harris
927fd978b4 Issue #708 - execute permissions didn't survive the git push
Former-commit-id: 4d2baf48d9 [formerly aa46aa3713] [formerly a2c88aee12 [formerly 44388508c45f2c560301558c4fb297b806ba55a7]]
Former-commit-id: a2c88aee12
Former-commit-id: bc15e39e5e
2012-06-22 12:08:20 -05:00
Steve Harris
09e2faee72 Issue #708 - new script for setting up Gerrit hook and aliases
Change-Id: Iabdc5005ed9376e31414429a76898c0798d8e7ff

Former-commit-id: 48faf25841 [formerly 492e6fe379] [formerly 209299d1cb [formerly ec3999181ac1f2d2d0ca7f469b69a5bf83633570]]
Former-commit-id: 209299d1cb
Former-commit-id: 2a31a4c3e9
2012-06-22 11:39:00 -05:00
Max Schenkelberg
740b1c3981 Issue #665 fixed TransformFactory when getting worldToGrid to return crsToGrid
Amend: Updated comment for new return

Change-Id: I95151c5233898d156398760d3360de8c80b28001

Former-commit-id: f3caa3f442 [formerly 930d4569a5] [formerly d7b326cfa6 [formerly 42fc0cbd10401a6099e571467ff112f544e525e7]]
Former-commit-id: d7b326cfa6
Former-commit-id: 4d79823f33
2012-06-21 17:54:32 -05:00
Max Schenkelberg
896f128f19 Issue #778 changed SPIResource to not dispose font when magnification changes but instead call setMagnification()
Change-Id: Ibc8aa9b69643d67a1203a560f3adbc3d870db2bf

Former-commit-id: 86e285c8e7 [formerly a8c958fcc8] [formerly fce005b109 [formerly 6ce5d188d0b27bf4cf07a8cd9b15fa9ad0bb16c2]]
Former-commit-id: fce005b109
Former-commit-id: b4d28b22cd
2012-06-21 16:07:23 -05:00
Max Schenkelberg
e8e159bed0 Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: a691f425ea [formerly d0b06374e9] [formerly 130692aefd [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]
Former-commit-id: 130692aefd
Former-commit-id: 859e041e10
2012-06-21 16:07:20 -05:00
Steve Harris
a6332fde49 Issue #708 - removed extraneous files from 12.6.1-10
Former-commit-id: 0174e5e35a [formerly 9a330b2aff] [formerly 577ebf6558 [formerly fdeb636cf84f50fb9c99502f4a7c2991bc48de55]]
Former-commit-id: 577ebf6558
Former-commit-id: ed334fff87
2012-06-21 10:23:40 -05:00
Nate Jensen
00e6701ce9 Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 98fee4da65 [formerly 96c4d9301f] [formerly 22d4de96fd [formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]
Former-commit-id: 22d4de96fd
Former-commit-id: 71a1826611
2012-06-21 10:04:51 -05:00
Bryan Kowal
4ac49d172d Issue #708 - relocating the httpd-collaboration and openfire rpms to the collaboration repository.
Former-commit-id: dd0936cfd9 [formerly 003c669ae5] [formerly 022777b7ec [formerly f9e2b3f0aa74e32b1ba7518db738ce3b81d3cded]]
Former-commit-id: 022777b7ec
Former-commit-id: 251b5fd79e
2012-06-21 09:54:25 -05:00
Steve Harris
efe25edfad 12.6.1-10 baseline
Former-commit-id: edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 3cd0902b49
Former-commit-id: eacd5aeb7f
2012-06-21 08:58:00 -05:00
Steve Harris
333fd9c64e Revert "12.6.1-10 baseline"
This reverts commit f8497470fc [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
f8497470fc 12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Steve Harris
384a62d5aa Issue #708 - Removed extraneous files from 12.5.1-15
Former-commit-id: 7bc9725ef4 [formerly 4fb1c73492] [formerly 6c4e72a430 [formerly bab92b963dca76671250f5e2e2bb462ad5a12a29]]
Former-commit-id: 6c4e72a430
Former-commit-id: 7f3472b566
2012-06-21 08:25:31 -05:00
Ben Steffensmeier
8111785587 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: fd6a3d3b23 [formerly 601d46661c] [formerly 16e4fe8ce2 [formerly 7619165ce45efe9dbad045adfaaf978acee782be]]
Former-commit-id: 16e4fe8ce2
Former-commit-id: cf35d99036
2012-06-20 18:07:17 -05:00
Nate Jensen
8c38ed612e Merge "Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later" into development
Former-commit-id: c7de1d7896 [formerly 121d68b8c4] [formerly 133cd9994e [formerly 5e8d1cbc132dbd69b86342234631f3d11e3bdb3d]]
Former-commit-id: 133cd9994e
Former-commit-id: f4db55cd46
2012-06-20 17:56:50 -05:00
Bryan Kowal
071e7a51d9 Issue #708 - update the binlightning edex specs.
Former-commit-id: 1cf8c09f4d [formerly bd20a47c90] [formerly f2a3f33e07 [formerly 0c37ab92aefae0b00a8c8767421c9b28773ca8fe]]
Former-commit-id: f2a3f33e07
Former-commit-id: 59d98d5c11
2012-06-20 16:00:40 -05:00
Max Schenkelberg
460a1179af Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47

Former-commit-id: 81b6158c40 [formerly ab871d218b] [formerly 61e0ea0516 [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]
Former-commit-id: 61e0ea0516
Former-commit-id: 66a60a7b7b
2012-06-20 15:32:27 -05:00
Bryan Kowal
7ac868e3c7 Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: ad13e81ea6 [formerly d20417a793] [formerly a828d869a0 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]
Former-commit-id: a828d869a0
Former-commit-id: 916ce42ff8
2012-06-20 14:47:19 -05:00
Ben Steffensmeier
8b107023d1 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: c2191c83dc [formerly d317777ee6] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]
Former-commit-id: 0c69731e18
Former-commit-id: b55a4f026c
2012-06-20 14:13:37 -05:00
Bryan Kowal
872a3a5f60 Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 11a1c4f35f [formerly 973ceff9a7] [formerly f79134499e [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]
Former-commit-id: f79134499e
Former-commit-id: 1acbc16759
2012-06-20 11:22:58 -05:00
Steve Harris
1a6525004b Issue #708 - removed extraneous files
Former-commit-id: 004e4c5134 [formerly ba7bd0c711] [formerly c0b5f3f892 [formerly 134264091ddd0567f4789c852f8ee7b41b3dc9bf]]
Former-commit-id: c0b5f3f892
Former-commit-id: 764a9d2a13
2012-06-20 08:24:45 -05:00
Nate Jensen
6b9344db87 Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: bc63d08489 [formerly f74233956e] [formerly a8af268ca1 [formerly dd1f52c8e5d36cccab98821018cb77f544529933]]
Former-commit-id: a8af268ca1
Former-commit-id: 7376a1d4ff
2012-06-19 16:47:34 -05:00
Bryan Kowal
21a02e1510 Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: fa84e5df3e [formerly 207bbd3087] [formerly 25addabe64 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]
Former-commit-id: 25addabe64
Former-commit-id: 94e4af6d47
2012-06-19 15:03:57 -05:00
Bryan Kowal
11ea72acf0 Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 944a1ce201 [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]
Former-commit-id: dff89c83e4
Former-commit-id: 5435963041
2012-06-19 13:33:01 -05:00
Bryan Kowal
76afa5d4b6 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a1ba6c10be [formerly e32406ca8a] [formerly a4c6095b76 [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]
Former-commit-id: a4c6095b76
Former-commit-id: 3b2d570834
2012-06-19 13:17:17 -05:00
Bryan Kowal
5db24885ba Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 25e20ad89c
Former-commit-id: fd8be91fed
2012-06-19 13:15:53 -05:00
Max Schenkelberg
15c59d6621 Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: 1e8e9db9eb [formerly e856cfedf4] [formerly db57eeee16 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]
Former-commit-id: db57eeee16
Former-commit-id: 1f10cddfa2
2012-06-19 13:00:44 -05:00
Richard Peter
ba9aa5df02 Merge "Issue #765 fix so data can be retrieved with or without hdfFileId" into development
Former-commit-id: 918185f564 [formerly aa6c81a2c7] [formerly cee183e89c [formerly 29f61577c289229802f89b96b53735782986366b]]
Former-commit-id: cee183e89c
Former-commit-id: 80faa5abf8
2012-06-19 09:21:24 -05:00
Bryan Kowal
51309941cc Issue #708 - the wes2bridge utility product will no longer expect a src folder.
Former-commit-id: 360916143e [formerly 8149b629d4] [formerly 51d7d8ccdc [formerly 0bdaa8c9344e62d1fc9594d38dfa80ae2c18d3d4]]
Former-commit-id: 51d7d8ccdc
Former-commit-id: b03596a173
2012-06-18 18:20:40 -05:00
Nate Jensen
d7841cef54 Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: 619b70f7fc [formerly ae384ddf24] [formerly bb1ea105d2 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]
Former-commit-id: bb1ea105d2
Former-commit-id: 244ca1b88b
2012-06-18 17:20:48 -05:00
Bryan Kowal
dd07c2ac13 Issue #762 - removing extra com.raytheon.uf.viz.ncep.displays.feature added by collaboration.
Former-commit-id: 66a412e16c [formerly 8735d101d5] [formerly f522cf8a4f [formerly 339adb4a6795d059cc4af29b1d38d8385c5f9afb]]
Former-commit-id: f522cf8a4f
Former-commit-id: a045e729f7
2012-06-18 13:32:31 -05:00
Bryan Kowal
07b8c70b1b Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: ec395ae134 [formerly 96f987631c] [formerly 966c50ed06 [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]
Former-commit-id: 966c50ed06
Former-commit-id: ff0c86f857
2012-06-18 11:51:47 -05:00
Bryan Kowal
21e8618852 Merge branch '11-Collaboration' into development
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
bded5dde2b Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: 2da8a0df2f [formerly aad1eb18b0] [formerly 9068e049cb [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]
Former-commit-id: 9068e049cb
Former-commit-id: dd496b3d90
2012-06-14 16:44:19 -05:00