16 commits

Author	SHA1	Message	Date
Dustin Johnson	e7a0f96a9a	Issue #1302 Merge branch '5-Data_Delivery' into development ... Conflicts: edexOsgi/build.edex/deploy-common/external-rules.xml edexOsgi/build.edex/deploy-common/plugin-methods.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0 Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]] Former-commit-id: 31d7d09c10 Former-commit-id: bcf575966b	2012-11-01 13:36:06 -05:00
Richard Peter	46870808e0	Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. ... Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f Former-commit-id: 12bcfbda80 [formerly ca0c9b7502] [formerly bcb0560291 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]] Former-commit-id: bcb0560291 Former-commit-id: ce85c8e1a6	2012-10-15 09:52:14 -05:00
James Korman	ea24ef83b8	Issue #798 - Correct for hdfFileId ... Former-commit-id: 6d250cf9f3 [formerly 56d6b1e886] [formerly c2c228b429 [formerly 3dd604623685cd5aba9e0a28001004cecef8d29a]] Former-commit-id: c2c228b429 Former-commit-id: 654ecefd3e	2012-08-22 13:24:28 -05:00
Nate Jensen	d7841cef54	Issue #765 fix so data can be retrieved with or without hdfFileId ... Former-commit-id: 619b70f7fc [formerly ae384ddf24] [formerly bb1ea105d2 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]] Former-commit-id: bb1ea105d2 Former-commit-id: 244ca1b88b	2012-06-18 17:20:48 -05:00
Steve Harris	53d2822329	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: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]] Former-commit-id: 31b3e87ffa Former-commit-id: 98447412f8	2012-05-09 13:19:47 -05:00
Steve Harris	7c7fc97131	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... used git cherry-pick -m 1 879a2e0 Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Conflicts: ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java Former-commit-id: 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]] Former-commit-id: 7b75b781ad Former-commit-id: 6dd3ee8809	2012-05-01 18:31:09 -05:00
Steve Harris	33a67cdd82	12.4.1-10 baseline ... Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]] Former-commit-id: 8485b90ff8 Former-commit-id: a28d70b5c5	2012-05-01 18:06:13 -05:00
Bryan Kowal	0514785b3a	Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build. ... Former-commit-id: 72068507a9 [formerly b1561d67a0] [formerly b90b6f101e [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]] Former-commit-id: b90b6f101e Former-commit-id: a9b51192d2	2012-04-19 13:09:58 -05:00
Steve Harris	e86dc647be	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Former-commit-id: 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]] Former-commit-id: 625cd4262c Former-commit-id: def458753d	2012-04-19 11:11:02 -05:00
Steve Harris	a2a6a18fae	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Steve Harris	51bb9ebb46	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: c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: fee53dea94 Former-commit-id: dcdd7f0648	2012-04-10 12:50:03 -05:00
Bryan Kowal	0b690e438c	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: ed81095573 [formerly bea56356fd] [formerly 00759729a4 [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]] Former-commit-id: 00759729a4 Former-commit-id: 1fda54a89b	2012-03-05 14:36:56 -06:00
Max Schenkelberg	0554abdde0	Issue #358 Committing NPP core rendering improvements merged with Thin ... Client core improvements Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]] Former-commit-id: 48b6d45f00 Former-commit-id: 3212cc6ebb	2012-03-01 16:59:40 -06:00
David Gillingham	ea7a55ad8d	Issue #20: Merge all changes from previous SVN repo to GIT. ... Former-commit-id: b31f40ec9d [formerly 845e6c19af] [formerly b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]] Former-commit-id: b056e18757 Former-commit-id: 87b15de88b	2012-01-26 17:38:43 -06:00
Matt Nash	82300ccdcf	Moving 12.1.1 into ss_sync ... Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484	2012-01-19 11:53:12 -06:00
root	8e80217e59	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f	2012-01-06 08:55:05 -06:00