Commit graph

117 commits

Author SHA1 Message Date
Steve Harris
6287b32e7d Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: f6988eefff
2012-12-11 08:45:53 -06:00
Max Schenkelberg
b24440cc37 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]
Former-commit-id: ed77d56a84
2012-11-29 10:29:36 -06:00
Nate Jensen
8944e220f6 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]
Former-commit-id: 31637efbbc
2012-11-14 16:09:00 -06:00
Dustin Johnson
e25b7c312b Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]
Former-commit-id: 0d1d663f41
2012-11-14 14:41:57 -06:00
Steve Harris
628ca9e5c6 12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 57578da521
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
91254adfd6 Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]
Former-commit-id: 2d864c3b09
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
7c9341a3a6 Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]
Former-commit-id: fbed67a208
2012-11-08 14:34:55 -06:00
Dustin Johnson
4222b24d09 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 1dbeb22893
2012-11-08 09:57:16 -06:00
Steve Harris
214fcd3b63 12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e1498006c7
2012-11-07 12:41:20 -06:00
Dustin Johnson
bcf575966b Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 31d7d09c10
2012-11-01 13:36:06 -05:00
Richard Peter
bd1d87363a Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]
Former-commit-id: 886375172b
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
92fd247ccc merge branch Unifeid_Grid into developement
Former-commit-id: d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]
Former-commit-id: b6a1563bb2
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
a77d2097f8 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]
Former-commit-id: c2934ae7a5
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
b9cd33b79b Issue #189 modify nsharp to use grid data.
Former-commit-id: 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]
Former-commit-id: db1efee514
2012-10-24 13:07:41 -05:00
Steve Harris
e31c1e5bba 12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: a0eaf651ff
2012-10-18 15:46:42 -05:00
Steve Harris
cbbdb231ce 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
2012-10-16 13:27:07 -05:00
Richard Peter
d434d967dd Issue #1257: Fix NSharp point retrieval
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]
Former-commit-id: 3fa2a8b894
2012-10-15 19:40:20 -05:00
Richard Peter
ce85c8e1a6 Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]
Former-commit-id: bcb0560291
2012-10-15 09:52:14 -05:00
Ben Steffensmeier
fed5a35af3 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]
Former-commit-id: 266a2f317f
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
75d1e65c29 Issue #1217 commit code from Ncep to fix the problem
Former-commit-id: d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]
Former-commit-id: bb7b9d18e0
2012-10-09 16:20:39 -05:00
Ben Steffensmeier
c367592b02 Issue #1131 merge latest changes to nsharp from ncep
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320

Former-commit-id: b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]
Former-commit-id: 01a13dee33
2012-09-28 15:35:11 -05:00
Steven Harris
8843ffd022 12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
1df5ee74aa Issue #1213 update nsharp resources to clear target on dispose.
Former-commit-id: 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]
Former-commit-id: 752a0078d4
2012-09-25 10:54:57 -05:00
Ben Steffensmeier
036aa08f2c Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]
Former-commit-id: 2606f968cb
2012-09-20 17:28:54 -05:00
Ben Steffensmeier
b547d9dd8f Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]
Former-commit-id: 05849f634d
2012-09-18 15:19:05 -05:00
Max Schenkelberg
c26d21d908 Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]
Former-commit-id: 2f8f1ce9b2
2012-09-11 16:27:41 -05:00
Steve Harris
438d139fdd 12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 969e7e6dfd
2012-09-11 16:00:38 -05:00
Steve Harris
53e29f59e4 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: af106f1d29
2012-09-04 12:11:03 -05:00
Steve Harris
7bd9c63dc7 12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: d708932029
2012-09-04 12:07:27 -05:00
Steve Harris
87a602dfee Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: a71dac6cad
2012-08-27 09:53:55 -05:00
Steve Harris
72824561cb 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
2012-08-21 15:27:03 -05:00
Ben Steffensmeier
2c5cfe6d98 Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]
Former-commit-id: 8e971abbd8
2012-08-17 16:16:20 -05:00
Steve Harris
0c5d9e2416 12.9.1-1 baseline
Former-commit-id: 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 79ce6cfd97
2012-08-15 13:59:00 -05:00
Steve Harris
8f4ddad22c Merge branch 'development' into development_on_ss_builds
Former-commit-id: 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]
Former-commit-id: a1071e3204
2012-08-06 08:23:04 -05:00
Steve Harris
3476fe755b Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]
Former-commit-id: 51e38ca887
2012-08-01 12:43:12 -05:00
Steve Harris
e0c3722fd1 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
2012-08-01 10:45:37 -05:00
Nate Jensen
00bbb6c8a3 Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]
Former-commit-id: 69f51e6e87
2012-07-31 10:02:39 -05:00
Nate Jensen
8fa0eb70db Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]
Former-commit-id: 4a2841b287
2012-07-31 08:57:54 -05:00
Steve Harris
2aa4114e4d Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.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.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.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
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	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.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.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/com.raytheon.uf.edex.tafqueue.ecl
	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/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 587bb6a274
2012-07-27 14:44:44 -05:00
Steve Harris
9f97182964 12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
2012-07-19 16:20:40 -05:00
Bryan Kowal
424bbaf0f7 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: ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]
Former-commit-id: 3b7c761f99
2012-07-11 12:44:32 -05:00
Steve Harris
330b9c3174 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: 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]
Former-commit-id: 9454393d13
2012-07-10 09:29:33 -05:00
Steve Harris
4f7bb90bb0 12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 27afa60345
2012-07-10 07:53:49 -05:00
Nate Jensen
04254cada4 Issue #666 fix for ncep metars to share correctly in collaboration session
Change-Id: I829eea313b5870d3df551f9b5224d178528412ae

Former-commit-id: ad2c9b5d3b [formerly b4de13af62ea179577e9dc799c3174d4ce7bd21b]
Former-commit-id: 0b6b48222c
2012-07-03 13:38:31 -05:00
David Gillingham
ee57b63a0c 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: 3fffc47ba5 [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]
Former-commit-id: abdcc32b2c
2012-06-29 13:01:42 -05:00
Bryan Kowal
9a7d0492fe 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: a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: b87b66abc5
2012-06-27 17:21:48 -05:00
Bryan Kowal
5874255a05 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]
Former-commit-id: 98fdfa6f37
2012-06-27 16:22:53 -05:00
Bryan Kowal
62c7de6d3b 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: 4a17650914 [formerly 9597fdac96022c94dad425367de23eafedad06bc]
Former-commit-id: 53e5b7c491
2012-06-27 15:04:34 -05:00
Brad Gonzales
a289b1f008 Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: c00fb6f089 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]
Former-commit-id: c99fa8db33
2012-06-26 15:41:14 -05:00
Nate Jensen
5ada671511 Merge "Issue #628 added PgenResourceGhost to track the gl ghost draw objects." into development
Former-commit-id: cfc56f670a [formerly 00dfc8449b6d12b0a3ed52c3f60cc016eaa13af3]
Former-commit-id: ab86141e2f
2012-06-26 13:21:49 -05:00