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

292 commits

Author SHA1 Message Date
Steven Harris
ffe3641057 12.11.1-1 baseline 
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
 2012-09-27 15:57:45 -05:00
Ron Anderson
1eebe679a0 Issue Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 34382eb228 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]
Former-commit-id: 4373858ac6
Former-commit-id: f1fb73e815
 2012-09-25 16:07:05 -05:00
Ben Steffensmeier
69283c27a8 Issue convert grib decoder to produce both grib and grid records. 
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 4be2aa88c7
Former-commit-id: 5f787b6a6b
 2012-09-20 12:24:35 -05:00
Ron Anderson
28efe7e4d6 Issue Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 776214bf24 [formerly 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]]
Former-commit-id: 6e2130a790
Former-commit-id: dbe4f8f9b8
 2012-09-19 17:41:48 -05:00
Ben Steffensmeier
9eecab65c0 Issue checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: bd8eb7fc15
Former-commit-id: 4fe2127bfb
 2012-09-18 15:19:05 -05:00
Steve Harris
9ed9283b30 Merge branch 'ss_builds' (12.10.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java

Former-commit-id: 39f15fe032 [formerly dd6ac67e17 [formerly 4e988dde641d01295134080111e738f25a110e6d]]
Former-commit-id: dd6ac67e17
Former-commit-id: 15a625adb7
 2012-09-17 15:46:11 -05:00
Steve Harris
d0cd58d6bc 12.10.1-5 baseline 
Former-commit-id: 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: a96d35a1fa
Former-commit-id: 82feb4de50
 2012-09-17 15:42:31 -05:00
Steve Harris
bedc9569ca Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 29e7427dc3
Former-commit-id: 04de1d5857
 2012-09-13 13:26:13 -05:00
Steve Harris
0d8d18d7e2 12.10.1-4 baseline 
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
 2012-09-13 12:08:11 -05:00
Richard Peter
5baaa6593f Merge "Issue - edex will now use the same jep library that CAVE does" into development 
Former-commit-id: 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]
Former-commit-id: 701960a246
Former-commit-id: c8443cf85c
 2012-09-12 08:27:11 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline 
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
 2012-09-11 16:00:38 -05:00
David Gillingham
fc39f37437 Issue : Fix regression caused by previous text product generation changes by ensuring all 
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]
Former-commit-id: f192c8d115
Former-commit-id: cff73c9e1d
 2012-09-07 12:29:36 -05:00
Bryan Kowal
f3a273027c Issue - edex will now use the same jep library that CAVE does 
Former-commit-id: 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]
Former-commit-id: ec89c440fe
Former-commit-id: 3c63f21cfc
 2012-09-07 10:28:51 -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
Steve Harris
e1cf4b0b9a 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b8ab6066f6
Former-commit-id: 7a4f4ac493
 2012-08-22 16:00:33 -05:00
Steve Harris
57c1be9f5a Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 44a7cb75e7 [formerly d38f8b80f0 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: d38f8b80f0
Former-commit-id: 084ac9fbd4
 2012-08-21 16:17:58 -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 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 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
7e89b04a10 Merge branch 'development' into development_on_ss_builds 
Former-commit-id: a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: 24799cd93d
Former-commit-id: 54c505dd8e
 2012-08-06 08:23:04 -05:00
Bryan Kowal
642d57b71d Issue - deploy-install improvements; removed references to non-existent files from build.properties. 
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: 5ca4a66fdc [formerly c6b2d65308 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: c6b2d65308
Former-commit-id: dd1acbe70a
 2012-08-02 10:33:55 -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
James Korman
226ff6ea65 Issue - Code review changes 
Issue  - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 4cbbc59278 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 38a2e426d9
Former-commit-id: 1166a7cbb1
 2012-07-31 13:38:23 -05:00
Bryan Kowal
1208c5cd40 Issue - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost 
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6

Former-commit-id: cd40d9accf [formerly 327ffa9439 [formerly dca54e56436ace397c6163b03ac4edb480336404]]
Former-commit-id: 327ffa9439
Former-commit-id: 67035fa0b8
 2012-07-28 08:52:36 -05:00
Richard Peter
2fd4762fea Merge "Issue Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development 
Former-commit-id: 77c2ab2c05 [formerly 9e3cd2546a [formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]
Former-commit-id: 9e3cd2546a
Former-commit-id: 1de59b48cf
 2012-07-27 14:50:00 -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
Max Schenkelberg
e5543b33b9 Issue Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R 
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM.  Also changed MessageGenerator to use new class for finding the wmo header

Amend: Added try-finally for input stream in DataUnzipper

Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1

Former-commit-id: b669f57ee4 [formerly 756988cb8b [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]
Former-commit-id: 756988cb8b
Former-commit-id: 7ace2035c5
 2012-07-27 14:42:36 -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
81dd57d347 Issue - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written. 
Former-commit-id: 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]
Former-commit-id: db6b535eb6
Former-commit-id: b446253674
 2012-07-12 12:58:40 -05:00
Bryan Kowal
85bcee527d Issue - no longer remove the gfesuite files before deployment; just override any existing files. 
Former-commit-id: bde6be6e2b [formerly 0f31fadffa [formerly ea1b0920d908481e28477329497204dda324bd3e]]
Former-commit-id: 0f31fadffa
Former-commit-id: 7f6015eba5
 2012-07-11 17:31:55 -05:00
Bryan Kowal
81dcc5dcc7 Issue - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily). 
Former-commit-id: 31f2db8719 [formerly 5058c32c34 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]
Former-commit-id: 5058c32c34
Former-commit-id: 6fe6e64f38
 2012-07-11 16:28:28 -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 - 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 - 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
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
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
80adc8bbfd Issue - 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
Bryan Kowal
d25012ee75 Issue - 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
Bryan Kowal
11a4550eb3 Issue - 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 - 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
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