iter = handler.getFeatures();
+ while (iter.hasNext()) {
+ infoHandler.addServerFeature(iter.next());
+ }
+ router.addHandler(handler);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jivesoftware.openfire.container.Plugin#initializePlugin(org.jivesoftware
+ * .openfire.container.PluginManager, java.io.File)
+ */
+ @Override
+ public void initializePlugin(PluginManager manager, File arg1) {
+ XMPPServer server = XMPPServer.getInstance();
+
+ DataAuthHandler authHandler = new DataAuthHandler();
+ HttpAddressHandler addressHandler = new HttpAddressHandler();
+ registerConfigHandlers(server,
+ Arrays.asList(authHandler, addressHandler));
+
+ /* Retrieve openfire components. */
+ JID serverId = new JID(server.getServerInfo().getXMPPDomain());
+
+ /* The http status monitor */
+ this.httpStatusMonitor = new HttpStatusMonitor(addressHandler, serverId);
+
+ /* Create a new listener. */
+ this.listener = new CollaborationSessionEventListener();
+
+ /* Initialize the listener. */
+ this.listener
+ .setHttpStatusChecker(this.httpStatusMonitor);
+ this.listener.setServerAddress(serverId);
+ this.listener.setRouter(server.getMessageRouter());
+
+ /* Make it possible for the listener to receive events. */
+ SessionEventDispatcher.addListener(this.listener);
+ this.scheduleStatusMonitor();
+ }
+
+ /**
+ * Schedules the http collaboration status monitor at the specified,
+ * configurable interval using the openfire TaskEngine; see
+ * {@link TaskEngine}
+ */
+ private synchronized void scheduleStatusMonitor() {
+ logger.info("Scheduling the httpd collaboration status monitor ...");
+ if (this.monitorTaskEngine == null) {
+ this.monitorTaskEngine = TaskEngine.getInstance();
+ }
+ this.monitorTaskEngine.schedule(this.httpStatusMonitor,
+ MONITOR_DELAY_MS, this.getHttpMonitorInterval());
+ }
+
+ /**
+ * Stops the scheduled http collaboration status monitor if it has been
+ * scheduled.
+ */
+ private synchronized void stopStatusMonitor() {
+ if (this.monitorTaskEngine == null) {
+ return;
+ }
+ this.monitorTaskEngine
+ .cancelScheduledTask(this.httpStatusMonitor);
+ }
+
+ /**
+ * Sets the configurable interval for the amount of time between executions
+ * of the http collaboration status monitor
+ *
+ * @param _interval
+ * the interval in milliseconds
+ */
+ public void setHttpMonitorInterval(long _interval) {
+ long originalInterval = this.getHttpMonitorInterval();
+ if (_interval == originalInterval) {
+ return;
+ }
+ JiveGlobals.setProperty(INTERVAL, Long.toString(_interval));
+ this.stopStatusMonitor();
+ this.scheduleStatusMonitor();
+ }
+
+ /**
+ * Returns the interval from the openfire configuration
+ *
+ * @return the interval in milliseconds
+ */
+ public long getHttpMonitorInterval() {
+ return JiveGlobals.getLongProperty(INTERVAL, DEFAULT_INTERVAL_MS);
+ }
+
+
+ /**
+ * Sets the global value for toggling pre 14.3 message format support
+ *
+ * @param legacy
+ */
+ public void setLegacySupport(boolean legacy) {
+ JiveGlobals.setProperty(ConfigurationPacket.LEGACY_KEY,
+ Boolean.toString(legacy));
+ }
+
+ /**
+ * @return true if configured to support pre 14.3 message format
+ */
+ public boolean hasLegacySupport() {
+ return JiveGlobals.getBooleanProperty(ConfigurationPacket.LEGACY_KEY,
+ true);
+ }
+
+ /**
+ * Set white list of accounts that belong to dataservers. The first server
+ * in the list is treated as the primary dataserver.
+ *
+ * @param whiteList
+ */
+ public void setDataserverUsers(String whiteList) {
+ JiveGlobals
+ .setProperty(AbstractConfigHandler.DATASERVER_USERS_KEY, whiteList);
+ }
+
+ /**
+ * @return white list of accounts that belong to dataservers. The first
+ * server in the list is treated as the primary dataserver.
+ */
+ public String getDataserverUsers() {
+ return JiveGlobals
+ .getProperty(AbstractConfigHandler.DATASERVER_USERS_KEY, "");
+ }
+
+}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/HttpdCollaborationConfigurationPlugin.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/HttpdCollaborationConfigurationPlugin.java
deleted file mode 100644
index ce68a73d10..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/HttpdCollaborationConfigurationPlugin.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.jivesoftware.openfire.MessageRouter;
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.container.Plugin;
-import org.jivesoftware.openfire.container.PluginManager;
-import org.jivesoftware.openfire.event.SessionEventDispatcher;
-import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.TaskEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xmpp.packet.JID;
-
-import com.raytheon.openfire.plugin.configuration.collaboration.configuration.ConfigurationPacket;
-import com.raytheon.openfire.plugin.configuration.collaboration.configuration.HttpdCollaborationConfiguration;
-import com.raytheon.openfire.plugin.configuration.collaboration.httpd.HttpdCollaborationConfReader;
-import com.raytheon.openfire.plugin.configuration.collaboration.httpd.HttpdCollaborationStatusMonitor;
-import com.raytheon.openfire.plugin.configuration.collaboration.listener.HttpdCollaborationSessionEventListener;
-
-/**
- * The main plugin class for the AWIPS II Httpd Collaboration Configuration
- * plugin; creates and configures an openfire listener and the httpd monitor.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 07, 2012 bkowal Initial creation
- * Jan 06, 2013 2563 bclement replaced TaskEngine shutdown with cancel task
- * added legacy format setter/accessor
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-public class HttpdCollaborationConfigurationPlugin implements Plugin {
- private static final Logger logger = LoggerFactory
- .getLogger(HttpdCollaborationConfigurationPlugin.class);
-
- private static final String LOCATION = "plugin.collaboration.httpd.location";
-
- private static final String INTERVAL = "plugin.collaboration.httpd.interval";
-
- private static final String DEFAULT_LOCATION = "/awips2/httpd_collaboration";
-
- private static final long DEFAULT_INTERVAL_MS = 60000;
-
- private static final long MONITOR_DELAY_MS = 60000; /* 1 Minute */
-
- private static final String ABORT_ERROR_MESSAGE = "Aborting initialization of the HttpdCollaborationConfigurationPlugin plugin.";
-
- private HttpdCollaborationSessionEventListener listener;
-
- private HttpdCollaborationStatusMonitor httpdCollaborationStatusMonitor;
-
- private TaskEngine monitorTaskEngine;
-
- /**
- *
- */
- public HttpdCollaborationConfigurationPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jivesoftware.openfire.container.Plugin#destroyPlugin()
- */
- @Override
- public void destroyPlugin() {
- if ((this.listener == null) == false) {
- SessionEventDispatcher.removeListener(this.listener);
-
- this.listener.dispose();
- this.listener = null;
- }
-
- if ((this.monitorTaskEngine == null) == false) {
- // we don't want to shutdown the engine since it is a singleton
- // if we do, we can't reload the plugin
- this.monitorTaskEngine
- .cancelScheduledTask(this.httpdCollaborationStatusMonitor);
- this.monitorTaskEngine = null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.jivesoftware.openfire.container.Plugin#initializePlugin(org.jivesoftware
- * .openfire.container.PluginManager, java.io.File)
- */
- @Override
- public void initializePlugin(PluginManager arg0, File arg1) {
- /*
- * Attempt to read the httpd collaboration configuration.
- */
- HttpdCollaborationConfReader confReader = new HttpdCollaborationConfReader(
- this.getHttpdCollaborationLocation());
- try {
- confReader.execute();
- } catch (ConfigurationException e1) {
- logger.error("Unable to read the httpd collaboration configuration.",
- e1);
- logger.error(ABORT_ERROR_MESSAGE);
- return;
- } catch (Exception e2) {
- logger.error("An unexpected error has occurred.", e2);
- logger.error(ABORT_ERROR_MESSAGE);
- return;
- }
-
- /*
- * Determine the hostname - there is a requirement in place that
- * requires openfire and httpd-collaboration to be installed on the same
- * machine.
- */
- InetAddress address = null;
- try {
- address = InetAddress.getLocalHost();
- } catch (UnknownHostException e1) {
- logger.error("Unable to retrieve the hostname.", e1);
- logger.error(ABORT_ERROR_MESSAGE);
- return;
- }
-
- /* Persist the configuration information. */
- HttpdCollaborationConfiguration httpdCollaborationConfiguration = new HttpdCollaborationConfiguration();
- httpdCollaborationConfiguration.setSessionDataHost(address
- .getHostName());
- httpdCollaborationConfiguration.setSessionDataPort(confReader
- .getListenPort());
-
- /* The httpd-collaboration status monitor */
- this.httpdCollaborationStatusMonitor = new HttpdCollaborationStatusMonitor(
- this.getHttpdCollaborationLocation(),
- httpdCollaborationConfiguration.getHttpdCollaborationURL(),
- httpdCollaborationConfiguration.toString());
-
- /* Retrieve openfire components. */
- JID serverAddress = new JID(XMPPServer.getInstance().getServerInfo()
- .getXMPPDomain());
- MessageRouter router = XMPPServer.getInstance().getMessageRouter();
-
- /* Create a new listener. */
- this.listener = new HttpdCollaborationSessionEventListener(
- httpdCollaborationConfiguration.toString());
-
- /* Initialize the listener. */
- this.listener
- .setHttpdCollaborationStatusChecker(this.httpdCollaborationStatusMonitor);
- this.listener.setServerAddress(serverAddress);
- this.listener.setRouter(router);
-
- /* Make it possible for the listener to receive events. */
- SessionEventDispatcher.addListener(this.listener);
- this.scheduleStatusMonitor();
- }
-
- /**
- * Schedules the httpd collaboration status monitor at the specified,
- * configurable interval using the openfire TaskEngine; see
- * {@link TaskEngine}
- */
- private synchronized void scheduleStatusMonitor() {
- logger.info("Scheduling the httpd collaboration status monitor ...");
- if (this.monitorTaskEngine == null) {
- this.monitorTaskEngine = TaskEngine.getInstance();
- }
- this.monitorTaskEngine.schedule(this.httpdCollaborationStatusMonitor,
- MONITOR_DELAY_MS, this.getHttpdMonitorInterval());
- }
-
- /**
- * Stops the scheduled httpd collaboration status monitor if it has been
- * scheduled.
- */
- private synchronized void stopStatusMonitor() {
- if (this.monitorTaskEngine == null) {
- return;
- }
- this.monitorTaskEngine
- .cancelScheduledTask(this.httpdCollaborationStatusMonitor);
- }
-
- /**
- * Sets the configurable installation location of awips2-httpd-collaboration
- *
- * @param _location
- * the location of awips2-httpd-collaboration
- */
- public void setHttpdCollaborationLocation(String _location) {
- JiveGlobals.setProperty(LOCATION, _location);
- }
-
- /**
- * Returns the installation location of awips2-httpd-collaboration from the
- * openfire configuration
- *
- * @return the installation root of awips2-httpd-collaboration
- */
- public String getHttpdCollaborationLocation() {
- return JiveGlobals.getProperty(LOCATION, DEFAULT_LOCATION);
- }
-
- /**
- * Sets the configurable interval for the amount of time between executions
- * of the httpd collaboration status monitor
- *
- * @param _interval
- * the interval in milliseconds
- */
- public void setHttpdMonitorInterval(long _interval) {
- long originalInterval = this.getHttpdMonitorInterval();
- if (_interval == originalInterval) {
- return;
- }
- JiveGlobals.setProperty(INTERVAL, Long.toString(_interval));
- this.stopStatusMonitor();
- this.scheduleStatusMonitor();
- }
-
- /**
- * Returns the interval from the openfire configuration
- *
- * @return the interval in milliseconds
- */
- public long getHttpdMonitorInterval() {
- return JiveGlobals.getLongProperty(INTERVAL, DEFAULT_INTERVAL_MS);
- }
-
- /**
- * Sets the global value for toggling pre 14.3 message format support
- *
- * @param legacy
- */
- public void setLegacySupport(boolean legacy) {
- JiveGlobals.setProperty(ConfigurationPacket.LEGACY_KEY,
- Boolean.toString(legacy));
- }
-
- /**
- * @return true if configured to support pre 14.3 message format
- */
- public boolean hasLegacySupport() {
- return JiveGlobals.getBooleanProperty(ConfigurationPacket.LEGACY_KEY,
- true);
- }
-
-}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/ConfigurationPacket.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/ConfigurationPacket.java
index ca332ecc6c..02ffdc0570 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/ConfigurationPacket.java
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/ConfigurationPacket.java
@@ -19,11 +19,6 @@
**/
package com.raytheon.openfire.plugin.configuration.collaboration.configuration;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
import org.apache.commons.lang.StringUtils;
import org.dom4j.Element;
import org.jivesoftware.util.JiveGlobals;
@@ -32,6 +27,7 @@ import org.slf4j.LoggerFactory;
import org.xmpp.packet.Message;
import org.xmpp.packet.PacketExtension;
+
/**
* Packet extension for collaboration configuration messages to clients
*
@@ -42,6 +38,7 @@ import org.xmpp.packet.PacketExtension;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 20, 2013 bclement Initial creation
+ * Feb 14, 2014 2756 bclement moved preferences to separate file
*
*
*
@@ -54,33 +51,6 @@ public class ConfigurationPacket extends PacketExtension {
private static final Logger log = LoggerFactory
.getLogger(ConfigurationPacket.class);
- // format property file
-
- public static final String CONFIG_FILE_KEY = "plugin.collaboration.packet.format.file";
-
- private static final String DEFAULT_PLUGIN_CONFIG_FILE = "conf"
- + File.separator + "configurationPacketFormat.properties";
-
- private static final Properties properties = new Properties();
-
- static {
- String confFile = JiveGlobals.getProperty(CONFIG_FILE_KEY,
- DEFAULT_PLUGIN_CONFIG_FILE);
- File f = new File(JiveGlobals.getHomeDirectory(), confFile);
- if (f.exists()) {
- try {
- properties.load(new FileInputStream(f));
- } catch (IOException e) {
- // defaults will be used
- log.error("Problem loading packet format configuration file: "
- + f.getAbsolutePath(), e);
- }
- } else {
- log.info("Using default config packet format since there was no format file at "
- + f.getAbsolutePath());
- }
- }
-
// property keys
public static final String XMLNS_KEY = "plugin.collaboration.packet.xmlns";
@@ -128,11 +98,11 @@ public class ConfigurationPacket extends PacketExtension {
* configuration payload for packet
* @return
*/
- private static Element create(String body) {
- String element = properties.getProperty(ELEMENT_KEY, ELEMENT_DEFAULT);
- String xmlns = properties.getProperty(XMLNS_KEY, XMLNS_DEFAULT);
+ public static Element create(String body) {
+ String element = PacketPreferences.get(ELEMENT_KEY, ELEMENT_DEFAULT);
+ String xmlns = PacketPreferences.get(XMLNS_KEY, XMLNS_DEFAULT);
Element rval = docFactory.createElement(element, xmlns);
- String attributes = properties.getProperty(ATTRIBUTES_KEY,
+ String attributes = PacketPreferences.get(ATTRIBUTES_KEY,
ATTRIBUTES_DEFAULT);
for (String keyval : StringUtils.split(attributes, ',')) {
String[] separated = StringUtils.split(keyval, '=');
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/HttpdCollaborationConfiguration.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/HttpdCollaborationConfiguration.java
deleted file mode 100644
index c1da2f4682..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/HttpdCollaborationConfiguration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.configuration;
-
-
-/**
- * Used to store and format the information retrieved from the
- * httpd-collaboration httpd.conf file that will be returned to the client.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 07, 2012 bkowal Initial creation
- * Jan 06, 2013 2563 bclement removed config preamble
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-public class HttpdCollaborationConfiguration {
- private static final String SESSION_DATA_URL_FORMAT_STRING = "http://%s:%s/session_data/";
-
- private static final String URL_PARAMETER_NAME = "sessionDataHttpURL";
-
- private String sessionDataHost;
-
- private String sessionDataPort;
-
- /**
- *
- */
- public HttpdCollaborationConfiguration() {
- this.sessionDataHost = null;
- this.sessionDataPort = null;
- }
-
- @Override
- public String toString() {
- return URL_PARAMETER_NAME + " : " + this.getHttpdCollaborationURL();
- }
-
- public String getHttpdCollaborationURL() {
- return String.format(SESSION_DATA_URL_FORMAT_STRING,
- this.sessionDataHost, this.sessionDataPort);
- }
-
- public String getSessionDataHost() {
- return sessionDataHost;
- }
-
- public void setSessionDataHost(String sessionDataHost) {
- this.sessionDataHost = sessionDataHost;
- }
-
- public String getSessionDataPort() {
- return sessionDataPort;
- }
-
- public void setSessionDataPort(String sessionDataPort) {
- this.sessionDataPort = sessionDataPort;
- }
-}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/PacketPreferences.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/PacketPreferences.java
new file mode 100644
index 0000000000..f738b1b6ea
--- /dev/null
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/configuration/PacketPreferences.java
@@ -0,0 +1,91 @@
+/**
+ * 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.openfire.plugin.configuration.collaboration.configuration;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.jivesoftware.util.JiveGlobals;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Preferences wrapper for packet format
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 10, 2014 2756 bclement Initial creation
+ *
+ *
+ *
+ * @author bclement
+ * @version 1.0
+ */
+public class PacketPreferences {
+
+ private static final Logger log = LoggerFactory
+ .getLogger(PacketPreferences.class);
+
+ // format property file
+
+ public static final String CONFIG_FILE_KEY = "plugin.collaboration.packet.format.file";
+
+ private static final String DEFAULT_PLUGIN_CONFIG_FILE = "conf"
+ + File.separator + "configurationPacketFormat.properties";
+
+ private static final Properties properties = new Properties();
+
+ static {
+ String confFile = JiveGlobals.getProperty(CONFIG_FILE_KEY,
+ DEFAULT_PLUGIN_CONFIG_FILE);
+ File f = new File(JiveGlobals.getHomeDirectory(), confFile);
+ if (f.exists()) {
+ try {
+ properties.load(new FileInputStream(f));
+ } catch (IOException e) {
+ // defaults will be used
+ log.error("Problem loading packet format configuration file: "
+ + f.getAbsolutePath(), e);
+ }
+ } else {
+ log.info("Using default config packet format since there was no format file at "
+ + f.getAbsolutePath());
+ }
+ }
+
+ /**
+ * Get property from configuration file. Returns defaultValue if key doesn't
+ * exist
+ *
+ * @param key
+ * @param defaultValue
+ * @return
+ */
+ public static String get(String key, String defaultValue) {
+ return properties.getProperty(key, defaultValue);
+ }
+
+}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationNotRunningException.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationNotRunningException.java
deleted file mode 100644
index f590a498ad..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationNotRunningException.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.exception;
-
-/**
- * Implements an exception that is thrown whenever one of the conditions
- * indicating httpd-collaboration is not running occurs.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 30, 2012 bkowal Initial creation
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-
-public class HttpdCollaborationNotRunningException extends Throwable {
-
- private static final long serialVersionUID = 6598229436212894638L;
- private static final String MESSAGE_PREFIX = "The httpd-collaboration server is not running; ";
-
- /**
- *
- */
- public HttpdCollaborationNotRunningException() {
- }
-
- /**
- * @param message
- */
- public HttpdCollaborationNotRunningException(String message) {
- super(MESSAGE_PREFIX + message);
- }
-
- /**
- * @param cause
- */
- public HttpdCollaborationNotRunningException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param message
- * @param cause
- */
- public HttpdCollaborationNotRunningException(String message, Throwable cause) {
- super(MESSAGE_PREFIX + message, cause);
- }
-
-}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationStatusException.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationStatusException.java
deleted file mode 100644
index 1e947118d9..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/exception/HttpdCollaborationStatusException.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.exception;
-
-/**
- * Implements an exception that is thrown whenever it is not possible to
- * determine whether or not httpd-collaboration is currently running.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 30, 2012 bkowal Initial creation
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-
-public class HttpdCollaborationStatusException extends Throwable {
-
- private static final long serialVersionUID = -2446532142660776343L;
- private static final String MESSAGE_PREFIX = "Unable to determine the status of the httpd-collaboration server; ";
-
- /**
- *
- */
- public HttpdCollaborationStatusException() {
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param message
- */
- public HttpdCollaborationStatusException(String message) {
- super(MESSAGE_PREFIX + message);
- }
-
- /**
- * @param cause
- */
- public HttpdCollaborationStatusException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param message
- * @param cause
- */
- public HttpdCollaborationStatusException(String message, Throwable cause) {
- super(MESSAGE_PREFIX + message, cause);
- }
-
-}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/http/HttpStatusMonitor.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/http/HttpStatusMonitor.java
new file mode 100644
index 0000000000..7aa32622a3
--- /dev/null
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/http/HttpStatusMonitor.java
@@ -0,0 +1,259 @@
+/**
+ * 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.openfire.plugin.configuration.collaboration.http;
+
+import java.io.IOException;
+import java.util.TimerTask;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.HttpStatus;
+import org.jivesoftware.openfire.SessionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.Message;
+
+import com.raytheon.openfire.plugin.configuration.collaboration.configuration.ConfigurationPacket;
+import com.raytheon.openfire.plugin.configuration.collaboration.iq.AbstractConfigHandler;
+import com.raytheon.openfire.plugin.configuration.collaboration.iq.HttpAddressHandler;
+
+/**
+ * Runs a series of checks to determine if http collaboration is still running
+ * on-demand and on a scheduled basis. The checks include: verifying that a url
+ * is configured for the primary dataserver and executing an http GET request
+ * against the http dataserver.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 26, 2012 bkowal Initial creation
+ * Jan 06, 2013 2563 bclement replaced chat message with packet extension
+ * Feb 14, 2013 2756 bclement rename and refactor for operation with generic http
+ * server configured over XMPP
+ *
+ *
+ *
+ * @author bkowal
+ * @version 1.0
+ */
+
+public class HttpStatusMonitor extends TimerTask {
+ private static final Logger logger = LoggerFactory
+ .getLogger(HttpStatusMonitor.class);
+
+ private final SessionManager sessionManager;
+
+ private static final HttpClient httpClient = new HttpClient();
+
+ private GetMethod _getMethod = null;
+
+ private String _previousUrl = null;
+
+ private static enum Status {
+ URL_UNSET, SERVER_DOWN, SERVER_UP
+ }
+
+ private Status status = Status.URL_UNSET;
+
+ private final HttpAddressHandler addressHandler;
+
+ private final JID serverId;
+
+ /**
+ * @param addressHandler
+ * IQ hander responsible for http url configuration
+ * @param serverId
+ * id of server used as from address in messages
+ */
+ public HttpStatusMonitor(HttpAddressHandler addressHandler, JID serverId) {
+ this.sessionManager = SessionManager.getInstance();
+ this.addressHandler = addressHandler;
+ this.serverId = serverId;
+ }
+
+ /**
+ * Get the current URL configuration string.
+ *
+ * @return null if no valid configuration is available
+ */
+ public String getCurrentUrlConfig() {
+ String primary = AbstractConfigHandler.getPrimaryDataServer();
+ if (primary == null) {
+ logger.debug("No primary dataserver found");
+ urlUnset();
+ return null;
+ } else {
+ String url = addressHandler.getHttpAddress(primary);
+ if (url == null) {
+ logger.debug("No url set for dataserver: " + primary);
+ urlUnset();
+ return null;
+ } else {
+ return verifyHttpProcess(url);
+ }
+ }
+ }
+
+ /**
+ * Verify that the http server is online and accepting requests. Returns the
+ * valid URL configuration string.
+ *
+ * @param url
+ * url to verify
+ * @return null if successful request cannot be made
+ */
+ private String verifyHttpProcess(String url) {
+ synchronized (httpClient) {
+ int statusCode = -1;
+ try {
+ GetMethod get = getCachedMethod(url);
+ statusCode = httpClient.executeMethod(get);
+ } catch (HttpException e1) {
+ String msg = "Unable to execute GET against the collaboration dataserver at "
+ + url;
+ logger.error(msg, e1);
+ setOffline(msg);
+ } catch (IOException e2) {
+ String msg = "Unable to read the response from the collaboration dataserver at "
+ + url;
+ logger.error(msg, e2);
+ setOffline(msg);
+ }
+
+ if ((statusCode == HttpStatus.SC_OK) == false) {
+ String msg = "Dataserver not is not available - received status "
+ + statusCode;
+ logger.error(msg);
+ setOffline(msg);
+ return null;
+ } else {
+ String urlConfig = "sessionDataHttpURL : " + url;
+ setOnline(urlConfig);
+ return urlConfig;
+ }
+ }
+ }
+
+ /**
+ * Get the http GET method for url. Uses a simple cache.
+ *
+ * @param url
+ * @return
+ */
+ private GetMethod getCachedMethod(String url) {
+ if (_previousUrl == null || !_previousUrl.equals(url)) {
+ logger.debug("Dataserver url changed from " + _previousUrl + " to "
+ + url);
+ _getMethod = new GetMethod(url);
+ _previousUrl = url;
+ }
+ return _getMethod;
+ }
+
+ @Override
+ public void run() {
+ logger.debug("Verifying that httpd-collaboration is still available ...");
+ getCurrentUrlConfig();
+ }
+
+ /**
+ * Broadcast configuration message to all users
+ *
+ * @param body
+ * url or error configuration string
+ */
+ private synchronized void broadcastMessage(String body) {
+ logger.debug("Broadcasting message: " + body);
+ Message message = ConfigurationPacket.createMessage(body);
+ message.setFrom(serverId);
+ this.sessionManager.broadcast(message);
+ }
+
+ /**
+ * Method to call when http server cannot be reached
+ *
+ * @param message
+ */
+ private void setOffline(String message) {
+ switch (status) {
+ case SERVER_UP:
+ logger.debug("Status changing from " + status + " to "
+ + Status.SERVER_DOWN);
+ broadcastMessage(formatError(message));
+ status = Status.SERVER_DOWN;
+ default:
+ logger.debug("SetOffline: Status not changed from " + status);
+ // no action since we don't want to spam with error messages
+ break;
+ }
+ }
+
+ /**
+ * Format error message to configuration format
+ *
+ * @param message
+ * @return
+ */
+ private String formatError(String message) {
+ return "error : " + message;
+ }
+
+ /**
+ * Method to call when http server is configured and running
+ *
+ * @param urlConfig
+ */
+ private void setOnline(String urlConfig) {
+ switch (status) {
+ case SERVER_DOWN:
+ case URL_UNSET:
+ logger.debug("Status changing from " + status + " to "
+ + Status.SERVER_UP);
+ broadcastMessage(urlConfig);
+ status = Status.SERVER_UP;
+ break;
+ default:
+ logger.debug("SetOnline: Status not changed from " + status);
+ // no action
+ }
+ }
+
+ /**
+ * Method to call when http server url is not configured
+ */
+ private void urlUnset() {
+ switch (status) {
+ case SERVER_UP:
+ logger.debug("Status changing from " + status + " to "
+ + Status.URL_UNSET);
+ broadcastMessage(formatError("Dataserver does not have URL configured in chat server."));
+ status = Status.URL_UNSET;
+ default:
+ logger.debug("UrlUnset: Status not changed from " + status);
+ // no action since we don't want to spam with error messages
+ break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationConfReader.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationConfReader.java
deleted file mode 100644
index 7a253b6c7b..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationConfReader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.httpd;
-
-import org.apache.commons.configuration.ConfigurationException;
-
-import com.raytheon.openfire.plugin.configuration.collaboration.util.HttpdCollaborationUtil;
-
-/**
- * Reads the httpd.conf file for the configurable httpd-collaboration instance.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 7, 2012 bkowal Initial creation
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-public class HttpdCollaborationConfReader {
- private static String CONF_FILE;
-
- private static final String LISTEN_PROPERTY = "Listen";
-
- private HttpdCollaborationPropertiesConfiguration propertiesConfiguration;
-
- /**
- *
- */
- public HttpdCollaborationConfReader(String _location) {
- CONF_FILE = HttpdCollaborationUtil.endPathIfNecessary(_location)
- + "etc/httpd/conf/httpd.conf";
- }
-
- public void execute() throws ConfigurationException {
- this.propertiesConfiguration = new HttpdCollaborationPropertiesConfiguration();
- this.propertiesConfiguration.load(CONF_FILE);
- }
-
- public String getListenPort() {
- return this.propertiesConfiguration.getString(LISTEN_PROPERTY);
- }
-}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationPropertiesConfiguration.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationPropertiesConfiguration.java
deleted file mode 100644
index 23afdecbfe..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationPropertiesConfiguration.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.httpd;
-
-import java.io.File;
-import java.net.URL;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
-/**
- * This class was created because version 1.6 of commons configuration does not
- * allow you to decide whether you want to allow includes or not. There is a
- * 'setIncludesAllowed' method; however, it is protected.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 2012 bkowal Initial creation
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-public class HttpdCollaborationPropertiesConfiguration extends PropertiesConfiguration {
- /**
- *
- */
- public HttpdCollaborationPropertiesConfiguration() {
- super();
- }
-
- /**
- * @param fileName
- * @throws ConfigurationException
- */
- public HttpdCollaborationPropertiesConfiguration(String fileName)
- throws ConfigurationException {
- super(fileName);
- }
-
- /**
- * @param file
- * @throws ConfigurationException
- */
- public HttpdCollaborationPropertiesConfiguration(File file) throws ConfigurationException {
- super(file);
- }
-
- /**
- * @param url
- * @throws ConfigurationException
- */
- public HttpdCollaborationPropertiesConfiguration(URL url) throws ConfigurationException {
- super(url);
- }
-
- @Override
- public void setBasePath(String basePath) {
- super.setBasePath(basePath);
- this.setIncludesAllowed(false);
- }
-}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationStatusMonitor.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationStatusMonitor.java
deleted file mode 100644
index 54bd8681ac..0000000000
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/httpd/HttpdCollaborationStatusMonitor.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * 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.openfire.plugin.configuration.collaboration.httpd;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.TimerTask;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.http.HttpStatus;
-import org.jivesoftware.openfire.SessionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xmpp.packet.Message;
-
-import com.raytheon.openfire.plugin.configuration.collaboration.configuration.ConfigurationPacket;
-import com.raytheon.openfire.plugin.configuration.collaboration.exception.HttpdCollaborationNotRunningException;
-import com.raytheon.openfire.plugin.configuration.collaboration.exception.HttpdCollaborationStatusException;
-import com.raytheon.openfire.plugin.configuration.collaboration.util.HttpdCollaborationUtil;
-
-/**
- * Runs a series of checks to determine if httpd-collaboration is still running
- * on-demand and on a scheduled basis. The checks include: verifying that a pid
- * file exists for httpd-collaboration and executing an http GET request against
- * the httpd-collaboration server.
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Jul 26, 2012 bkowal Initial creation
- * Jan 06, 2013 2563 bclement replaced chat message with packet extension
- *
- *
- *
- * @author bkowal
- * @version 1.0
- */
-
-public class HttpdCollaborationStatusMonitor extends TimerTask {
- private static final Logger logger = LoggerFactory
- .getLogger(HttpdCollaborationStatusMonitor.class);
-
- private SessionManager sessionManager;
-
- private boolean httpdCollaborationBecameUnavailable;
-
- // provided by the configuration
- private String HTTPD_COLLABORATION_CONFIGURATION;
-
- private static String HTTPD_PID_FILE;
-
- private static File pidFile;
-
- private static final HttpClient httpClient = new HttpClient();
-
- private GetMethod getMethod;
-
- /**
- *
- */
- public HttpdCollaborationStatusMonitor(String _location,
- String _httpdCollaborationURL,
- String _httpdCollaborationConfiguration) {
- HTTPD_PID_FILE = HttpdCollaborationUtil.endPathIfNecessary(_location)
- + "var/run/httpd.pid";
- HTTPD_COLLABORATION_CONFIGURATION = _httpdCollaborationConfiguration;
- this.sessionManager = SessionManager.getInstance();
- this.httpdCollaborationBecameUnavailable = false;
-
- pidFile = new File(HTTPD_PID_FILE);
- this.getMethod = new GetMethod(
- HttpdCollaborationUtil
- .endPathIfNecessary(_httpdCollaborationURL));
- }
-
- public void statusHttpdCollaboration()
- throws HttpdCollaborationNotRunningException,
- HttpdCollaborationStatusException {
- this.doesPidFileExist();
-
- // "ping" the httpd process to ensure that it is actually running
- this.verifyHttpdProcess();
- }
-
- private void doesPidFileExist()
- throws HttpdCollaborationNotRunningException {
- // verify the httpd-collaboration pid file exists.
-
- if (pidFile.exists() == false) {
- // httpd-collaboration is not running
- throw new HttpdCollaborationNotRunningException(
- "the httpd-collaboration pid file does not exist: "
- + pidFile.getAbsolutePath());
- }
- }
-
- private void verifyHttpdProcess()
- throws HttpdCollaborationNotRunningException,
- HttpdCollaborationStatusException {
- synchronized (this.getMethod) {
- int statusCode = -1;
- try {
- statusCode = httpClient.executeMethod(getMethod);
- } catch (HttpException e1) {
- throw new HttpdCollaborationStatusException(
- "Unable to execute GET against the httpd-collaboration server",
- e1);
- } catch (IOException e2) {
- throw new HttpdCollaborationStatusException(
- "Unable to read the response from the httpd-collaboration server",
- e2);
- }
-
- if ((statusCode == HttpStatus.SC_OK) == false) {
- throw new HttpdCollaborationNotRunningException(
- "httpd-collaboration is not available - received status = "
- + statusCode);
- }
- }
- }
-
- @Override
- public void run() {
- logger.debug("Verifying that httpd-collaboration is still available ...");
- String errorMessage = null;
-
- try {
- this.statusHttpdCollaboration();
- } catch (HttpdCollaborationNotRunningException e1) {
- logger.error("httpd-collaboration is not available", e1);
- this.httpdCollaborationBecameUnavailable = true;
- errorMessage = HttpdCollaborationUtil.encodeErrorMessage(e1);
- } catch (HttpdCollaborationStatusException e2) {
- logger.error(
- "unable to determine if httpd-collaboration is still available!!!",
- e2);
- this.httpdCollaborationBecameUnavailable = true;
- errorMessage = HttpdCollaborationUtil.encodeErrorMessage(e2);
- }
-
- if (errorMessage == null && this.httpdCollaborationBecameUnavailable) {
- // If we reach this point, httpd-collaboration became
- // unavailable at some point in time; re-enable shared displays
- // in CAVE for all users.
- this.broadcastMessage(HTTPD_COLLABORATION_CONFIGURATION);
- this.httpdCollaborationBecameUnavailable = false;
- } else {
- // Broadcast to all users that httpd-collaboration is no longer
- // available; shared displays in CAVE will be disabled
- this.broadcastMessage(errorMessage);
- }
- }
-
- private synchronized void broadcastMessage(String body) {
- Message message = ConfigurationPacket.createMessage(body);
- this.sessionManager.broadcast(message);
- }
-}
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/AbstractConfigHandler.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/AbstractConfigHandler.java
new file mode 100644
index 0000000000..447ba60350
--- /dev/null
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/AbstractConfigHandler.java
@@ -0,0 +1,301 @@
+/**
+ * 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.openfire.plugin.configuration.collaboration.iq;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.tree.DefaultElement;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.PrivateStorage;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.auth.UnauthorizedException;
+import org.jivesoftware.openfire.disco.ServerFeaturesProvider;
+import org.jivesoftware.openfire.handler.IQHandler;
+import org.jivesoftware.util.JiveGlobals;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.IQ.Type;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.PacketError.Condition;
+
+/**
+ * Base IQ handler for configuration over XMPP
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 12, 2014 2756 bclement Initial creation
+ *
+ *
+ *
+ * @author bclement
+ * @version 1.0
+ */
+public abstract class AbstractConfigHandler extends IQHandler implements
+ ServerFeaturesProvider {
+
+ public static final String DATASERVER_USERS_KEY = "plugin.collaboration.dataserver.users";
+
+ public static final String QUERY_ELEMENT_NAME = "query";
+
+ public static final String COLLAB_XMLNS = "urn:uf:viz:collaboration";
+
+ private static final Logger log = LoggerFactory
+ .getLogger(AbstractConfigHandler.class);
+
+ protected final IQHandlerInfo info;
+
+ protected final List features;
+
+ protected final PrivateStorage storage;
+
+
+ /**
+ * @param moduleName
+ * display name for handler
+ * @param features
+ * xmlns strings for features
+ * @param info
+ * qualified name registration information
+ */
+ public AbstractConfigHandler(String moduleName, List features,
+ IQHandlerInfo info) {
+ super(moduleName);
+ this.info = info;
+ this.features = features;
+ this.storage = XMPPServer.getInstance().getPrivateStorage();
+ }
+
+ /* (non-Javadoc)
+ * @see org.jivesoftware.openfire.handler.IQHandler#getInfo()
+ */
+ @Override
+ public IQHandlerInfo getInfo() {
+ return info;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jivesoftware.openfire.handler.IQHandler#handleIQ(org.xmpp.packet.IQ)
+ */
+ @Override
+ public IQ handleIQ(IQ packet) throws UnauthorizedException {
+ Type type = packet.getType();
+ IQ rval;
+ switch (type) {
+ case get:
+ rval = handleGet(packet);
+ break;
+ case set:
+ rval = handleSet(packet);
+ break;
+ default:
+ rval = createError(packet, new PacketError(Condition.bad_request));
+ }
+ return rval;
+ }
+
+ /**
+ * Process get request
+ *
+ * @param packet
+ * request packet
+ * @return
+ * @throws UnauthorizedException
+ */
+ abstract protected IQ handleGet(IQ packet) throws UnauthorizedException;
+
+ /**
+ * Process set request
+ *
+ * @param packet
+ * request packet
+ * @return
+ * @throws UnauthorizedException
+ */
+ abstract protected IQ handleSet(IQ packet) throws UnauthorizedException;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jivesoftware.openfire.disco.ServerFeaturesProvider#getFeatures()
+ */
+ @Override
+ public Iterator getFeatures() {
+ return features.iterator();
+ }
+
+ /**
+ * Create error response packet
+ *
+ * @param request
+ * @param error
+ * @return
+ */
+ protected static IQ createError(IQ request, PacketError error) {
+ Element child = request.getChildElement();
+ child.setParent(null);
+ IQ rval = IQ.createResultIQ(request);
+ rval.setType(Type.error);
+ rval.setChildElement(child);
+ rval.setError(error);
+ return rval;
+ }
+
+ /**
+ * Get first child of parent found with qualified name
+ *
+ * @param parent
+ * @param name
+ * @param namespace
+ * @return
+ * @throws Exception
+ * if no child can be found
+ */
+ @SuppressWarnings("unchecked")
+ protected static Element getChildElement(Element parent, String name,
+ String namespace) throws Exception {
+ Element rval = null;
+ Iterator iter = parent.elementIterator();
+ while (iter.hasNext()) {
+ Element child = iter.next();
+ if (child != null && child.getName().equals(name)
+ && child.getNamespace().getURI().equals(namespace)) {
+ rval = child;
+ break;
+ }
+ }
+ if (rval == null) {
+ log.debug("Missing Data Element: " + parent.asXML());
+ String msg = "Missing Required Child Element: " + namespace + " "
+ + name;
+ throw new Exception(msg);
+ }
+ return rval;
+ }
+
+ /**
+ * Remove all child elements from e
+ *
+ * @param e
+ */
+ @SuppressWarnings("unchecked")
+ protected static void removeChildren(Element e) {
+ Iterator iter = e.elementIterator();
+ while (iter.hasNext()) {
+ e.remove(iter.next());
+ }
+ }
+
+ /**
+ * @param id
+ * @return true if id is in the list of dataserver users
+ */
+ protected static boolean isDataServerUser(JID id) {
+ String usersStr = JiveGlobals.getProperty(DATASERVER_USERS_KEY, "");
+ // this will work if the dataserver user is set to a single account or a
+ // comma separated list or is blank
+ for (String user : StringUtils.split(usersStr, ',')) {
+ if (StringUtils.isBlank(user)) {
+ continue;
+ }
+ user = user.trim();
+ if (id.toBareJID().equals(user)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Return the primary dataserver which is the first item in the list of
+ * dataserver users
+ *
+ * @return null if none found
+ */
+ public static String getPrimaryDataServer() {
+ String usersStr = JiveGlobals.getProperty(DATASERVER_USERS_KEY, "");
+ String[] users = StringUtils.split(usersStr, ',');
+ if (users.length < 1) {
+ return null;
+ }
+ // primary server is the only one or first in list
+ return users[0];
+ }
+
+ /**
+ * Retrieve data from private storage
+ *
+ * @param requestPacket
+ * request IQ for data
+ * @param id
+ * user id that data is stored under
+ * @param key
+ * empty xml element with qualified name
+ * @return
+ */
+ protected IQ retrieve(IQ requestPacket, String id, Element key) {
+ Element queryElem = requestPacket.getChildElement();
+ Element respElem = storage.get(id, key);
+ IQ rval = IQ.createResultIQ(requestPacket);
+ queryElem.setParent(null);
+ removeChildren(queryElem);
+ queryElem.add(respElem);
+ rval.setChildElement(queryElem);
+ return rval;
+ }
+
+ /**
+ * Store to private data. NOTE: only child XML elements of the root data
+ * element will be retrievable. No attributes in the root element will be
+ * retrievable.
+ *
+ * @param id
+ * user id to store data under
+ * @param data
+ * xml element with data
+ */
+ protected void store(String id, Element data) {
+ storage.add(id, data);
+ }
+
+ /**
+ * Create empty xml element using qualified name
+ *
+ * @param name
+ * @param namespace
+ * @return
+ */
+ protected static Element createElement(String name, String namespace) {
+ return new DefaultElement(name, new Namespace(null, namespace));
+ }
+
+}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/DataAuthHandler.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/DataAuthHandler.java
new file mode 100644
index 0000000000..8b39394a7d
--- /dev/null
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/DataAuthHandler.java
@@ -0,0 +1,184 @@
+/**
+ * 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.openfire.plugin.configuration.collaboration.iq;
+
+import java.util.Arrays;
+
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Element;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.auth.UnauthorizedException;
+import org.jivesoftware.openfire.pubsub.Node;
+import org.jivesoftware.openfire.pubsub.PubSubModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.PacketError.Condition;
+
+/**
+ * IQ handle for dataserver authorization and authentication. Stores client
+ * public keys and authorizes key use for pubsub nodes.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 10, 2014 2756 bclement Initial creation
+ *
+ *
+ *
+ * @author bclement
+ * @version 1.0
+ */
+public class DataAuthHandler extends AbstractConfigHandler {
+
+ public static final String AUTH_QUERY_XMLNS = "urn:uf:viz:collaboration:iq:auth";
+
+ public static final String INFO_ELEMENT_NAME = "authinfo";
+
+ public static final String PUBKEY_ELEMENT_NAME = "publickey";
+
+ public static final String ALG_ATTRIBUTE = "algorithm";
+
+ public static final String JID_ATTRIBUTE = "jid";
+
+ public static final String SESSIONID_ATTRIBUTE = "sessionid";
+
+ private static final Logger log = LoggerFactory
+ .getLogger(DataAuthHandler.class);
+
+ private final PubSubModule pubsub;
+
+ /**
+ * @param moduleName
+ */
+ public DataAuthHandler() {
+ super("Collaboration Auth Query Handler", Arrays
+ .asList(AUTH_QUERY_XMLNS), new IQHandlerInfo(
+ QUERY_ELEMENT_NAME, AUTH_QUERY_XMLNS));
+ this.pubsub = XMPPServer.getInstance().getPubSubModule();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.raytheon.openfire.plugin.configuration.collaboration.iq.
+ * AbstractConfigHandler#handleGet(org.xmpp.packet.IQ)
+ */
+ @Override
+ protected IQ handleGet(IQ packet) throws UnauthorizedException {
+ JID from = packet.getFrom();
+ String fromBare = from.toBareJID();
+ Element queryElem = packet.getChildElement();
+ String jid = queryElem.attributeValue(JID_ATTRIBUTE);
+ if (jid != null) {
+ if (!jid.equals(fromBare) && !isDataServerUser(from)) {
+ log.debug("User not authorized: " + from.toFullJID());
+ throw new UnauthorizedException(
+ "User not authorized for service: "
+ + from.toFullJID());
+ }
+ } else {
+ jid = fromBare;
+ }
+ JID target = new JID(jid);
+ String sessionId = queryElem.attributeValue(SESSIONID_ATTRIBUTE);
+ if (StringUtils.isBlank(sessionId)) {
+ String msg = "Missing attribute: " + SESSIONID_ATTRIBUTE;
+ log.debug(msg);
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, msg));
+ }
+ Node node = pubsub.getNode(sessionId);
+ if (node == null) {
+ String msg = "No topic found for session: " + sessionId;
+ log.debug(msg);
+ return createError(packet, new PacketError(Condition.not_allowed,
+ PacketError.Type.cancel, msg));
+ }
+ if (!isOwner(jid, node)){
+ String msg = "User '" + jid + "' is not an owner of session '"
+ + sessionId + "'";
+ log.debug(msg);
+ return createError(packet, new PacketError(Condition.not_allowed,
+ PacketError.Type.cancel, msg));
+ }
+ return retrieve(packet, target.getNode(),
+ createElement(INFO_ELEMENT_NAME, COLLAB_XMLNS));
+ }
+
+
+ /**
+ * @param jid
+ * @param node
+ * @return true if user with jid is owner of node
+ */
+ private boolean isOwner(String jid, Node node) {
+ for (JID owner : node.getOwners()) {
+ if (jid.equals(owner.toBareJID())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.raytheon.openfire.plugin.configuration.collaboration.iq.
+ * AbstractConfigHandler#handleSet(org.xmpp.packet.IQ)
+ */
+ @Override
+ protected IQ handleSet(IQ packet) {
+ Element queryElem = packet.getChildElement();
+ Element infoElem;
+ Element pubkeyElem;
+ try {
+ infoElem = getChildElement(queryElem, INFO_ELEMENT_NAME,
+ COLLAB_XMLNS);
+ pubkeyElem = getChildElement(infoElem, PUBKEY_ELEMENT_NAME,
+ COLLAB_XMLNS);
+ } catch (Exception e) {
+ log.debug("Missing Required Element in packet: " + packet.toXML(),
+ e);
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, e.getLocalizedMessage()));
+ }
+ String pubKey = pubkeyElem.getText();
+ if (StringUtils.isBlank(pubKey)) {
+ log.debug("Missing Public Key Text");
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, "Missing Required Text Body"));
+ }
+ if (StringUtils.isBlank(pubkeyElem.attributeValue(ALG_ATTRIBUTE))) {
+ String msg = "Missing attribute: " + ALG_ATTRIBUTE;
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, msg));
+ }
+ store(packet.getFrom().getNode(), infoElem);
+ return IQ.createResultIQ(packet);
+ }
+
+}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/HttpAddressHandler.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/HttpAddressHandler.java
new file mode 100644
index 0000000000..854ddc50c7
--- /dev/null
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/iq/HttpAddressHandler.java
@@ -0,0 +1,177 @@
+/**
+ * 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.openfire.plugin.configuration.collaboration.iq;
+
+import java.util.Arrays;
+
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Element;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.auth.UnauthorizedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.JID;
+import org.xmpp.packet.PacketError;
+import org.xmpp.packet.PacketError.Condition;
+
+
+/**
+ * IQ handler for dataservers to store URL configuration
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 11, 2014 2756 bclement Initial creation
+ *
+ *
+ *
+ * @author bclement
+ * @version 1.0
+ */
+public class HttpAddressHandler extends AbstractConfigHandler {
+
+ private static final Logger log = LoggerFactory
+ .getLogger(HttpAddressHandler.class);
+
+ public static final String HTTP_QUERY_XMLNS = "urn:uf:viz:collaboration:iq:http";
+
+ public static final String HTTP_ELEMENT_NAME = "httpinfo";
+
+ public static final String URL_ELEMENT_NAME = "url";
+
+ public HttpAddressHandler() {
+ super("Collaboration Dataserver HTTP Address Handler", Arrays
+ .asList(HTTP_QUERY_XMLNS), new IQHandlerInfo(
+ QUERY_ELEMENT_NAME, HTTP_QUERY_XMLNS));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * com.raytheon.openfire.plugin.configuration.collaboration.AbstractHandler
+ * #handleGet(org.xmpp.packet.IQ)
+ */
+ @Override
+ protected IQ handleGet(IQ packet) throws UnauthorizedException {
+ String dataserver = getPrimaryDataServer();
+ if (dataserver == null) {
+ // no dataserver configured, return empty response
+ return IQ.createResultIQ(packet);
+ }
+ JID target = new JID(dataserver);
+ return retrieve(packet, target.getNode(),
+ createElement(HTTP_ELEMENT_NAME, COLLAB_XMLNS));
+ }
+
+ /**
+ * Set http address for dataserver user with id.
+ *
+ * @param id
+ * @param url
+ */
+ public void setHttpAddress(String id, String url) {
+ Element httpElem = createElement(HTTP_ELEMENT_NAME, COLLAB_XMLNS);
+ Element urlElement = createElement(URL_ELEMENT_NAME, COLLAB_XMLNS);
+ urlElement.setText(url);
+ urlElement.setParent(null);
+ httpElem.add(urlElement);
+ JID target = new JID(id);
+ store(target.getNode(), httpElem);
+ }
+
+ /**
+ * Remove http address for dataserver user with id.
+ *
+ * @param id
+ * @param url
+ */
+ public void removeHttpAddress(String id, String url) {
+ JID target = new JID(id);
+ store(target.getNode(), createElement(HTTP_ELEMENT_NAME, COLLAB_XMLNS));
+ }
+
+ /**
+ * Get http address for dataserver user with id.
+ *
+ * @param id
+ * @return
+ */
+ public String getHttpAddress(String id) {
+ JID target = new JID(id);
+ Element respElem = storage.get(target.getNode(),
+ createElement(HTTP_ELEMENT_NAME, COLLAB_XMLNS));
+ Element urlElem;
+ try {
+ urlElem = getChildElement(respElem, URL_ELEMENT_NAME, COLLAB_XMLNS);
+ } catch (Exception e) {
+ // missing url element, no url configured
+ return null;
+ }
+ String rval = urlElem.getText();
+ if (StringUtils.isBlank(rval)) {
+ return null;
+ }
+ return rval.trim();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * com.raytheon.openfire.plugin.configuration.collaboration.AbstractHandler
+ * #handleSet(org.xmpp.packet.IQ)
+ */
+ @Override
+ protected IQ handleSet(IQ packet) throws UnauthorizedException {
+ JID from = packet.getFrom();
+ if (!isDataServerUser(from)) {
+ String msg = "User not authorized for service: " + from.toFullJID();
+ log.debug(msg);
+ throw new UnauthorizedException(msg);
+ }
+ Element queryElem = packet.getChildElement();
+ Element infoElem;
+ Element urlElem;
+ try {
+ infoElem = getChildElement(queryElem, HTTP_ELEMENT_NAME,
+ COLLAB_XMLNS);
+ urlElem = getChildElement(infoElem, URL_ELEMENT_NAME, COLLAB_XMLNS);
+ } catch (Exception e) {
+ log.debug("Missing Required Element in packet: " + packet.toXML(),
+ e);
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, e.getLocalizedMessage()));
+ }
+ String url = urlElem.getText();
+ if (StringUtils.isBlank(url)) {
+ log.debug("Missing HTTP URL Text");
+ return createError(packet, new PacketError(Condition.bad_request,
+ PacketError.Type.modify, "Missing Required Text Body"));
+ }
+ store(packet.getFrom().getNode(), infoElem);
+ return IQ.createResultIQ(packet);
+ }
+
+}
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/HttpdCollaborationSessionEventListener.java b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/CollaborationSessionEventListener.java
similarity index 69%
rename from javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/HttpdCollaborationSessionEventListener.java
rename to javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/CollaborationSessionEventListener.java
index 5754237409..86da9ff5d1 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/HttpdCollaborationSessionEventListener.java
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/java/com/raytheon/openfire/plugin/configuration/collaboration/listener/CollaborationSessionEventListener.java
@@ -25,16 +25,11 @@ import org.jivesoftware.openfire.MessageRouter;
import org.jivesoftware.openfire.event.SessionEventListener;
import org.jivesoftware.openfire.session.Session;
import org.jivesoftware.util.TaskEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xmpp.packet.JID;
import org.xmpp.packet.Message;
import com.raytheon.openfire.plugin.configuration.collaboration.configuration.ConfigurationPacket;
-import com.raytheon.openfire.plugin.configuration.collaboration.exception.HttpdCollaborationNotRunningException;
-import com.raytheon.openfire.plugin.configuration.collaboration.exception.HttpdCollaborationStatusException;
-import com.raytheon.openfire.plugin.configuration.collaboration.httpd.HttpdCollaborationStatusMonitor;
-import com.raytheon.openfire.plugin.configuration.collaboration.util.HttpdCollaborationUtil;
+import com.raytheon.openfire.plugin.configuration.collaboration.http.HttpStatusMonitor;
/**
* Impelements @{link SessionEventListener} to wait for new users to connect to
@@ -48,23 +43,18 @@ import com.raytheon.openfire.plugin.configuration.collaboration.util.HttpdCollab
* ------------ ---------- ----------- --------------------------
* Aug 07, 2012 bkowal Initial creation
* Jan 06, 2013 2563 bclement replaced chat message with packet extension
+ * Feb 14, 2013 2756 bclement refactor for operation with generic http dataserver
*
*
*
* @author bkowal
* @version 1.0
*/
-public class HttpdCollaborationSessionEventListener implements
- SessionEventListener {
- private static final Logger logger = LoggerFactory
- .getLogger(HttpdCollaborationSessionEventListener.class);
-
- // provided by the configuration
- private String HTTPD_COLLABORATION_CONFIGURATION;
+public class CollaborationSessionEventListener implements SessionEventListener {
private static final int MSG_SEND_DELAY = 5000;
- private HttpdCollaborationStatusMonitor httpdCollaborationStatusMonitor;
+ private HttpStatusMonitor statusMonitor;
private JID serverAddress;
@@ -73,9 +63,7 @@ public class HttpdCollaborationSessionEventListener implements
/**
*
*/
- public HttpdCollaborationSessionEventListener(
- String _httpdCollaborationConfiguration) {
- HTTPD_COLLABORATION_CONFIGURATION = _httpdCollaborationConfiguration;
+ public CollaborationSessionEventListener() {
this.serverAddress = null;
this.router = null;
}
@@ -129,6 +117,10 @@ public class HttpdCollaborationSessionEventListener implements
*/
@Override
public void sessionCreated(Session session) {
+ String body = this.composeMessageBody();
+ if (body == null) {
+ return;
+ }
final Message message = ConfigurationPacket.createMessage(this
.composeMessageBody());
message.setTo(session.getAddress());
@@ -157,27 +149,12 @@ public class HttpdCollaborationSessionEventListener implements
private String composeMessageBody() {
// Verify that httpd-collaboration is / is still running.
- try {
- this.httpdCollaborationStatusMonitor.statusHttpdCollaboration();
- } catch (HttpdCollaborationNotRunningException e1) {
- logger.error("httpd-collaboration is not running.", e1);
- return HttpdCollaborationUtil.encodeErrorMessage(e1);
- } catch (HttpdCollaborationStatusException e2) {
- logger.error(
- "failed to determine the status of httpd-collaboration", e2);
- return HttpdCollaborationUtil.encodeErrorMessage(e2);
- } catch (Exception e3) {
- logger.error("Unexpected exception occurred!", e3);
- return HttpdCollaborationUtil.encodeErrorMessage(e3);
- }
-
- return HTTPD_COLLABORATION_CONFIGURATION;
+ return statusMonitor.getCurrentUrlConfig();
}
- public void setHttpdCollaborationStatusChecker(
- HttpdCollaborationStatusMonitor httpdCollaborationStatusMonitor) {
- this.httpdCollaborationStatusMonitor = httpdCollaborationStatusMonitor;
- }
+ public void setHttpStatusChecker(HttpStatusMonitor httpStatusMonitor) {
+ this.statusMonitor = httpStatusMonitor;
+ }
/**
* @param serverAddress
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/plugin.xml b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/plugin.xml
index ed1e35899e..ee9b9ac8d2 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/plugin.xml
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/plugin.xml
@@ -1,23 +1,23 @@
- com.raytheon.openfire.plugin.configuration.collaboration.HttpdCollaborationConfigurationPlugin
- Httpd Collaboration Configuration
+ com.raytheon.openfire.plugin.configuration.collaboration.HttpConfigurationPlugin
+ Http Collaboration Configuration
- This plugin will provide httpd collaboration configuration information to CAVE
+ This plugin will provide http collaboration configuration information to CAVE
via openfire whenever a user logs in to openfire.
bkowal
- 1.0.0
+ 2.0.0
8/08/2012
3.7.1
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/setup.xml b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/setup.xml
index 6712b0666e..5f82ba2a4e 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/setup.xml
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/setup.xml
@@ -15,7 +15,7 @@
extract dependency information from the plugin manifest.
-->
+ value="org.apache.commons.collections,org.apache.http" />
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/httpd-collaboration-monitor-admin.jsp b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/http-collaboration-monitor-admin.jsp
similarity index 60%
rename from javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/httpd-collaboration-monitor-admin.jsp
rename to javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/http-collaboration-monitor-admin.jsp
index 35e81226cc..9ad981c530 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/httpd-collaboration-monitor-admin.jsp
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/web/http-collaboration-monitor-admin.jsp
@@ -1,6 +1,6 @@
<%@ page
import="org.jivesoftware.openfire.XMPPServer,
- com.raytheon.openfire.plugin.configuration.collaboration.HttpdCollaborationConfigurationPlugin,
+ com.raytheon.openfire.plugin.configuration.collaboration.HttpConfigurationPlugin,
org.jivesoftware.util.ParamUtils,
java.util.HashMap,
java.util.Map"
@@ -12,31 +12,33 @@
<%
final long DEFAULT_INTERVAL_S = 60;
boolean save = ((request.getParameter("save") == null) == false);
-
- // Currently, users are not allowed to modify the httpd-collaboration location
- // because the rpm is not relocatable.
long interval = ParamUtils.getLongParameter(request, "txtInterval", DEFAULT_INTERVAL_S);
boolean legacy = ParamUtils.getBooleanParameter(request, "chkLegacy", false);
+ String dataserverUsers = ParamUtils.getParameter(request, "txtdataserverUsers", true);
+ if (dataserverUsers == null){
+ dataserverUsers = "";
+ }
- HttpdCollaborationConfigurationPlugin plugin = (HttpdCollaborationConfigurationPlugin) XMPPServer.getInstance().getPluginManager().getPlugin("com.raytheon.openfire.plugin.configuration.collaboration");
+ HttpConfigurationPlugin plugin = (HttpConfigurationPlugin) XMPPServer.getInstance().getPluginManager().getPlugin("com.raytheon.openfire.plugin.configuration.collaboration");
if (save)
{
- plugin.setHttpdMonitorInterval(interval * 1000);
+ plugin.setHttpMonitorInterval(interval * 1000);
plugin.setLegacySupport(legacy);
- response.sendRedirect("httpd-collaboration-monitor-admin.jsp?settingsSaved=true");
+ plugin.setDataserverUsers(dataserverUsers);
+ response.sendRedirect("http-collaboration-monitor-admin.jsp?settingsSaved=true");
return;
}
- String location = plugin.getHttpdCollaborationLocation();
- interval = (plugin.getHttpdMonitorInterval() / 1000);
+ interval = (plugin.getHttpMonitorInterval() / 1000);
String legacyChkValue = plugin.hasLegacySupport() ? "checked" : "";
+ dataserverUsers = plugin.getDataserverUsers();
%>
- Httpd Collaboration Monitor Settings
-
+ Http Collaboration Monitor Settings
+
-