Bryan Kowal
8d444b35d3
Issue #1141 - Merging KML into the Common Baseline
...
Former-commit-id: 7b456330973180ae0c57
2012-09-05 18:39:08 -05:00
Steve Harris
0e046d847a
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: af106f1d29bba4eb12d0
2012-09-04 12:11:03 -05:00
Steve Harris
0abf64b77c
12.10.1-1 baseline
...
Former-commit-id: d708932029195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
4bf4f0043a
12.9.1-12 baseline
...
Former-commit-id: 150bc967a5948766c387
2012-09-04 11:47:38 -05:00
Steve Harris
51eb89eb2a
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: a71dac6cad91e39617cb
2012-08-27 09:53:55 -05:00
Jonathan Sanchez
20c65a4677
Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8
Former-commit-id: f646b185da1b45f1b6d9
2012-08-23 09:27:46 -05:00
Steve Harris
a1d931fd44
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c
2012-08-21 15:27:03 -05:00
Ron Anderson
16231374f8
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 7662d249abd7a818fd1d
2012-08-17 12:41:49 -05:00
Ron Anderson
93c632c1ff
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 819b9c8e561321db6a99
2012-08-17 12:20:08 -05:00
root
0987fc6b3d
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984cb46f57879
2012-08-15 22:15:20 +00:00
Steve Harris
36c108e960
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96ddcda3a2290
2012-08-15 15:19:10 -05:00
Steve Harris
8309193ce9
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd9731ae7ea218
2012-08-15 13:59:00 -05:00
Steve Harris
60c0cfc3b3
Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: f3babcf1a1d90c5f989d
2012-08-06 11:13:47 -05:00
Jonathan Sanchez
06ce1c6dd5
Issue #1006 Implemented urban areas.
...
Former-commit-id: 62db15b6f4dbd30e3b67
2012-08-06 08:41:52 -05:00
Steve Harris
fb47934159
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: 51e38ca8876d77b94217
2012-08-01 12:43:12 -05:00
Steve Harris
2653ddc2e3
12.8.1-5 baseline
...
Former-commit-id: cd49ef3edafd2abfb6f1
2012-08-01 10:45:37 -05:00
Steve Harris
07c40a9c0c
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: 587bb6a27456249c2611
2012-07-27 14:44:44 -05:00
Steve Harris
11f96dbedd
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa3916bf591a33
2012-07-19 16:20:40 -05:00
Bryan Kowal
226818bda5
Merge branch 'merge_development' into development
...
Former-commit-id: b27994c9b1051a51b79c
2012-07-10 17:03:21 -05:00
Bryan Kowal
c629f18f24
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: f92eb59a7399d22f395a
2012-07-10 16:57:16 -05:00
Steve Harris
8fff0d7e53
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: 9454393d13479ccdbed2
2012-07-10 09:29:33 -05:00
Steve Harris
7c064b6868
12.6.1-9 baseline
...
Former-commit-id: 27afa603452c0ff851ca
2012-07-10 07:53:49 -05:00
Ron Anderson
d68ece4d55
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: e71059c2b9d3e0cd5af8
2012-07-05 16:32:44 -05:00
Bryan Kowal
b1b294c401
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: b87b66abc5a33740e915
2012-06-27 17:21:48 -05:00
Bryan Kowal
1e06e23eca
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: 98fdfa6f37f7d19019a9
2012-06-27 16:22:53 -05:00
Steve Harris
edac4d827c
12.6.1-10 baseline
...
Former-commit-id: 3cd0902b498dc4a774e2
2012-06-21 08:58:00 -05:00
Steve Harris
62cf6a9f92
Revert "12.6.1-10 baseline"
...
This reverts commit 06f1c7b73cddde63eee0a2c0893d1a25198a5cd6b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c
12.6.1-10 baseline
...
Former-commit-id: a2c0893d1addde63eee0
2012-06-21 08:38:48 -05:00
Bryan Kowal
fa84e5df3e
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: 25addabe64207bbd3087
2012-06-19 15:03:57 -05:00
Steve Harris
af6c0529ad
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: 48860df6902f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
09f73b0601
12.6.1-5 baseline
...
Former-commit-id: 8947efbc7fc99afab05f
2012-06-11 16:23:47 -05:00
Steve Harris
7c5306b795
12.6.1-3 baseline
...
Former-commit-id: d57eb02b9e42f3513175
2012-06-11 16:23:47 -05:00
Steve Harris
0ca936807e
12.5.1-15 baseline
...
Former-commit-id: cee20d8656d5c238de07
2012-06-11 16:02:30 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00
2012-06-08 13:39:48 -05:00
Max Schenkelberg
f0e2ef8c91
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
...
on undo/redo from keyboard
Former-commit-id: 8b87b6a0a1b5da470e0a
2012-06-05 16:43:27 -05:00
Steve Harris
b8de76b45e
12.5.1-9 baseline
...
Former-commit-id: 1f542697cb8f3c9ebfb7
2012-05-21 17:48:55 -05:00
Steve Harris
df80148db6
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf124474489f9
2012-05-16 16:41:22 -05:00
Max Schenkelberg
c3ec79ef6c
Issue #588 Fix VizPainter.py bug from previous commit
...
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: ea2151970ac2e1e83033
2012-05-09 15:38:03 -05:00
Max Schenkelberg
06ee0bbf6f
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 1f5abc6e2078e1bd2c62
2012-05-09 15:02:30 -05:00
Steve Harris
572e1bb476
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 58037cb5d127bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d
12.5.1-2 baseline
...
Former-commit-id: b36c69cc6784d191e7b6
2012-05-03 19:17:13 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
418489e726
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a68300
2012-04-18 15:18:16 -05:00
Bryan Kowal
b1a5abc6b3
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
...
Former-commit-id: ce99417a2a6ddeef48fa
2012-04-10 16:42:36 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd94068f5295f
2012-03-30 08:38:33 -05:00
Steve Harris
92084b3f20
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
8da36046de
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
85075e6107
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e2594c2ea985b
2012-02-22 10:12:49 -06:00
Steve Harris
c268da57bc
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be244b76d22f77
2012-02-20 12:43:38 -06:00
