Commit graph

359 commits

Author SHA1 Message Date
Bryan Kowal
ec9551d614 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]
Former-commit-id: ab2c53ae0a
Former-commit-id: 8fef600e84
2012-07-11 12:44:32 -05:00
Bryan Kowal
291a674e41 Merge branch 'merge_development' into development
Former-commit-id: b27994c9b1 [formerly 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]
Former-commit-id: 051a51b79c
Former-commit-id: 226818bda5
2012-07-10 17:03:21 -05:00
Bryan Kowal
2acacb211a Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: 99d22f395a
Former-commit-id: c629f18f24
2012-07-10 16:57:16 -05:00
Greg Armendariz
57113a9d9d Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: 2fcdef36f3 [formerly 84e8babca1 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]]
Former-commit-id: 84e8babca1
Former-commit-id: e119a69089
2012-07-10 10:15:33 -05:00
Steve Harris
a456af38fa Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]
Former-commit-id: 479ccdbed2
Former-commit-id: 8fff0d7e53
2012-07-10 09:29:33 -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
James Korman
a2c0db46fd Issue #798 - Modified Satellite component to persist GOESR data
Former-commit-id: 917202386b [formerly fde4a09b69 [formerly 3210c78cbc0c3af3e576c99644231416020d2838]]
Former-commit-id: fde4a09b69
Former-commit-id: cbfb024ac1
2012-07-09 10:08:11 -05:00
Max Schenkelberg
a9630197ef Issue #626 wrote grid downscaler to help NPP/GOES-R downscale data in a common method. Uses new interpolation/reprojection APIs
Change-Id: I4ab39a6d0bcd1f54337c77b9086f15afdc3e9ea4

Former-commit-id: cbd753c86d [formerly a0d645fedf [formerly f28d4ba149fe16471a4e10e50f15b684c0d82b9c]]
Former-commit-id: a0d645fedf
Former-commit-id: 5d4d4d9c22
2012-07-06 16:04:12 -05:00
Max Schenkelberg
3bff06cf92 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 9bbb68a547
Former-commit-id: 7d13c7d339
2012-07-06 16:01:47 -05:00
Ron Anderson
032e9e2a84 Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7

Former-commit-id: 593a09daee [formerly 1f871be887 [formerly 8e81e22084031ed702ba294ec94a6bd59926d88c]]
Former-commit-id: 1f871be887
Former-commit-id: 51a8028105
2012-07-05 15:50:07 -05:00
Bryan Kowal
8a976cad85 Merge "Issue #716 remove dead plugin from features" into development
Former-commit-id: 5af862f03f [formerly 5211449202 [formerly 479a1c1309a657baa50afaf2e6640e840059a121]]
Former-commit-id: 5211449202
Former-commit-id: d918ed1a48
2012-07-02 09:50:55 -05:00
David Gillingham
286686e574 Issue #827: Add serialization annotation to id field for TAF ChangeGroup and BufrMosDataLocation classes.
Change-Id: I894932f410865b0d019b2a8017cc157055552e0c

Former-commit-id: 691f67747e [formerly 10beeaa160 [formerly cf6fdd9cde2a3a0565c7adef2ab11cecdb324ea9]]
Former-commit-id: 10beeaa160
Former-commit-id: 6d8d87dc9a
2012-06-29 13:30:25 -05:00
Nate Jensen
7e34a3e6ab Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: bcedcc51fa
Former-commit-id: e58404bcb5
2012-06-29 13:19:47 -05:00
David Gillingham
d54d8a51ff Issue #828: Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.

Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581

