Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1

Former-commit-id: 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 70a7c3c556 [formerly c8ae09ab1d [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]
Former-commit-id: 70a7c3c556
Former-commit-id: 393cfacf90d5055883f5b301797a7483965f899b [formerly de88cceb8c]
Former-commit-id: be2a8e1b16

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java

@@ -25,11 +25,11 @@ import java.util.concurrent.Executors;
 import com.raytheon.uf.common.datadelivery.bandwidth.data.BandwidthGraphData;
 import com.raytheon.uf.common.datadelivery.bandwidth.request.GraphDataRequest;
 import com.raytheon.uf.common.datadelivery.bandwidth.response.GraphDataResponse;
+import com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants;
+import com.raytheon.uf.common.serialization.comm.RequestRouter;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.requests.ThriftClient;
 
 /**
  * 
@@ -45,6 +45,7 @@ import com.raytheon.uf.viz.core.requests.ThriftClient;
  * ------------ ---------- ----------- --------------------------
  * Dec 12, 2012   1269     lvenable     Initial creation
  * Feb 14, 2013 1596       djohnson     Remove sysouts, correct statusHandler class, handle null response.
+ * Mar 26, 2013 1827       djohnson     Graph data should be requested from data delivery.
  * 
  * </pre>
  * 
@@ -146,8 +147,9 @@ public class GraphDataUtil implements Runnable {
      */
     private GraphDataResponse sendRequest(GraphDataRequest req) {
         try {
-            return (GraphDataResponse) ThriftClient.sendRequest(req);
+            return (GraphDataResponse) RequestRouter.route(req,
-        } catch (VizException e) {
+                    DataDeliveryConstants.DATA_DELIVERY_SERVER);
+        } catch (Exception e) {
             statusHandler.handle(Priority.ERROR, "Error Requesting Data", e);
         }
 

edexOsgi/build.edex/build.xml

@@ -82,6 +82,14 @@
             <param name="feature"
                 value="com.raytheon.uf.edex.npp.feature" />
         </antcall>
+        <antcall target="build">
+            <param name="feature"
+                value="com.raytheon.uf.edex.registry.client.feature" />
+        </antcall>
+        <antcall target="build">
+            <param name="feature"
+                value="com.raytheon.uf.edex.datadelivery.client.feature" />
+        </antcall>
         <antcall target="build">
             <param name="feature"
                 value="com.raytheon.uf.edex.registry.feature" />

edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

@@ -103,12 +103,21 @@
    <includes
          id="com.raytheon.uf.edex.npp.feature"
          version="0.0.0"/>
+         
+   <includes
+         id="com.raytheon.uf.edex.datadelivery.client.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.raytheon.uf.edex.registry.client.feature"
+         version="0.0.0"/>
 
    <includes
          id="com.raytheon.uf.edex.datadelivery.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="com.raytheon.uf.edex.registry.feature"
-         version="0.0.0"/>         
+         version="0.0.0"/>
+
 </feature>

edexOsgi/com.raytheon.uf.common.datadelivery.request/component-deploy.xml

@@ -1,7 +0,0 @@
-<project basedir="." default="deploy" name="com.raytheon.uf.common.datadelivery.request">
-    <available file="../build.edex" property="build.dir.location" value="../build.edex"/>
-    <available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
-	
-	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
-	
-</project>

edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml

@@ -338,19 +338,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-    
+
    <plugin
          id="com.raytheon.uf.common.dataplugin.maps"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="com.raytheon.uf.common.image"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>         
+         unpack="false"/>
 
 </feature>

edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.datadelivery.client.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.raytheon.uf.edex.datadelivery.client.feature"
+      label="EDEX DataDelivery Client Feature"
+      version="1.0.0.qualifier"
+      provider-name="RAYTHEON">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import feature="com.raytheon.uf.edex.common.core.feature" version="0.0.0"/>
+      <import feature="com.raytheon.uf.edex.core.feature" version="0.0.0"/>
+      <import feature="com.raytheon.uf.edex.registry.client.feature" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="com.raytheon.uf.common.datadelivery.request"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.datadelivery.request"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.datadelivery.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.datadelivery.event"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml

@@ -23,15 +23,9 @@
       <import feature="com.raytheon.uf.edex.event.feature" version="0.0.0"/>
       <import feature="com.raytheon.uf.edex.registry.feature" version="0.0.0"/>
       <import feature="com.raytheon.uf.edex.core.feature" version="0.0.0"/>
+      <import feature="com.raytheon.uf.edex.datadelivery.client.feature" version="0.0.0"/>
    </requires>
 
-   <plugin
-         id="com.raytheon.uf.common.datadelivery.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="net.opengis"
          download-size="0"
@@ -119,29 +113,15 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.datadelivery.request"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.datadelivery.service"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-   <plugin
-         id="com.raytheon.uf.edex.datadelivery.service"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
-         id="com.raytheon.uf.common.datadelivery.event"
+         id="com.raytheon.uf.edex.datadelivery.service"
          download-size="0"
          install-size="0"
          version="0.0.0"

edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

edexOsgi/com.raytheon.uf.edex.datadelivery.request/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.uf.edex.datadelivery.registry</name>
+	<name>com.raytheon.uf.edex.datadelivery.request</name>
 	<comment></comment>
 	<projects>
 	</projects>

edexOsgi/com.raytheon.uf.edex.datadelivery.request/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+#Thu Apr 12 13:31:11 CDT 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

edexOsgi/com.raytheon.uf.edex.datadelivery.request/META-INF/MANIFEST.MF

@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Edex DataDelivery Request
+Bundle-SymbolicName: com.raytheon.uf.edex.datadelivery.request
+Bundle-Version: 1.0.0.qualifier
+Export-Package: 
+ com.raytheon.uf.edex.datadelivery.request

edexOsgi/com.raytheon.uf.edex.datadelivery.request/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               res/

edexOsgi/com.raytheon.uf.edex.datadelivery.request/src/com/raytheon/uf/edex/datadelivery/request/MarkerClass.java

@@ -0,0 +1,41 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.datadelivery.request;
+
+/**
+ * Marker class because this plugin is only required for the Spring files at
+ * this time, but a class is required for the including feature to not have a
+ * warning.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Mar 26, 2013 1827       djohnson     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author djohnson
+ * @version 1.0
+ */
+public class MarkerClass {
+}

edexOsgi/com.raytheon.uf.edex.registry.client.feature/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.registry.client.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

edexOsgi/com.raytheon.uf.edex.registry.client.feature/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

edexOsgi/com.raytheon.uf.edex.registry.client.feature/feature.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.raytheon.uf.edex.registry.client.feature"
+      label="EDEX Registry Client Feature"
+      version="1.0.0.qualifier"
+      provider-name="RAYTHEON">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import feature="com.raytheon.uf.edex.common.core.feature" version="1.0.0.qualifier"/>
+   </requires>
+
+   <plugin
+         id="com.raytheon.uf.common.registry.ebxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.registry.schemas.ebxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.common.registry.event"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

@@ -16,32 +16,12 @@
    <license url="http://www.example.com/license">
       [Enter License Description here.]
    </license>
-   
+
    <requires>
       <import feature="com.raytheon.uf.edex.event.feature" version="1.0.0.qualifier"/>
+      <import feature="com.raytheon.uf.edex.registry.client.feature" version="1.0.0.qualifier"/>
    </requires>
 
-   <plugin
-         id="com.raytheon.uf.common.registry.ebxml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.uf.common.registry.event"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.uf.common.registry.schemas.ebxml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.registry.schemas.iso19115"
          download-size="0"