7 commits

Author	SHA1	Message	Date
Max Schenkelberg	ca4177dd08	Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. ... Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345 Former-commit-id: a9c7374d162296c170f7c1b80e1fb2978b854cfd	2012-11-07 10:44:42 -06:00
Bryan Kowal	25e20ad89c	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: 1afabfa6e3621f0cfda1084e95c0e5a91a313812	2012-06-19 13:15:53 -05:00
Steve Harris	31b3e87ffa	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: f98354aae305ad227eaf3b36e4393b8aefc80f02	2012-05-09 13:19:47 -05:00
Steve Harris	2a216f333c	12.4.1-4 baseline ... Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7	2012-04-18 15:18:16 -05:00
David Gillingham	b056e18757	Issue #20: Merge all changes from previous SVN repo to GIT. ... Former-commit-id: 926a2a6a5af5b3514c29097deb0fc24b093643a2	2012-01-26 17:38:43 -06:00
Matt Nash	c83e5ff474	Moving 12.1.1 into ss_sync ... Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11	2012-01-19 11:53:12 -06:00
root	06a8b51d6d	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f	2012-01-06 08:55:05 -06:00