Merge "Issue #2984 remove unnecessary plugins from features remove unnecessary uengine dependencies from manifests" into development

Former-commit-id: 4edf560b06 [formerly faa4e88621db7dd9cbc13048bfdf98cdb3ec26d2]
Former-commit-id: 909c44182b

cave/com.raytheon.uf.viz.dataplugin.obs.feature/feature.xml

@@ -22,13 +22,6 @@
       <import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
    </requires>
 
-   <plugin
-         id="com.raytheon.edex.plugin.obs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.obs"
          download-size="0"

cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

@@ -229,12 +229,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="net.sf.ehcache"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.raytheon.uf.common.message"
          download-size="0"
@@ -353,13 +347,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.hamcrest.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.alertviz"
          download-size="0"

edexOsgi/com.raytheon.edex.plugin.radar/META-INF/MANIFEST.MF

@@ -8,7 +8,6 @@ Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
  org.geotools,
- com.raytheon.edex.uengine,
  com.raytheon.uf.common.dataplugin.level,
  com.raytheon.uf.common.localization,
  com.raytheon.uf.common.serialization.comm,

edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/uengine/tasks/radar/DecodeRadarImage.java

@@ -23,10 +23,8 @@ package com.raytheon.edex.uengine.tasks.radar;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
-import com.raytheon.edex.uengine.tasks.ScriptTask;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
-import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants;
 import com.raytheon.uf.common.dataplugin.radar.util.RadarTiler;
 import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
 import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@@ -44,12 +42,15 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Date             PR#             Engineer            Description
  * -----------      ----------      ------------        --------------------------
  * Apr 12, 2007                     njensen             Initial Creation
+ * Apr 14, 2014           2984      njensen             Deprecated and remove uengine dependency
  * </PRE>
  * 
  */
-public class DecodeRadarImage extends ScriptTask {
+@Deprecated
+public class DecodeRadarImage {
 
-    private static final IUFStatusHandler handler = UFStatus.getHandler(DecodeRadarImage.class);
+    private static final IUFStatusHandler handler = UFStatus
+            .getHandler(DecodeRadarImage.class);
 
     private RadarRecord radarRecord;
 
@@ -75,12 +76,6 @@ public class DecodeRadarImage extends ScriptTask {
         geometry = radarTiler.constructGridGeometry();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.edex.uengine.js.tasks.ScriptTask#execute()
-     */
-    @Override
     public byte[] execute() {
         byte[] bi = null;
 

edexOsgi/com.raytheon.uf.edex.plugin.qc/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17",
  javax.persistence;bundle-version="1.0.0",
  ucar.nc2;bundle-version="1.0.0"
 Export-Package: com.raytheon.uf.edex.plugin.qc.common
-Import-Package: com.raytheon.edex.uengine.tasks.query,
+Import-Package: com.raytheon.uf.common.message.response,
- com.raytheon.uf.common.message.response,
  com.raytheon.uf.common.status,
  org.apache.commons.logging

edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF

@@ -14,8 +14,7 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
  com.raytheon.edex.plugin.satellite;bundle-version="1.12.1174"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.edex.uengine.tasks.query,
+Import-Package: com.raytheon.uf.common.localization,
- com.raytheon.uf.common.localization,
  com.raytheon.uf.common.menus,
  com.raytheon.uf.common.menus.xml,
  com.raytheon.uf.common.status

ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/META-INF/MANIFEST.MF

@@ -10,8 +10,7 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
  com.raytheon.uf.common.parameter;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
  com.raytheon.uf.common.status;bundle-version="1.12.1174"
-Import-Package: com.raytheon.edex.uengine.tasks.query,
+Import-Package: com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata,
  com.raytheon.uf.common.serialization.comm,
  com.raytheon.uf.edex.pointdata,
  org.apache.commons.logging

ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataQuery.java

@@ -7,8 +7,9 @@
  * SOFTWARE HISTORY
  * 
  * Date         Ticket#    	Engineer    Description
- * -------		------- 	-------- 	-----------
+ * -------      -------         --------    -----------
- * 05/30/2013				Chin J. Chen	Initial coding
+ * 05/30/2013                   Chin J. Chen Initial coding
+ * 04/14/2014      2984         njensen      Remove unused uengine dependency
  *
  * </pre>
  * 
@@ -25,7 +26,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import com.raytheon.edex.uengine.tasks.query.TableQuery;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
 import com.raytheon.uf.common.datastorage.records.IDataRecord;
@@ -41,7 +41,6 @@ import com.raytheon.uf.edex.pointdata.PointDataQuery;
 
 public class GenericPointDataQuery extends PointDataQuery {
 
-	protected TableQuery tq;
 	public GenericPointDataQuery(String plugin)
 			throws DataAccessLayerException, PluginException {
 		super(plugin);

ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/META-INF/MANIFEST.MF

@@ -14,7 +14,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.17",
  javax.measure;bundle-version="1.0.0",
  org.apache.commons.lang;bundle-version="2.3.0",
  javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.uengine;bundle-version="1.11.17",
  org.apache.commons.codec;bundle-version="1.3.0",
  edu.wisc.ssec.mcidas;bundle-version="1.0.0",
  com.raytheon.uf.common.numeric;bundle-version="1.14.0"

ncep/gov.noaa.nws.ncep.viz.rsc.satellite/META-INF/MANIFEST.MF

@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui,
  javax.measure;bundle-version="1.0.0",
  javax.persistence;bundle-version="1.0.0",
- com.raytheon.edex.uengine;bundle-version="1.11.17",
  org.apache.commons.lang,
  org.geotools,
  com.raytheon.uf.common.colormap;bundle-version="1.11.7",

ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Require-Bundle: com.raytheon.edex.common,
  ucar.nc2;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: 
- com.raytheon.edex.uengine.tasks.query,
  com.raytheon.edex.util.satellite,
  com.raytheon.uf.common.dataplugin.satellite,
  com.raytheon.uf.common.localization,