Commit graph

1140 commits

Author SHA1 Message Date
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
Max Schenkelberg
2e7d66b85a Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: 0031d21292 [formerly 36bf80d13e [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]
Former-commit-id: 36bf80d13e
Former-commit-id: ae3b62ca12
2012-08-06 09:44:44 -05:00
Steve Harris
7b6c223552 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]
Former-commit-id: f0b7d5e4c5
Former-commit-id: 9e2d161f8d
2012-08-06 09:38:26 -05:00
Steve Harris
79d4d91e46 12.8.1-10 baseline
Former-commit-id: ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: b5e8fee24d
Former-commit-id: 6244359a80
2012-08-06 09:34:26 -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
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 #797 - 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
James Korman
6f631b4aca Issue #798 - Updates to satellite
Former-commit-id: 2ddb2f6df0 [formerly 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]
Former-commit-id: 7928d912e1
Former-commit-id: fd1156d67d
2012-08-01 16:31:59 -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
Max Schenkelberg
2761a47a37 Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: d89b58f7fd [formerly 2d36eb040d [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]
Former-commit-id: 2d36eb040d
Former-commit-id: c3daf20fdf
2012-08-01 11:36:44 -05:00
Max Schenkelberg
01b0313c03 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: cc0a1fbca3 [formerly f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]
Former-commit-id: f635e9c332
Former-commit-id: 079a11565a
2012-08-01 10:51:32 -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
e24766ac3d Issue #798 - Code review changes
Former-commit-id: 39a32d7c91 [formerly 14e68406b4 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]
Former-commit-id: 14e68406b4
Former-commit-id: f7a864a2c0
2012-07-31 14:34:27 -05:00
James Korman
226ff6ea65 Issue #798 - Code review changes
Issue #798 - 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
Richard Peter
0ee07efae3 Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 8631b64e75 [formerly 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]
Former-commit-id: 97a1d083cd
Former-commit-id: 4f64038c78
2012-07-31 09:16:23 -05:00
Nate Jensen
baff86f951 Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: a65e9608fd
Former-commit-id: 6f90bfa61c
2012-07-31 08:57:54 -05:00
Ron Anderson
c2937d7303 Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: b1650b6143 [formerly 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]
Former-commit-id: 7c6686f2f4
Former-commit-id: e9f24e8660
2012-07-31 08:36:27 -05:00
Bryan Kowal
1208c5cd40 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: 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 #626 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
e6f4b3f257 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 4688ac304f [formerly de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: de9034c96c
Former-commit-id: 302aa05586
2012-07-27 14:50:45 -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 #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: b669f57ee4 [formerly 756988cb8b [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]
Former-commit-id: 756988cb8b
Former-commit-id: 7ace2035c5
2012-07-27 14:42:36 -05:00
Nate Jensen
903803754a Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: dbe185f3a0 [formerly 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]
Former-commit-id: 3d07fc8ebf
Former-commit-id: ac8d12ce13
2012-07-26 17:43:29 -05:00
Ron Anderson
8b897c2bb0 Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: b52f1400ef [formerly 1f2e581534 [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]
Former-commit-id: 1f2e581534
Former-commit-id: 21431b2693
2012-07-23 16:49:21 -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
Max Schenkelberg
9ac745e1f4 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: d8971a72fd [formerly c8909c0fbc [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]
Former-commit-id: c8909c0fbc
Former-commit-id: 0cfd8834c2
2012-07-19 11:45:01 -05:00
Max Schenkelberg
7b5c3c72a7 Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now
Change-Id: I8f87118b3e283acc5c19dc97497730b9cabec0f1

Former-commit-id: dcdffe345d [formerly a9360b7078 [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]]
Former-commit-id: a9360b7078
Former-commit-id: 39e199147e
2012-07-16 10:00:28 -05:00
Richard Peter
452df5af56 Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: ee6738152d [formerly 19203d87f3 [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]]
Former-commit-id: 19203d87f3
Former-commit-id: a06dde8a30
2012-07-13 09:18:46 -05:00
Bryan Kowal
81dd57d347 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: 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 #880 - 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 #876 - 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
ec9551d614 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]
Former-commit-id: ab2c53ae0a
Former-commit-id: 8fef600e84
2012-07-11 12:44:32 -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
Greg Armendariz
57113a9d9d Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: 2fcdef36f3 [formerly 84e8babca1 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]]
Former-commit-id: 84e8babca1
Former-commit-id: e119a69089
2012-07-10 10:15:33 -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
James Korman
a2c0db46fd Issue #798 - Modified Satellite component to persist GOESR data
Former-commit-id: 917202386b [formerly fde4a09b69 [formerly 3210c78cbc0c3af3e576c99644231416020d2838]]
Former-commit-id: fde4a09b69
Former-commit-id: cbfb024ac1
2012-07-09 10:08:11 -05:00
Max Schenkelberg
a9630197ef Issue #626 wrote grid downscaler to help NPP/GOES-R downscale data in a common method. Uses new interpolation/reprojection APIs
Change-Id: I4ab39a6d0bcd1f54337c77b9086f15afdc3e9ea4

Former-commit-id: cbd753c86d [formerly a0d645fedf [formerly f28d4ba149fe16471a4e10e50f15b684c0d82b9c]]
Former-commit-id: a0d645fedf
Former-commit-id: 5d4d4d9c22
2012-07-06 16:04:12 -05:00
Max Schenkelberg
3bff06cf92 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 9bbb68a547
Former-commit-id: 7d13c7d339
2012-07-06 16:01:47 -05:00
Ron Anderson
032e9e2a84 Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7

Former-commit-id: 593a09daee [formerly 1f871be887 [formerly 8e81e22084031ed702ba294ec94a6bd59926d88c]]
Former-commit-id: 1f871be887
Former-commit-id: 51a8028105
2012-07-05 15:50:07 -05:00
Bryan Kowal
8a976cad85 Merge "Issue #716 remove dead plugin from features" into development
Former-commit-id: 5af862f03f [formerly 5211449202 [formerly 479a1c1309a657baa50afaf2e6640e840059a121]]
Former-commit-id: 5211449202
Former-commit-id: d918ed1a48
2012-07-02 09:50:55 -05:00
David Gillingham
286686e574 Issue #827: Add serialization annotation to id field for TAF ChangeGroup and BufrMosDataLocation classes.
Change-Id: I894932f410865b0d019b2a8017cc157055552e0c

Former-commit-id: 691f67747e [formerly 10beeaa160 [formerly cf6fdd9cde2a3a0565c7adef2ab11cecdb324ea9]]
Former-commit-id: 10beeaa160
Former-commit-id: 6d8d87dc9a
2012-06-29 13:30:25 -05:00
Nate Jensen
7e34a3e6ab Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: bcedcc51fa
Former-commit-id: e58404bcb5
2012-06-29 13:19:47 -05:00
David Gillingham
d54d8a51ff Issue #828: Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.

Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581

Former-commit-id: abdcc32b2c [formerly 3fffc47ba5 [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]
Former-commit-id: 3fffc47ba5
Former-commit-id: aa0ba41cf9
2012-06-29 13:01:42 -05:00
David Gillingham
c4a50f8c5c Issue #826: Fix TCG and Warning decoders to properly respect ALLOW_ARCHIVE_DATA env variable, fix broken GFE
VTEC notification route.

Change-Id: I48550b9023cc7f251462f0c6620cff352f4512be

Former-commit-id: 1df1bbbf9e [formerly 151515b52d [formerly 151a2069e3bf46f08bc636cf1bd4974b07e65da3]]
Former-commit-id: 151515b52d
Former-commit-id: fceb86f7be
2012-06-29 10:25:09 -05:00
Max Schenkelberg
f0f4ad8039 Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: a3014f6ec3 [formerly 62bd4a667a [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]
Former-commit-id: 62bd4a667a
Former-commit-id: e1d23a56a9
2012-06-28 15:29:05 -05:00
Ben Steffensmeier
a93f42b3ec Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: 6f2e2b2cea [formerly 79ba6c2cd5 [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]
Former-commit-id: 79ba6c2cd5
Former-commit-id: b7326d0979
2012-06-28 14:07:48 -05:00
Bryan Kowal
4ce58fa303 Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]
Former-commit-id: 4acb1d8693
Former-commit-id: 873ee341f5
2012-06-27 18:38:19 -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