Former-commit-id: abdcc32b2c [formerly 3fffc47ba5 [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]
Former-commit-id: 3fffc47ba5
Former-commit-id: aa0ba41cf9
2012-06-29 13:01:42 -05:00
David Gillingham
c4a50f8c5c Issue #826: Fix TCG and Warning decoders to properly respect ALLOW_ARCHIVE_DATA env variable, fix broken GFE
VTEC notification route.

Change-Id: I48550b9023cc7f251462f0c6620cff352f4512be

Former-commit-id: 1df1bbbf9e [formerly 151515b52d [formerly 151a2069e3bf46f08bc636cf1bd4974b07e65da3]]
Former-commit-id: 151515b52d
Former-commit-id: fceb86f7be
2012-06-29 10:25:09 -05:00
Max Schenkelberg
f0f4ad8039 Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: a3014f6ec3 [formerly 62bd4a667a [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]
Former-commit-id: 62bd4a667a
Former-commit-id: e1d23a56a9
2012-06-28 15:29:05 -05:00
Ben Steffensmeier
a93f42b3ec Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: 6f2e2b2cea [formerly 79ba6c2cd5 [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]
Former-commit-id: 79ba6c2cd5
Former-commit-id: b7326d0979
2012-06-28 14:07:48 -05:00
Bryan Kowal
4ce58fa303 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]
Former-commit-id: 4acb1d8693
Former-commit-id: 873ee341f5
2012-06-27 18:38:19 -05:00
Bryan Kowal
455d7b90a9 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: b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: a33740e915
Former-commit-id: b1b294c401
2012-06-27 17:21:48 -05:00
Bryan Kowal
687c8e9968 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: 53e5b7c491 [formerly 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]
Former-commit-id: 4a17650914
Former-commit-id: 072c88b382
2012-06-27 15:04:34 -05:00
David Gillingham
b47204fd7e Issue #810: turn off Wes2Bridge archiver by default
Change-Id: I1974b81e73b2daab48947d2a44dc9072aba459af

Former-commit-id: 12b2403627 [formerly 1ddd687bc8 [formerly ff97ae48126d906463a4a1063782fa3f154fdeeb]]
Former-commit-id: 1ddd687bc8
Former-commit-id: 89f47d55a4
2012-06-26 17:58:21 -05:00
David Gillingham
4a32c3b1f1 Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 672d7a2c31 [formerly 2a0ffc5311 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]
Former-commit-id: 2a0ffc5311
Former-commit-id: 768afb8423
2012-06-26 17:49:06 -05:00
Bryan Kowal
0736ffbf58 Issue #704 - update build.properties files for python.
Former-commit-id: b1a1448256 [formerly dda06c5d8e [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]
Former-commit-id: dda06c5d8e
Former-commit-id: 70b71ec2e3
2012-06-26 10:26:29 -05:00
Nate Jensen
d82d9475ae Merge "Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic." into development
Former-commit-id: 61b0394381 [formerly 0f77b9cfbc [formerly 2eab85ae7e6ad05e549b173fd026f22b61e8e8a7]]
Former-commit-id: 0f77b9cfbc
Former-commit-id: 41e3543148
2012-06-26 10:24:17 -05:00
Bryan Kowal
757b2d295e Issue #800 - fix build.properties.
Former-commit-id: 670c7cabb4 [formerly 0ec62da46e [formerly 914838d805b01754cf5947eaa7196b148d2738b5]]
Former-commit-id: 0ec62da46e
Former-commit-id: 089710a432
2012-06-26 09:42:20 -05:00
Bryan Kowal
9f49526e21 Issue #704 - fix build.properties files.
Former-commit-id: 1e5c9ef92d [formerly cc1ac5fd2f [formerly 7130431b6e279db1c5ed550e0ce42c5fdf4238f1]]
Former-commit-id: cc1ac5fd2f
Former-commit-id: 73d4ec0bfb
2012-06-25 16:50:11 -05:00
Ben Steffensmeier
562f0c0dbe Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 603d48a017 [formerly 682edec2cf [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]
Former-commit-id: 682edec2cf
Former-commit-id: 0855e117cb
2012-06-25 15:22:35 -05:00
Max Schenkelberg
30f9c8202a Issue #665 fixed TransformFactory when getting worldToGrid to return crsToGrid
Amend: Updated comment for new return

Change-Id: I95151c5233898d156398760d3360de8c80b28001

Former-commit-id: d7b326cfa6 [formerly 930d4569a5 [formerly 42fc0cbd10401a6099e571467ff112f544e525e7]]
Former-commit-id: 930d4569a5
Former-commit-id: f3caa3f442
2012-06-21 17:54:32 -05:00
Nate Jensen
ac131f24a7 Merge "Issue #704 fixes to random resources and optimization of radar projection transforms" into development
Former-commit-id: 22d4de96fd [formerly 96c4d9301f [formerly 995d7e08ade1a3e10ac8ab51aa24f900091054de]]
Former-commit-id: 96c4d9301f
Former-commit-id: 98fee4da65
2012-06-21 10:04:51 -05:00
Steve Harris
a9742f306e 12.6.1-10 baseline
Former-commit-id: 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]
Former-commit-id: 8dc4a774e2
Former-commit-id: edac4d827c
2012-06-21 08:58:00 -05:00
Steve Harris
584f7eddf8 Revert "12.6.1-10 baseline"
This reverts commit 16fd236f2d [formerly 06f1c7b73c] [formerly ddde63eee0] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: b4b1f6975f
Former-commit-id: 62cf6a9f92
2012-06-21 08:51:08 -05:00
Steve Harris
16fd236f2d 12.6.1-10 baseline
Former-commit-id: a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: ddde63eee0
Former-commit-id: 06f1c7b73c
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
27f0acb671 Issue #704 fixes to random resources and optimization of radar projection transforms
Former-commit-id: 16e4fe8ce2 [formerly 601d46661c [formerly 7619165ce45efe9dbad045adfaaf978acee782be]]
Former-commit-id: 601d46661c
Former-commit-id: fd6a3d3b23
2012-06-20 18:07:17 -05:00
Bryan Kowal
80adc8bbfd Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]
Former-commit-id: 973ceff9a7
Former-commit-id: 11a1c4f35f
2012-06-20 11:22:58 -05:00
Nate Jensen
6b03c17c02 Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: a8af268ca1 [formerly f74233956e [formerly dd1f52c8e5d36cccab98821018cb77f544529933]]
Former-commit-id: f74233956e
Former-commit-id: bc63d08489
2012-06-19 16:47:34 -05:00
Bryan Kowal
345f682e22 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a4c6095b76 [formerly e32406ca8a [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]
Former-commit-id: e32406ca8a
Former-commit-id: a1ba6c10be
2012-06-19 13:17:17 -05:00
Bryan Kowal
d25012ee75 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: 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 95a5887b06
Former-commit-id: cb16805e7e
2012-06-19 13:15:53 -05:00
Max Schenkelberg
116c64cbc4 Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: db57eeee16 [formerly e856cfedf4 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]
Former-commit-id: e856cfedf4
Former-commit-id: 1e8e9db9eb
2012-06-19 13:00:44 -05:00
Nate Jensen
f930006834 Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: bb1ea105d2 [formerly ae384ddf24 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]
Former-commit-id: ae384ddf24
Former-commit-id: 619b70f7fc
2012-06-18 17:20:48 -05:00
Bryan Kowal
9e7907ecd7 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: f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f528e10391
Former-commit-id: 9361f3eb94
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
3c4dbe4316 Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23

Former-commit-id: dd353747d0 [formerly f63d2bc7c2 [formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]
Former-commit-id: f63d2bc7c2
Former-commit-id: e629fcb15b
2012-06-14 16:30:34 -05:00
Bryan Kowal
11a4550eb3 Issue #708 - support deploying from a separate work assignment repository - initial implementation.
Former-commit-id: 14c912f215 [formerly 1c8b752063 [formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]
Former-commit-id: 1c8b752063
Former-commit-id: 24627d52f2
2012-06-14 12:43:34 -05:00
Bryan Kowal
175cbf318d Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]
Former-commit-id: dcc5675564
Former-commit-id: 5e80c45a03
2012-06-14 11:35:15 -05:00
Ron Anderson
9b93354368 Removed activetable plugin dependencies on gfe
Former-commit-id: a8d2c6b961 [formerly be525f1c49 [formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]
Former-commit-id: be525f1c49
Former-commit-id: 6720a0aa77
2012-06-14 10:09:22 -05:00
Max Schenkelberg
816500d7c4 Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]
Former-commit-id: dd99479eeb
Former-commit-id: 51c2a41e68
2012-06-13 17:52:11 -05:00
Steve Harris
03383359f3 Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 2f20a86a30
Former-commit-id: af6c0529ad
2012-06-12 14:37:12 -05:00
Steve Harris
1ad64ffa98 12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: c99afab05f
Former-commit-id: 09f73b0601
2012-06-11 16:23:47 -05:00
Steve Harris
bc96eba820 12.6.1-3 baseline
Former-commit-id: d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: 42f3513175
Former-commit-id: 7c5306b795
2012-06-11 16:23:47 -05:00
Steve Harris
244755b393 12.5.1-15 baseline
Former-commit-id: cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: d5c238de07
Former-commit-id: 0ca936807e
2012-06-11 16:02:30 -05:00
Steve Harris
975053c3dc Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
	cots/org.jboss.cache/.project
	edexOsgi/build.edex/esb/conf/spring/project.properties
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
	javaUtilities/com.raytheon.wes2bridge.utility.product/.project
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
	ncep/gov.noaa.nws.ncep.common.staticdata/.project

Former-commit-id: d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: 37793c86b1
Former-commit-id: c7024992a3
2012-06-11 15:24:03 -05:00