xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
811 commits 31 branches 40 tags 3.8 GiB
Commit graph

59 commits

Author SHA1 Message Date
Bryan Kowal
2f7fae43cc Issue #1141 - Merging KML into the Common Baseline 
Former-commit-id: 7b45633097 [formerly 3180ae0c57 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]]
Former-commit-id: 3180ae0c57
Former-commit-id: 8d444b35d3
 2012-09-05 18:39:08 -05:00
Steve Harris
319927240c Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: bba4eb12d0
Former-commit-id: 0e046d847a
 2012-09-04 12:11:03 -05:00
Steve Harris
7248f8b762 12.10.1-1 baseline 
Former-commit-id: d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
 2012-09-04 12:07:27 -05:00
Steve Harris
6784576fc9 12.9.1-12 baseline 
Former-commit-id: 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 948766c387
Former-commit-id: 4bf4f0043a
 2012-09-04 11:47:38 -05:00
Steve Harris
772c4359da 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: a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: 91e39617cb
Former-commit-id: 51eb89eb2a
 2012-08-27 09:53:55 -05:00
Jonathan Sanchez
caaa78a981 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: f646b185da [formerly 1b45f1b6d9 [formerly a7f030f7ee05c60820c1ef82a5093b404e5e97a0]]
Former-commit-id: 1b45f1b6d9
Former-commit-id: 20c65a4677
 2012-08-23 09:27:46 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline 
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
 2012-08-21 15:27:03 -05:00
Ron Anderson
0a6de388dd 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: 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: d7a818fd1d
Former-commit-id: 16231374f8
 2012-08-17 12:41:49 -05:00
Ron Anderson
c71ee18e6e Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 1321db6a99
Former-commit-id: 93c632c1ff
 2012-08-17 12:20:08 -05:00
root
bb7b5341dd Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: cb46f57879
Former-commit-id: 0987fc6b3d
 2012-08-15 22:15:20 +00:00
Steve Harris
71b024e3a1 12.9.1-4 baseline 
Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
 2012-08-15 15:19:10 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline 
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
 2012-08-15 13:59:00 -05:00
Steve Harris
9bec162043 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: f3babcf1a1 [formerly d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]
Former-commit-id: d90c5f989d
Former-commit-id: 60c0cfc3b3
 2012-08-06 11:13:47 -05:00
Jonathan Sanchez
62106ee967 Issue #1006 Implemented urban areas. 
Former-commit-id: 62db15b6f4 [formerly dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]
Former-commit-id: dbd30e3b67
Former-commit-id: 06ce1c6dd5
 2012-08-06 08:41:52 -05:00
Steve Harris
0557c9a0c6 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: 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 6d77b94217
Former-commit-id: fb47934159
 2012-08-01 12:43:12 -05:00
Steve Harris
2e804fc8c4 12.8.1-5 baseline 
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
 2012-08-01 10:45:37 -05:00
Steve Harris
7efcfa7d8d 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: 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 56249c2611
Former-commit-id: 07c40a9c0c
 2012-07-27 14:44:44 -05:00
Steve Harris
b242dd98d6 12.7.1-8 baseline 
Former-commit-id: c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
 2012-07-19 16:20:40 -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
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
Ron Anderson
9667367c3c Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures. 
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97

Former-commit-id: e71059c2b9 [formerly d3e0cd5af8 [formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]
Former-commit-id: d3e0cd5af8
Former-commit-id: d68ece4d55
 2012-07-05 16:32:44 -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
466046f605 Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues 
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55

Former-commit-id: 98fdfa6f37 [formerly f7d19019a9 [formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]
Former-commit-id: f7d19019a9
Former-commit-id: 1e06e23eca
 2012-06-27 16:22:53 -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
Bryan Kowal
a6814ec7fb 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: 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]
Former-commit-id: 207bbd3087
Former-commit-id: fa84e5df3e
 2012-06-19 15:03:57 -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
2f10c7a1e4 12.5.1-15 baseline 
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
 2012-06-08 13:39:48 -05:00
Max Schenkelberg
603726498f Issue #590 fixed GFE session creation bugs. Added refresh to tool items 
on undo/redo from keyboard

Former-commit-id: 8b87b6a0a1 [formerly b5da470e0a [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]
Former-commit-id: b5da470e0a
Former-commit-id: f0e2ef8c91
 2012-06-05 16:43:27 -05:00
Steve Harris
45773fbee0 12.5.1-9 baseline 
Former-commit-id: 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 8f3c9ebfb7
Former-commit-id: b8de76b45e
 2012-05-21 17:48:55 -05:00
Steve Harris
ba6d779949 12.5.1-6 baseline 
Former-commit-id: fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: 24474489f9
Former-commit-id: df80148db6
 2012-05-16 16:41:22 -05:00
Max Schenkelberg
8f74ccc2b8 Issue #588 Fix VizPainter.py bug from previous commit 
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7

Former-commit-id: ea2151970a [formerly c2e1e83033 [formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]]
Former-commit-id: c2e1e83033
Former-commit-id: c3ec79ef6c
 2012-05-09 15:38:03 -05:00
Max Schenkelberg
82298cb03b Issue #588 Added serialization adapter registration to better support serializing DrawableString objects 
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]
Former-commit-id: 78e1bd2c62
Former-commit-id: 06ee0bbf6f
 2012-05-09 15:02:30 -05:00
Steve Harris
bcc12e03ed 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: 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 27bc369818
Former-commit-id: 572e1bb476
 2012-05-09 13:14:00 -05:00
Steve Harris
c1bc408f84 12.5.1-2 baseline 
Former-commit-id: b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: 84d191e7b6
Former-commit-id: ac708c050d
 2012-05-03 19:17:13 -05:00
Steve Harris
7fa9dbd5fb 12.4.1-10 baseline 
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
 2012-05-01 18:06:13 -05:00
Steve Harris
931087306f 12.4.1-10 baseline 
Former-commit-id: 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 704b75e1a1
Former-commit-id: 418489e726
 2012-04-24 15:38:29 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Bryan Kowal
db3f60b23a 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: ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]
Former-commit-id: 6ddeef48fa
Former-commit-id: b1a5abc6b3
 2012-04-10 16:42:36 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline 
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
 2012-03-30 08:38:33 -05:00
Steve Harris
5a96582f16 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: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
 2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
 2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
 2012-02-22 10:12:49 -06:00
Steve Harris
d129eab241 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
 2012-02-20 12:43:38 -06:00