7 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
Bryan Kowal	5db24885ba	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: cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]] Former-commit-id: 25e20ad89c Former-commit-id: fd8be91fed	2012-06-19 13:15:53 -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	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
Bryan Kowal	edb7431d0a	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: 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]] Former-commit-id: 2ed20e107d Former-commit-id: 5f4d6f600a	2012-04-04 18:29:13 -05: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