Bryan Kowal
64435bbe54
Issue #969 - 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: 1208c5cd4067035fa0b8327ffa94391208c5cd4067035fa0b8327ffa9439cd40d9accf327ffa9439cd40d9accfeafdfd70e76ac43a3c0c107831f23de0c0b5928f93967d22c2
2012-07-28 08:52:36 -05:00
Richard Peter
93a2c8684b
Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
...
Former-commit-id: 2fd4762fea1de59b48cf9e3cd2546a2fd4762fea1de59b48cf9e3cd2546a77c2ab2c059e3cd2546a77c2ab2c05bd7c9ee30bb6a1b5011fd131cd42cfc8ce12f7ac82db8b29eb
2012-07-27 14:50:00 -05:00
Steve Harris
2e4db7ecaf
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: 7efcfa7d8d07c40a9c0c56249c26117efcfa7d8d07c40a9c0c56249c2611587bb6a27456249c2611587bb6a274c18e221e269e4df423262aa4114e4dd7540c958f84d0f1fbb6
2012-07-27 14:44:44 -05:00
Max Schenkelberg
fb3c04c9cf
Issue #626 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: e5543b33b97ace2035c5756988cb8be5543b33b97ace2035c5756988cb8bb669f57ee4756988cb8bb669f57ee4acfd34f2e5864d6335a651f9666fcbe45c7f58ac9a1cd3b5e1
2012-07-27 14:42:36 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d611f96dbedd16bf591a33b242dd98d611f96dbedd16bf591a33c42ae0fa3916bf591a33c42ae0fa39e1eb7f5972f2102bfb249f971829649aabe438b936e2ad3023
2012-07-19 16:20:40 -05:00
Bryan Kowal
80875985e1
Issue #802 - 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: 81dd57d347b446253674db6b535eb681dd57d347b446253674db6b535eb61e5b71ee7bdb6b535eb61e5b71ee7b302e87f97534a4f5807446198b0c92de1d59a174fee2a4e419
2012-07-12 12:58:40 -05:00
Bryan Kowal
b3bbf9cf49
Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
...
Former-commit-id: 85bcee527d7f6015eba50f31fadffa85bcee527d7f6015eba50f31fadffabde6be6e2b0f31fadffabde6be6e2bc3e4e47c086d961d22fb00c9a0f7085b87488b52095a4ebfa2
2012-07-11 17:31:55 -05:00
Bryan Kowal
c1fb53cf33
Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
...
Former-commit-id: 81dcc5dcc76fe6e64f385058c32c3481dcc5dcc76fe6e64f385058c32c3431f2db87195058c32c3431f2db8719bce385a4cb43f3d40a8e5619099acd8378fadbc250d469075a
2012-07-11 16:28:28 -05:00
Bryan Kowal
7fc3ac7397
Merge branch 'merge_development' into development
...
Former-commit-id: 291a674e41226818bda5051a51b79c291a674e41226818bda5051a51b79cb27994c9b1051a51b79cb27994c9b1c8dd1f50e9541b59d060fa5eb7a16aa922be1a5de4a1ecfc18
2012-07-10 17:03:21 -05:00
Bryan Kowal
c152d7678f
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: 2acacb211ac629f18f2499d22f395a2acacb211ac629f18f2499d22f395af92eb59a7399d22f395af92eb59a7376ee9afb3f8d64fdba2c580172b47c212afcceea5b4c392e7f
2012-07-10 16:57:16 -05:00
Steve Harris
461e720c3e
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: a456af38fa8fff0d7e53479ccdbed2a456af38fa8fff0d7e53479ccdbed29454393d13479ccdbed29454393d131e747f0a4245ac1d4d51330b9c317419475ea67b1d367f861a
2012-07-10 09:29:33 -05:00
Steve Harris
c74431ba29
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b7c064b68682c0ff851ca32fdf6ed3b7c064b68682c0ff851ca27afa603452c0ff851ca27afa60345e528bb0df2dc50bc84434f7bb90bb0d5fa61041b37f2b6e138
2012-07-10 07:53:49 -05:00
Bryan Kowal
e05b247e3b
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: 455d7b90a9b1b294c401a33740e915455d7b90a9b1b294c401a33740e915b87b66abc5a33740e915b87b66abc5dfd75b4c72b4917e67089a7d0492fe611925412d2e5a850d28
2012-06-27 17:21:48 -05:00
Bryan Kowal
f21e18aaa1
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: 687c8e9968072c88b3824a17650914687c8e9968072c88b3824a1765091453e5b7c4914a1765091453e5b7c49184d74546426d2ca51c5262c7de6d3b718062f386ee40decf54
2012-06-27 15:04:34 -05:00
Steve Harris
8080ea523b
12.6.1-10 baseline
...
Former-commit-id: a9742f306eedac4d827c8dc4a774e2a9742f306eedac4d827c8dc4a774e23cd0902b498dc4a774e23cd0902b497550311ef6efe25edfadeacd5aeb7fdf59dc7c4456f8cf00a8
2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae
Revert "12.6.1-10 baseline"
...
This reverts commit 8d09188a8895e7f4fc0caecc6a8474530dfc0563f8497470fcb33c5bdfcfa2c0893d1a16fd236f2d06f1c7b73cddde63eee016fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0584f7eddf862cf6a9f92b4b1f6975f584f7eddf862cf6a9f92b4b1f6975f25198a5cd6b4b1f6975f25198a5cd6944e3148d4333fd9c64e8367fb50f575f77df418e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d06f1c7b73cddde63eee016fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0a2c0893d1a530dfc0563f8497470fcb33c5bdfcfaecc6a847495e7f4fc0c
2012-06-21 08:38:48 -05:00
Bryan Kowal
eecb7d3b2f
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
...
Former-commit-id: 80adc8bbfd11a1c4f35f973ceff9a780adc8bbfd11a1c4f35f973ceff9a7f79134499e973ceff9a7f79134499e4e53eadca4872a3a5f601acbc16759720c2063f066028f4fe2
2012-06-20 11:22:58 -05:00
Bryan Kowal
07ac1a35a1
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
...
Former-commit-id: d25012ee75cb16805e7e95a5887b06d25012ee75cb16805e7e95a5887b0625e20ad89c95a5887b0625e20ad89c181cd0b0245db24885bafd8be91fedf390151c0b96e82f60e5
2012-06-19 13:15:53 -05:00
Bryan Kowal
91df3acbcb
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
...
Former-commit-id: 11a4550eb324627d52f21c8b75206311a4550eb324627d52f21c8b75206314c912f2151c8b75206314c912f2153d127ee45f4a631c01eec1b57d1de1b730eced0219f8cca72c
2012-06-14 12:43:34 -05:00
Bryan Kowal
3d94c3e332
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
...
Former-commit-id: 175cbf318d5e80c45a03dcc5675564175cbf318d5e80c45a03dcc5675564c0aaac4a07dcc5675564c0aaac4a0781fa46c01aa9c2cf4faec608fc959c720a152a45eca1d3d525
2012-06-14 11:35:15 -05:00
Steve Harris
883d66bc46
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa9809f73b0601c99afab05f1ad64ffa9809f73b0601c99afab05f8947efbc7fc99afab05f8947efbc7fd5c94ccef2b69fa75919a945ed8e6d91e65230ad3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
581546a5eb
12.6.1-3 baseline
...
Former-commit-id: bc96eba8207c5306b79542f3513175bc96eba8207c5306b79542f3513175d57eb02b9e42f3513175d57eb02b9e471fa3ac0432c0464d791fdc0aa237ca8baf18a3518fa79f7f
2012-06-11 16:23:47 -05:00
Steve Harris
61e2068af7
12.5.1-15 baseline
...
Former-commit-id: 244755b3930ca936807ed5c238de07244755b3930ca936807ed5c238de07cee20d8656d5c238de07cee20d8656cd017cbb2131d76499397da9afe36aad91dc8a2eca0f3f5814
2012-06-11 16:02:30 -05:00
Steve Harris
b54ad5af66
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dcc7024992a337793c86b1975053c3dcc7024992a337793c86b1d325d496f537793c86b1d325d496f55e0e2d2c4823c34c469acf3c7682133dd5b84aa2c01b096242
2012-06-11 15:24:03 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e002f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf51f521a70b397c4db937e676ea3192f9054c5ab6c39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
17403e71d1
12.5.1-9 baseline
...
Former-commit-id: 45773fbee0b8de76b45e8f3c9ebfb745773fbee0b8de76b45e8f3c9ebfb71f542697cb8f3c9ebfb71f542697cbdbedcc229cd23b0e4d60ce0422a34a399c00d295ee7b53c7c4
2012-05-21 17:48:55 -05:00
Steve Harris
e460104ec9
12.5.1-6 baseline
...
Former-commit-id: ba6d779949df80148db624474489f9ba6d779949df80148db624474489f9fa87dc6cf124474489f9fa87dc6cf1bc695ee0254792884ab2c452cce6332738af201926ed02c3dc
2012-05-16 16:41:22 -05:00
Richard Peter
b58b1e4d17
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7a5aea8ee47b14c9499ae431671ff27a5aea8ee47b14c9499ae431671ff2150d16b24ee431671ff2150d16b24e7a54b09c59fe6dc2652c33c7d4cb8774059dfbe2b6c398257d
2012-05-11 10:06:04 -05:00
Steve Harris
2f6ae50479
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990d7f7c26582092efd6072fc70139990d7f7c26582092efd607231b3e87ffa092efd607231b3e87ffafe7ac9662553d282232998447412f87ee04eb560d040b14742
2012-05-09 13:19:47 -05:00
Steve Harris
6715112613
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84ac708c050d84d191e7b6c1bc408f84ac708c050d84d191e7b6b36c69cc6784d191e7b6b36c69cc678025cc609ef6300cd995a821111fbf377ae76413ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb4bfbdad17d9f8cb727a57fa9dbd5fb4bfbdad17d9f8cb727a58485b90ff89f8cb727a58485b90ff840aa780b3d33a67cdd82a28d70b5c5e5543a0e860c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
ad3bb08978
12.4.1-10 baseline
...
Former-commit-id: 931087306f418489e726704b75e1a1931087306f418489e726704b75e1a101457fbbde704b75e1a101457fbbdecaab7c1fbb97caaa0327aabc3842ac3ed3a665cbf1eb6efb23
2012-04-24 15:38:29 -05:00
Steve Harris
8d58af7bb2
12.4.1-7 baseline
...
Former-commit-id: 98c92073b56d585942fe90ae4bbb3698c92073b56d585942fe90ae4bbb36cca73b3c6290ae4bbb36cca73b3c6255b2a4df324c88c0ae6cd9f966008c5a3a53936f989dd653f2
2012-04-24 15:24:39 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683004767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333c98d8b3f188a2a6a18faea4e519f3cd8cd5974f4c74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
80108c0af9
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bdc90ce9d54eed26e06df26a1f2160bdc90ce9d54eed26e06df2fee53dea94ed26e06df2fee53dea94a4eb467a3451bb9ebb46dcdd7f064858cb18d860f51d290333
2012-04-10 12:50:03 -05:00
Bryan Kowal
d484d46519
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
...
Former-commit-id: 476ad5de1ff49aadd9c81afa927c33476ad5de1ff49aadd9c81afa927c33839d7c886f1afa927c33839d7c886f438e88cc58ab70749ea424148c19a9adaa011b1f6f9a0e45cb
2012-04-09 09:32:45 -05:00
Bryan Kowal
ad3d889f82
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
...
Former-commit-id: 5f9463bc573e039dc79fe792b2a16f5f9463bc573e039dc79fe792b2a16f2ed20e107de792b2a16f2ed20e107df24e7a4d31edb7431d0a5f4d6f600a3db4653b1efaefa46212
2012-04-04 18:29:13 -05:00
Steve Harris
9340618732
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd911e448aa398bc60b1e32ce3b74c6052e0f4b241b293563cfe7
2012-03-30 08:38:33 -05:00
Steve Harris
7780277dc6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 770ccb152094e6323c0a132d68acc6770ccb152094e6323c0a132d68acc654a1d9cdbc132d68acc654a1d9cdbc1bc33e26e62c3f9271bf4b853c56c62f6a9ef2ac0a5780c005
2012-03-29 10:01:55 -05:00
Bryan Kowal
e131dbea86
Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
...
Former-commit-id: 08451e8a63eab9c845bb58bfa6298108451e8a63eab9c845bb58bfa6298166e05f4c9658bfa6298166e05f4c96474e2fae6d64a7f1db843b9738335468517755486b35ea48d0
2012-03-12 11:43:34 -05:00
Bryan Kowal
03d302a83d
Issue #20 - additional new svn changes that have not been merged yet:
...
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1
Former-commit-id: 3bd189df23ed81095573bea56356fd3bd189df23ed81095573bea56356fd00759729a4bea56356fd00759729a4b0fc22d8ca0b690e438c1fda54a89b94beefffcd2fad8b9298
2012-03-05 14:36:56 -06:00
Steve Harris
85d3d96d4c
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d0178411524059a5b4e9b67525e956d0178411524059a5b4e9b67525e95e5b56c99ab9b67525e95e5b56c99ab2dbdc945bf73a337bc3140d735716521f12bae82f8ae79c35c
2012-02-27 15:58:49 -06:00
Steve Harris
43ff909553
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: 5a96582f1692084b3f20d0bbbfefcc5a96582f1692084b3f20d0bbbfefcc7a10ca9766d0bbbfefcc7a10ca97662d02f819be92b7072b823d511fe719ae9c52b0123aef320ffd
2012-02-23 10:06:18 -06:00
Steve Harris
3a4af24369
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e98da36046dec8aae98741829d2791e98da36046dec8aae9874154be9660f1c8aae9874154be9660f113a3edd4f6b55a488ed84450cf896315c56d11bc978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a811ac888f85075e610794c2ea985ba811ac888f85075e610794c2ea985b9995d22e2594c2ea985b9995d22e25139d42c594610fdf3f4eaaead73ec5156ad8471d01d72ca3c9
2012-02-22 10:12:49 -06:00
Steve Harris
90432da18a
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 121ec88a98ec0f1aebfcb89ebc5e01121ec88a98ec0f1aebfcb89ebc5e01496cc6a06bb89ebc5e01496cc6a06b3371e158a6dd3a5a8d884a9329887737e57b65887ca623525e
2012-02-20 16:38:06 -06:00
Steve Harris
33aafe9ce0
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: d129eab241c268da57bc4b76d22f77d129eab241c268da57bc4b76d22f77cc66c8be244b76d22f77cc66c8be24c9a7ff42f4dd911bed4d54b5b6baef09b81c6e0060bf5aeced
2012-02-20 12:43:38 -06:00
Bryan Kowal
3476936eac
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: eda0f92b175754f9dfd810a0ca252deda0f92b175754f9dfd810a0ca252d682c10767d10a0ca252d682c10767de326a29d2fcc8c6597a22ba23624b48403801a2bce9165ce58
2012-02-17 12:17:14 -06:00
Steve Harris
6618009c1d
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: c4ced8af2d6aed9311a87356d655dac4ced8af2d6aed9311a87356d655da1707b987217356d655da1707b9872189aae82ed1de85613a99db1e3b1215a1462275f7604b6c1f10
2012-02-15 14:34:47 -06:00
