Commit graph

581 commits

Author SHA1 Message Date
Max Schenkelberg
ae13ee6fa9 Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: c3daf20fdf [formerly 2d36eb040d] [formerly c3daf20fdf [formerly 2d36eb040d] [formerly d89b58f7fd [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]]
Former-commit-id: d89b58f7fd
Former-commit-id: 81ce682e0b [formerly 9f34d7a5f3]
Former-commit-id: 7d99688c6a
2012-08-01 11:36:44 -05:00
Max Schenkelberg
da993aeada 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: 079a11565a [formerly f635e9c332] [formerly 079a11565a [formerly f635e9c332] [formerly cc0a1fbca3 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 7ee188d90a [formerly 74f0179b92]
Former-commit-id: 40e6cd390e
2012-08-01 10:51:32 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
James Korman
3b97258e6a Issue #798 - Code review changes
Former-commit-id: f7a864a2c0 [formerly 14e68406b4] [formerly f7a864a2c0 [formerly 14e68406b4] [formerly 39a32d7c91 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]]
Former-commit-id: 39a32d7c91
Former-commit-id: 540435baa6 [formerly 15af4ada93]
Former-commit-id: f50359ba1d
2012-07-31 14:34:27 -05:00
James Korman
c901590446 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 1166a7cbb1 [formerly 38a2e426d9] [formerly 1166a7cbb1 [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc [formerly 5df52e38f9]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Richard Peter
69b15da61d Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 4f64038c78 [formerly 97a1d083cd] [formerly 4f64038c78 [formerly 97a1d083cd] [formerly 8631b64e75 [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]]
Former-commit-id: 8631b64e75
Former-commit-id: 96e3782774 [formerly c379c2f884]
Former-commit-id: 347398d655
2012-07-31 09:16:23 -05:00
Nate Jensen
e1321b8bc9 Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

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

Former-commit-id: e9f24e8660 [formerly 7c6686f2f4] [formerly e9f24e8660 [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 4efd9149f7 [formerly 6a3e6f599f]
Former-commit-id: e328b61d87
2012-07-31 08:36:27 -05:00
Bryan Kowal
93967d22c2 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: 67035fa0b8 [formerly 327ffa9439] [formerly 67035fa0b8 [formerly 327ffa9439] [formerly cd40d9accf [formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: 6ac43a3c0c [formerly 107831f23d]
Former-commit-id: e0c0b5928f
2012-07-28 08:52:36 -05:00
Richard Peter
82db8b29eb 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: 1de59b48cf [formerly 9e3cd2546a] [formerly 1de59b48cf [formerly 9e3cd2546a] [formerly 77c2ab2c05 [formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]]
Former-commit-id: 77c2ab2c05
Former-commit-id: b6a1b5011f [formerly d131cd42cf]
Former-commit-id: c8ce12f7ac
2012-07-27 14:50:00 -05:00
Steve Harris
05082b1d3a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 302aa05586 [formerly de9034c96c] [formerly 302aa05586 [formerly de9034c96c] [formerly 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: f2ab9cfe1a [formerly b82d6772c3]
Former-commit-id: acfc6eff55
2012-07-27 14:50:45 -05:00
Steve Harris
84d0f1fbb6 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: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
2012-07-27 14:44:44 -05:00
Max Schenkelberg
9a1cd3b5e1 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: 7ace2035c5 [formerly 756988cb8b] [formerly 7ace2035c5 [formerly 756988cb8b] [formerly b669f57ee4 [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]]
Former-commit-id: b669f57ee4
Former-commit-id: 864d6335a6 [formerly 51f9666fcb]
Former-commit-id: e45c7f58ac
2012-07-27 14:42:36 -05:00
Nate Jensen
c2558bdb79 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf] [formerly ac8d12ce13 [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d]
Former-commit-id: 70d269fc34
2012-07-26 17:43:29 -05:00
Ron Anderson
fceddcbedc Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 21431b2693 [formerly 1f2e581534] [formerly 21431b2693 [formerly 1f2e581534] [formerly b52f1400ef [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]
Former-commit-id: b52f1400ef
Former-commit-id: e184dceb91 [formerly bc034e1863]
Former-commit-id: bc519a7ce2
2012-07-23 16:49:21 -05:00
Steve Harris
36e2ad3023 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Max Schenkelberg
41d82a3e53 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: 0cfd8834c2 [formerly c8909c0fbc] [formerly 0cfd8834c2 [formerly c8909c0fbc] [formerly d8971a72fd [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]]
Former-commit-id: d8971a72fd
Former-commit-id: 5d8515fb58 [formerly bc0ec0455d]
Former-commit-id: c419654b74
2012-07-19 11:45:01 -05:00
Max Schenkelberg
eb5d50a7d2 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: 39e199147e [formerly a9360b7078] [formerly 39e199147e [formerly a9360b7078] [formerly dcdffe345d [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]]]
Former-commit-id: dcdffe345d
Former-commit-id: 04e75db5af [formerly cd9e7563de]
Former-commit-id: c90c274e57
2012-07-16 10:00:28 -05:00
Richard Peter
1291dc66c7 Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: a06dde8a30 [formerly 19203d87f3] [formerly a06dde8a30 [formerly 19203d87f3] [formerly ee6738152d [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]]]
Former-commit-id: ee6738152d
Former-commit-id: 5a038a3d6d [formerly 3c1f3d3d0a]
Former-commit-id: 344386e039
2012-07-13 09:18:46 -05:00
Bryan Kowal
fee2a4e419 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: b446253674 [formerly db6b535eb6] [formerly b446253674 [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: 34a4f58074 [formerly 46198b0c92]
Former-commit-id: de1d59a174
2012-07-12 12:58:40 -05:00
Bryan Kowal
095a4ebfa2 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: 7f6015eba5 [formerly 0f31fadffa] [formerly 7f6015eba5 [formerly 0f31fadffa] [formerly bde6be6e2b [formerly ea1b0920d908481e28477329497204dda324bd3e]]]
Former-commit-id: bde6be6e2b
Former-commit-id: 6d961d22fb [formerly 00c9a0f708]
Former-commit-id: 5b87488b52
2012-07-11 17:31:55 -05:00
Bryan Kowal
50d469075a Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 6fe6e64f38 [formerly 5058c32c34] [formerly 6fe6e64f38 [formerly 5058c32c34] [formerly 31f2db8719 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 43f3d40a8e [formerly 5619099acd]
Former-commit-id: 8378fadbc2
2012-07-11 16:28:28 -05:00
Bryan Kowal
7077599e8d 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: 8fef600e84 [formerly ab2c53ae0a] [formerly 8fef600e84 [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]
Former-commit-id: 3b7c761f99
Former-commit-id: 470511d9a3 [formerly 424bbaf0f7]
Former-commit-id: f64ce786e2
2012-07-11 12:44:32 -05:00
Bryan Kowal
e4a1ecfc18 Merge branch 'merge_development' into development
Former-commit-id: 226818bda5 [formerly 051a51b79c] [formerly 226818bda5 [formerly 051a51b79c] [formerly b27994c9b1 [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]
Former-commit-id: b27994c9b1
Former-commit-id: 541b59d060 [formerly fa5eb7a16a]
Former-commit-id: a922be1a5d
2012-07-10 17:03:21 -05:00
Bryan Kowal
5b4c392e7f Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]
Former-commit-id: f92eb59a73
Former-commit-id: 8d64fdba2c [formerly 580172b47c]
Former-commit-id: 212afcceea
2012-07-10 16:57:16 -05:00
Greg Armendariz
33cc7068ea Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: e119a69089 [formerly 84e8babca1] [formerly e119a69089 [formerly 84e8babca1] [formerly 2fcdef36f3 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]]]
Former-commit-id: 2fcdef36f3
Former-commit-id: 6520670080 [formerly 481b13193d]
Former-commit-id: 838093ef7c
2012-07-10 10:15:33 -05:00
Steve Harris
1d367f861a 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: 8fff0d7e53 [formerly 479ccdbed2] [formerly 8fff0d7e53 [formerly 479ccdbed2] [formerly 9454393d13 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]
Former-commit-id: 9454393d13
Former-commit-id: 45ac1d4d51 [formerly 330b9c3174]
Former-commit-id: 19475ea67b
2012-07-10 09:29:33 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
James Korman
409c53d3f8 Issue #798 - Modified Satellite component to persist GOESR data
Former-commit-id: cbfb024ac1 [formerly fde4a09b69] [formerly cbfb024ac1 [formerly fde4a09b69] [formerly 917202386b [formerly 3210c78cbc0c3af3e576c99644231416020d2838]]]
Former-commit-id: 917202386b
Former-commit-id: 93311d9cb2 [formerly 2250d7a654]
Former-commit-id: 4444f4b5cd
2012-07-09 10:08:11 -05:00
Max Schenkelberg
2e7eead97d 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: 5d4d4d9c22 [formerly a0d645fedf] [formerly 5d4d4d9c22 [formerly a0d645fedf] [formerly cbd753c86d [formerly f28d4ba149fe16471a4e10e50f15b684c0d82b9c]]]
Former-commit-id: cbd753c86d
Former-commit-id: 6dcfa3fbf8 [formerly 19b6eccbd2]
Former-commit-id: 0329f5fba7
2012-07-06 16:04:12 -05:00
Max Schenkelberg
3325ed5deb 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: 7d13c7d339 [formerly 9bbb68a547] [formerly 7d13c7d339 [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962]
Former-commit-id: d876190d68
2012-07-06 16:01:47 -05:00
Ron Anderson
4b106a3f0f Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7

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

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

Former-commit-id: e58404bcb5 [formerly bcedcc51fa] [formerly e58404bcb5 [formerly bcedcc51fa] [formerly 7046ba996a [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]
Former-commit-id: 7046ba996a
Former-commit-id: 95bbc6a2d4 [formerly 63c5c4dc33]
Former-commit-id: c558b07925
2012-06-29 13:19:47 -05:00
David Gillingham
19b62a3711 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: aa0ba41cf9 [formerly 3fffc47ba5] [formerly aa0ba41cf9 [formerly 3fffc47ba5] [formerly abdcc32b2c [formerly 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0]]]
Former-commit-id: abdcc32b2c
Former-commit-id: 32d5f7d347 [formerly ee57b63a0c]
Former-commit-id: 4b2e1f9f23
2012-06-29 13:01:42 -05:00
David Gillingham
2185e59ded 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: fceb86f7be [formerly 151515b52d] [formerly fceb86f7be [formerly 151515b52d] [formerly 1df1bbbf9e [formerly 151a2069e3bf46f08bc636cf1bd4974b07e65da3]]]
Former-commit-id: 1df1bbbf9e
Former-commit-id: 54fa9ad78e [formerly 617400bc30]
Former-commit-id: 522b0037bb
2012-06-29 10:25:09 -05:00
Max Schenkelberg
e1d946912c 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: e1d23a56a9 [formerly 62bd4a667a] [formerly e1d23a56a9 [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 544ffdc4ca [formerly 9328717a1a]
Former-commit-id: 57cc1a4830
2012-06-28 15:29:05 -05:00
Ben Steffensmeier
fbc750bd7e Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: b7326d0979 [formerly 79ba6c2cd5] [formerly b7326d0979 [formerly 79ba6c2cd5] [formerly 6f2e2b2cea [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: 7238645490 [formerly 1513500d7b]
Former-commit-id: 571fdce958
2012-06-28 14:07:48 -05:00
Bryan Kowal
8da12f2c0d Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 873ee341f5 [formerly 4acb1d8693] [formerly 873ee341f5 [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: 3010c15a2a [formerly 7d807fad71]
Former-commit-id: f3409d507f
2012-06-27 18:38:19 -05:00
Bryan Kowal
2e5a850d28 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: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
2012-06-27 17:21:48 -05:00
Bryan Kowal
ee40decf54 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: 072c88b382 [formerly 4a17650914] [formerly 072c88b382 [formerly 4a17650914] [formerly 53e5b7c491 [formerly 9597fdac96022c94dad425367de23eafedad06bc]]]
Former-commit-id: 53e5b7c491
Former-commit-id: 6d2ca51c52 [formerly 62c7de6d3b]
Former-commit-id: 718062f386
2012-06-27 15:04:34 -05:00
David Gillingham
7e2c170fe8 Issue #810: turn off Wes2Bridge archiver by default
Change-Id: I1974b81e73b2daab48947d2a44dc9072aba459af

Former-commit-id: 89f47d55a4 [formerly 1ddd687bc8] [formerly 89f47d55a4 [formerly 1ddd687bc8] [formerly 12b2403627 [formerly ff97ae48126d906463a4a1063782fa3f154fdeeb]]]
Former-commit-id: 12b2403627
Former-commit-id: 1aff13b76f [formerly 131472c289]
Former-commit-id: e6e6a0fe7d
2012-06-26 17:58:21 -05:00
David Gillingham
201e83898a Issue #766: Merge VCModule refactor and Python globals memory leak fix to common baseline.
Former-commit-id: 768afb8423 [formerly 2a0ffc5311] [formerly 768afb8423 [formerly 2a0ffc5311] [formerly 672d7a2c31 [formerly 48c3d7d8c7cec6c7366705c9318ce35a46bd8b3d]]]
Former-commit-id: 672d7a2c31
Former-commit-id: ca54365f87 [formerly 235cf57de8]
Former-commit-id: b2629a6f41
2012-06-26 17:49:06 -05:00
Bryan Kowal
bc580915da Issue #704 - update build.properties files for python.
Former-commit-id: 70b71ec2e3 [formerly dda06c5d8e] [formerly 70b71ec2e3 [formerly dda06c5d8e] [formerly b1a1448256 [formerly 88840dea400d8df50e273365d81b5180ab06fb11]]]
Former-commit-id: b1a1448256
Former-commit-id: a122cd2458 [formerly ef557a1fdb]
Former-commit-id: 6fd5f9303d
2012-06-26 10:26:29 -05:00
Nate Jensen
471beb4a1c Merge "Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic." into development
Former-commit-id: 41e3543148 [formerly 0f77b9cfbc] [formerly 41e3543148 [formerly 0f77b9cfbc] [formerly 61b0394381 [formerly 2eab85ae7e6ad05e549b173fd026f22b61e8e8a7]]]
Former-commit-id: 61b0394381
Former-commit-id: c1a216d2f7 [formerly 1899a9ccc3]
Former-commit-id: 29cb073d94
2012-06-26 10:24:17 -05:00
Bryan Kowal
4866bef00f Issue #800 - fix build.properties.
Former-commit-id: 089710a432 [formerly 0ec62da46e] [formerly 089710a432 [formerly 0ec62da46e] [formerly 670c7cabb4 [formerly 914838d805b01754cf5947eaa7196b148d2738b5]]]
Former-commit-id: 670c7cabb4
Former-commit-id: c35a341f45 [formerly 7ce152ebd8]
Former-commit-id: 629517e358
2012-06-26 09:42:20 -05:00
Bryan Kowal
a60cda2d2e Issue #704 - fix build.properties files.
Former-commit-id: 73d4ec0bfb [formerly cc1ac5fd2f] [formerly 73d4ec0bfb [formerly cc1ac5fd2f] [formerly 1e5c9ef92d [formerly 7130431b6e279db1c5ed550e0ce42c5fdf4238f1]]]
Former-commit-id: 1e5c9ef92d
Former-commit-id: a1c4fe961a [formerly b84a44c26b]
Former-commit-id: 76e92da8cc
2012-06-25 16:50:11 -05:00
Ben Steffensmeier
153a1d7c5e Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
Former-commit-id: 0855e117cb [formerly 682edec2cf] [formerly 0855e117cb [formerly 682edec2cf] [formerly 603d48a017 [formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]]
Former-commit-id: 603d48a017
Former-commit-id: 745b2cd722 [formerly 7ea36122f2]
Former-commit-id: b2ce12e3a7
2012-06-25 15:22:35 -05:00
Max Schenkelberg
32e64182c8 Issue #665 fixed TransformFactory when getting worldToGrid to return crsToGrid
Amend: Updated comment for new return

Change-Id: I95151c5233898d156398760d3360de8c80b28001

Former-commit-id: f3caa3f442 [formerly 930d4569a5] [formerly f3caa3f442 [formerly 930d4569a5] [formerly d7b326cfa6 [formerly 42fc0cbd10401a6099e571467ff112f544e525e7]]]
Former-commit-id: d7b326cfa6
Former-commit-id: 740b1c3981 [formerly 4d79823f33]
Former-commit-id: 036b0aa9d4
2012-06-21 17:54:32 -05:00