From 49c53e544376b8c107713c17ea7521ba0a8c4070 Mon Sep 17 00:00:00 2001 From: Dustin Johnson Date: Tue, 26 Mar 2013 13:38:40 -0500 Subject: [PATCH] Issue #1827 Create registry/datadelivery client features Amend: Add event plugins and their dependencies to client features Change-Id: Ib80522161740857d4332b84bbedad10e19683602 Former-commit-id: 5dbff646aa4e9fc0d5fb08733a011818594c3dff [formerly fbcfdd0ca1494c833c27e26b3c7c9d5090f0f7b1] [formerly 52c27ec57f45fe023de35b666476925552407b0a] [formerly 1684507bdb59c338f9e382bb3a4cf0461f4cf963 [formerly 52c27ec57f45fe023de35b666476925552407b0a [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]] Former-commit-id: 1684507bdb59c338f9e382bb3a4cf0461f4cf963 Former-commit-id: 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b607030dcdefd8200db04968b3e1caf] Former-commit-id: 2591041c9dc2a35c6124e45170b625659e2a9e95 --- .../bandwidth/ui/GraphDataUtil.java | 10 ++-- edexOsgi/build.edex/build.xml | 8 +++ .../feature.xml | 13 ++++- .../component-deploy.xml | 7 --- .../feature.xml | 6 +-- ...t.xml => bandwidth-graph-datadelivery.xml} | 0 .../.project | 17 ++++++ .../build.properties | 1 + .../feature.xml | 54 +++++++++++++++++++ .../feature.xml | 24 +-------- ...raytheon.uf.edex.datadelivery.registry.ecl | 0 .../.classpath | 7 +++ .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +++ .../META-INF/MANIFEST.MF | 7 +++ .../build.properties | 5 ++ .../res/spring/datadelivery-router.xml | 0 .../res/spring/request-router.xml | 0 .../datadelivery/request/MarkerClass.java | 41 ++++++++++++++ .../.project | 17 ++++++ .../build.properties | 1 + .../feature.xml | 45 ++++++++++++++++ .../feature.xml | 24 +-------- 23 files changed, 236 insertions(+), 61 deletions(-) delete mode 100644 edexOsgi/com.raytheon.uf.common.datadelivery.request/component-deploy.xml rename edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/{bandwidth-graph-request.xml => bandwidth-graph-datadelivery.xml} (100%) create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/.project create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/build.properties create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml delete mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.registry/com.raytheon.uf.edex.datadelivery.registry.ecl create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath rename edexOsgi/{com.raytheon.uf.edex.datadelivery.registry => com.raytheon.uf.edex.datadelivery.request}/.project (91%) create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.request/.settings/org.eclipse.jdt.core.prefs create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.request/META-INF/MANIFEST.MF create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.request/build.properties rename edexOsgi/{com.raytheon.uf.edex.datadelivery.service => com.raytheon.uf.edex.datadelivery.request}/res/spring/datadelivery-router.xml (100%) rename edexOsgi/{com.raytheon.uf.edex.datadelivery.service => com.raytheon.uf.edex.datadelivery.request}/res/spring/request-router.xml (100%) create mode 100644 edexOsgi/com.raytheon.uf.edex.datadelivery.request/src/com/raytheon/uf/edex/datadelivery/request/MarkerClass.java create mode 100644 edexOsgi/com.raytheon.uf.edex.registry.client.feature/.project create mode 100644 edexOsgi/com.raytheon.uf.edex.registry.client.feature/build.properties create mode 100644 edexOsgi/com.raytheon.uf.edex.registry.client.feature/feature.xml diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java index 070f012f9e..e022f64fac 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java +++ b/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. * * * @@ -146,8 +147,9 @@ public class GraphDataUtil implements Runnable { */ private GraphDataResponse sendRequest(GraphDataRequest req) { try { - return (GraphDataResponse) ThriftClient.sendRequest(req); - } catch (VizException e) { + return (GraphDataResponse) RequestRouter.route(req, + DataDeliveryConstants.DATA_DELIVERY_SERVER); + } catch (Exception e) { statusHandler.handle(Priority.ERROR, "Error Requesting Data", e); } diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml index 751b5fac98..70b66ba3bc 100644 --- a/edexOsgi/build.edex/build.xml +++ b/edexOsgi/build.edex/build.xml @@ -82,6 +82,14 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml index 5f49fdeca3..db4d07c466 100644 --- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml +++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml @@ -103,12 +103,21 @@ + + + + - + + version="0.0.0"/> + diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.request/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.datadelivery.request/component-deploy.xml deleted file mode 100644 index de5e3b6303..0000000000 --- a/edexOsgi/com.raytheon.uf.common.datadelivery.request/component-deploy.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml index 11082b5e5d..fca022bfd5 100644 --- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml @@ -338,19 +338,19 @@ install-size="0" version="0.0.0" unpack="false"/> - + - + + unpack="false"/> diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-request.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml similarity index 100% rename from edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-request.xml rename to edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-graph-datadelivery.xml diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/.project b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/.project new file mode 100644 index 0000000000..9fd9b8f86e --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/.project @@ -0,0 +1,17 @@ + + + com.raytheon.uf.edex.datadelivery.client.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml new file mode 100644 index 0000000000..f43208df98 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml @@ -0,0 +1,54 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml index 884945a8c5..30a9b4b55d 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml @@ -23,15 +23,9 @@ + - - - - - - + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.registry/.project b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/.project similarity index 91% rename from edexOsgi/com.raytheon.uf.edex.datadelivery.registry/.project rename to edexOsgi/com.raytheon.uf.edex.datadelivery.request/.project index 8d54f0c950..a067f9ccc3 100644 --- a/edexOsgi/com.raytheon.uf.edex.datadelivery.registry/.project +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/.project @@ -1,6 +1,6 @@ - com.raytheon.uf.edex.datadelivery.registry + com.raytheon.uf.edex.datadelivery.request diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..67a02323cd --- /dev/null +++ b/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 diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..99be527696 --- /dev/null +++ b/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 diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/build.properties b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/build.properties new file mode 100644 index 0000000000..5791d48d5f --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + res/ diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml similarity index 100% rename from edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-router.xml rename to edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/request-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml similarity index 100% rename from edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/request-router.xml rename to edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/src/com/raytheon/uf/edex/datadelivery/request/MarkerClass.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/src/com/raytheon/uf/edex/datadelivery/request/MarkerClass.java new file mode 100644 index 0000000000..2543ae5ee7 --- /dev/null +++ b/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. + * + * 
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Mar 26, 2013 1827       djohnson     Initial creation
+ * 
+ *
+ * + * @author djohnson + * @version 1.0 + */ +public class MarkerClass { +} diff --git a/edexOsgi/com.raytheon.uf.edex.registry.client.feature/.project b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/.project new file mode 100644 index 0000000000..4e7ded8859 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/.project @@ -0,0 +1,17 @@ + + + com.raytheon.uf.edex.registry.client.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/edexOsgi/com.raytheon.uf.edex.registry.client.feature/build.properties b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/edexOsgi/com.raytheon.uf.edex.registry.client.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/feature.xml new file mode 100644 index 0000000000..ecc577a52d --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.registry.client.feature/feature.xml @@ -0,0 +1,45 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml index a6e11d04ee..8bd0cf7cd4 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml @@ -16,32 +16,12 @@ [Enter License Description here.] - + + - - - - - -