diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml index a2fed08fbb..d62b84fe78 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml @@ -27,6 +27,16 @@ + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml index 78e14b04e2..56ca4d5c55 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml +++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml @@ -19,30 +19,30 @@ - + - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml index 85a08e2df5..5b5b43703f 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml +++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml @@ -68,8 +68,7 @@ - - + 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 0a3af798e1..808eb4211f 100644 --- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml @@ -154,4 +154,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.classpath b/edexOsgi/com.raytheon.uf.edex.notification/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.project b/edexOsgi/com.raytheon.uf.edex.notification/.project new file mode 100644 index 0000000000..0dbeb2c2e9 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/.project @@ -0,0 +1,28 @@ + + + com.raytheon.uf.edex.notification + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs b/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..c537b63063 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +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.notification/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.notification/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..7ffc6e619a --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Distributor +Bundle-SymbolicName: com.raytheon.uf.edex.notification +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: RAYTHEON +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.apache.camel;bundle-version="1.0.0", + com.google.guava;bundle-version="1.0.0", + com.raytheon.uf.edex.core;bundle-version="1.12.1174", + com.raytheon.uf.common.status;bundle-version="1.12.1174" diff --git a/edexOsgi/com.raytheon.uf.edex.notification/build.properties b/edexOsgi/com.raytheon.uf.edex.notification/build.properties new file mode 100644 index 0000000000..5791d48d5f --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + res/ diff --git a/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml b/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml new file mode 100644 index 0000000000..ea051007a5 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/res/spring/notification-ingest.xml @@ -0,0 +1,6 @@ + + + + diff --git a/edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java b/edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java new file mode 100644 index 0000000000..35651ccffa --- /dev/null +++ b/edexOsgi/com.raytheon.uf.edex.notification/src/com/raytheon/uf/edex/notification/PluginNotifier.java @@ -0,0 +1,107 @@ +/** + * 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.notification; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.Message; +import org.apache.camel.RecipientList; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +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.edex.core.EDEXUtil; +import com.raytheon.uf.edex.core.EdexException; + +/** + * Plugins can register routes with this and then be generically fired to. Helps + * to reduce dependencies as we no longer need to call a route directly. + * + *
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jun 13, 2013            mnash     Initial creation
+ * 
+ * 
+ * + * @author mnash + * @version 1.0 + */ + +public class PluginNotifier { + + private static final IUFStatusHandler theHandler = UFStatus + .getHandler(PluginNotifier.class); + + private static final Multimap routes = ArrayListMultimap + .create(); + + private static final PluginNotifier distributor = new PluginNotifier(); + + private PluginNotifier() { + } + + public PluginNotifier getInstance() { + return distributor; + } + + /** + * Normally called from Spring, this allows a set of commands to be + * registered for a specific plugin. + * + * @param name + * @param command + * @return + */ + public PluginNotifier register(String name, String command) { + routes.put(name, command); + return this; + } + + /** + * Takes the pluginName, which is what was registered for, and sends to all + * the routes that are registered as that. + * + * @param exchange + * @return + */ + @RecipientList + public List send(Exchange exchange) { + Message in = exchange.getIn(); + String name = (String) in.getHeader("pluginName"); + List list = new ArrayList(); + for (String route : routes.get(name)) { + try { + EDEXUtil.getMessageProducer().sendAsyncUri(route, in.getBody()); + } catch (EdexException e) { + theHandler.handle(Priority.PROBLEM, + "Unable to send message to " + route, e); + } + } + return list; + } +} diff --git a/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml b/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml deleted file mode 100644 index 608df36aa5..0000000000 --- a/localization/localization.OAX/utility/common_static/site/OAX/warngen/config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - OMAHA/VALLEY NE - OMAHA - EAX/KANSAS CITY,DMX/DES MOINES,BOX/BOSTON,LBF/NORTH PLATTE,PQR/PORTLAND - OMA - severethunderstorm - Flash Flood/ffw,Severe Thunderstorm/severethunderstorm,Tornado/tornado - Severe Weather Statement/SVS,Flash Flood Statement/ffs,non-convective FFW (Dam Break)/dambreak,non-convective Flash Flood Statement/dambreakffs,Areal Flood Warning/flw,Areal Flood Warning Followup/fls,Areal Flood Advisory/fla,Areal Flood Advisory Followup/flas,Special Marine Warning/smw,Marine Weather Statement (SMW Follow)/smws,Marine Weather Statement standalone/marinestatement,Short Term Forecast/shortterm,Special Weather Statement (zones)/sws - 5000 - \ No newline at end of file