awips2/cots
Dustin Johnson 4567f3d8d7 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: f8c30d1b62 [formerly af4da9286b] [formerly dbeffa91fe] [formerly dbeffa91fe [formerly 375f0801a2]] [formerly f8c30d1b62 [formerly af4da9286b] [formerly dbeffa91fe] [formerly dbeffa91fe [formerly 375f0801a2]] [formerly 3c41127c42 [formerly dbeffa91fe [formerly 375f0801a2] [formerly 3c41127c42 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]]]
Former-commit-id: 3c41127c42
Former-commit-id: 8afaf86c82 [formerly 94002b3be9] [formerly 9a4f4431de] [formerly 76403670865d832b5b359126bf095f231d729080 [formerly 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70] [formerly 9a4f4431de [formerly 0dc74710ce]]]
Former-commit-id: c66786ac3f49ea4132a402058a5382834f94a0d7 [formerly 3bc02ea1c6075b3b5e6394a15bdba67e6052ad17] [formerly ce87841d63 [formerly 32da016541]]
Former-commit-id: ce87841d63
Former-commit-id: 7dbb9acf53
2013-04-04 13:10:24 -05:00
..
com.facebook.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.google.guava 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
com.mchange 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.opensymphony.ognl 12.11.1-1 baseline 2012-09-27 15:57:45 -05:00
com.sun.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jndi.nis 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.xml.bind 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
de.micromata.opengis.kml 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
edu.oswego 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.uci.ics.crawler4j 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
it.geosolutions 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
javax.activation 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.jms 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.mail 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.measure 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.linux32 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.linux64 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.win32 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.persistence 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.vecmath 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.dods 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
net.sf.cglib 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
net.sf.ehcache 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.swtaddons 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.activemq 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
org.apache.batik 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.camel 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.beanutils 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cli 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.codec 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.collections 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.configuration 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cxf 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.apache.commons.digester 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.lang 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.logging 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.management 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.pool 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.validator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.http 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
org.apache.log4j 12.11.1-1 baseline 2012-09-27 15:57:45 -05:00
org.apache.mina 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client 2013-04-04 13:03:41 -05:00
org.apache.tomcat.nativ 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
org.apache.velocity 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.apache.ws.security 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.codehaus.jackson 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.dom4j 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.eclipse.jetty 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
org.geotools 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
org.hibernate 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
org.itadaki.bzip2 13.3.1-14 baseline 2013-03-27 17:59:34 -05:00
org.jep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jep.linux32 13.3.1-17 baseline 2013-04-01 12:04:56 -05:00
org.jep.linux64 13.3.1-17 baseline 2013-04-01 12:04:56 -05:00
org.jep.win32 13.3.1-17 baseline 2013-04-01 12:04:56 -05:00
org.jivesoftware.openfire 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
org.junit 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
org.objectweb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.postgres Issue #1663 - PostgreSQL Upgrade 2013-04-04 12:56:58 -05:00
org.slf4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
ucar.nc2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
uk.ltd.getahead 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00