ofmeet plugin version 0.2.2.

Reverted Jitsi Videobridge latest code because of issues on linux builds

src/plugins/ofmeet/changelog.html

@@ -49,6 +49,12 @@
     Openfire Meetings Plugin Changelog
 </h1>
 
+<p><b>0.2.2</b> -- Oct 9th, 2015</p>
+
+<ul>
+    <li>Reverted Jitsi Videobridge latest code because of issues on linux builds</li>
+</ul>
+
 <p><b>0.2.1</b> -- Oct 8th, 2015</p>
 
 <ul>

src/plugins/ofmeet/lib/logging.properties

 
 handlers= java.util.logging.ConsoleHandler
-#handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler
 
 java.util.logging.ConsoleHandler.level = ALL
 java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
@@ -9,9 +8,3 @@ java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLo
 
 # FIXME: remove once RTT issue is fixed
 org.jitsi.impl.neomedia.MediaStreamStatsImpl.level=WARNING
\ No newline at end of file
-
-# Syslog(uncomment handler to use)
-com.agafua.syslog.SyslogHandler.transport = udp
-com.agafua.syslog.SyslogHandler.facility = local0
-com.agafua.syslog.SyslogHandler.port = 514
-com.agafua.syslog.SyslogHandler.hostname = localhost

src/plugins/ofmeet/plugin.xml

@@ -5,8 +5,8 @@
     <name>Openfire Meetings</name>
     <description>Provides high quality, scalable video conferences using Jitsi Meet and Jitsi Videobridge</description>
     <author>Ignite Realtime</author>
-    <version>0.2.1</version>
-    <date>10/08/2015</date>
+    <version>0.2.2</version>
+    <date>10/09/2015</date>
     <minServerVersion>3.9.9</minServerVersion>
     
     <adminconsole>

src/plugins/ofmeet/src/java/org/jitsi/videobridge/xmpp/ComponentImpl.java

+/*
+ * Jitsi Videobridge, OpenSource video conferencing.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jitsi.videobridge.xmpp;
+
+import java.util.*;
+
+import net.java.sip.communicator.impl.protocol.jabber.*;
+import net.java.sip.communicator.impl.protocol.jabber.extensions.colibri.*;
+
+import org.jitsi.videobridge.*;
+import org.jitsi.videobridge.osgi.*;
+import org.osgi.framework.*;
+import org.xmpp.component.*;
+import org.xmpp.packet.*;
+import org.xmpp.packet.IQ;
+import org.xmpp.packet.Packet;
+
+/**
+ * Implements <tt>org.xmpp.component.Component</tt> to provide Jitsi Videobridge
+ * as an internal Jabber component.
+ *
+ * @author Lyubomir Marinov
+ */
+public class ComponentImpl
+    extends AbstractComponent
+    implements BundleActivator
+{
+    private static final org.jitsi.util.Logger logger
+            =  org.jitsi.util.Logger.getLogger(ComponentImpl.class);
+
+    /**
+     * The (default) description of <tt>ComponentImpl</tt> instances.
+     */
+    private static final String DESCRIPTION
+        = "Jitsi Videobridge Jabber Component";
+
+    /**
+     * The (default) name of <tt>ComponentImpl</tt> instances.
+     */
+    private static final String NAME = "JitsiVideobridge";
+
+    /**
+     * The (default) sub-domain of the address with which <tt>ComponentImpl</tt>
+     * instances are to be added to their respective <tt>ComponentManager</tt>s.
+     */
+    public static final String SUBDOMAIN = "jitsi-videobridge";
+
+    /**
+     * Gets the <tt>ComponentImpl</tt> instances registered as OSGi services in
+     * a specific <tt>BundleContext</tt>.
+     *
+     * @param bundleContext the <tt>BundleContext</tt> from which the registered
+     * <tt>ComponentImpl</tt> instances registered as OSGi services are to be
+     * returned
+     * @return the <tt>ComponentImpl</tt> instances registered as OSGi services
+     * in the specified <tt>bundleContext</tt>
+     */
+    public static Collection<ComponentImpl> getComponents(
+            BundleContext bundleContext)
+    {
+        return ServiceUtils2.getServices(bundleContext, ComponentImpl.class);
+    }
+
+    /**
+     * Logs a specific <tt>String</tt> at debug level.
+     *
+     * @param s the <tt>String</tt> to log at debug level
+     */
+    private static void logd(String s)
+    {
+        logger.info(s);
+    }
+
+    /**
+     * Logs a specific <tt>Throwable</tt> at error level.
+     *
+     * @param t the <tt>Throwable</tt> to log at error level
+     */
+    private static void loge(Throwable t)
+    {
+        t.printStackTrace(System.err);
+    }
+
+    /**
+     * The <tt>BundleContext</tt> in which this instance has been started as an
+     * OSGi bundle.
+     */
+    private BundleContext bundleContext;
+
+    /**
+     * Initializes a new <tt>ComponentImpl</tt> instance.
+     */
+    public ComponentImpl()
+    {
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Gets the namespaces of features that this <tt>Component</tt>
+     * offers/supports i.e. {@link ColibriConferenceIQ#NAMESPACE}.
+     */
+    @Override
+    protected String[] discoInfoFeatureNamespaces()
+    {
+        return
+            new String[]
+                    {
+                        ColibriConferenceIQ.NAMESPACE,
+                        ProtocolProviderServiceJabberImpl
+                            .URN_XMPP_JINGLE_DTLS_SRTP,
+                        ProtocolProviderServiceJabberImpl
+                            .URN_XMPP_JINGLE_ICE_UDP_1,
+                        ProtocolProviderServiceJabberImpl
+                            .URN_XMPP_JINGLE_RAW_UDP_0
+                    };
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Gets the type of the Service Discovery Identity of this
+     * <tt>Component</tt> i.e. &quot;conference&quot;.
+     */
+    @Override
+    protected String discoInfoIdentityCategoryType()
+    {
+        return "conference";
+    }
+
+    /**
+     * Gets the OSGi <tt>BundleContext</tt> in which this Jabber component is
+     * executing.
+     *
+     * @return the OSGi <tt>BundleContext</tt> in which this Jabber component is
+     * executing
+     */
+    public BundleContext getBundleContext()
+    {
+        return bundleContext;
+    }
+
+    /**
+     * Gets the description of this <tt>Component</tt>.
+     *
+     * @return the description of this <tt>Component</tt>
+     * @see Component#getDescription()
+     */
+    @Override
+    public String getDescription()
+    {
+        return DESCRIPTION;
+    }
+
+    /**
+     * Gets the name of this <tt>Component</tt>.
+     *
+     * @return the name of this <tt>Component</tt>
+     * @see Component#getName()
+     */
+    @Override
+    public String getName()
+    {
+        return NAME;
+    }
+
+    public Videobridge getVideobridge()
+    {
+        BundleContext bundleContext = getBundleContext();
+        Videobridge videobridge;
+
+        if (bundleContext == null)
+        {
+            videobridge = null;
+        }
+        else
+        {
+            videobridge
+                = ServiceUtils2.getService(bundleContext, Videobridge.class);
+        }
+        return videobridge;
+    }
+
+    /**
+     * Handles a <tt>ColibriConferenceIQ</tt> stanza which represents a request.
+     *
+     * @param conferenceIQ the <tt>ColibriConferenceIQ</tt> stanza represents
+     * the request to handle
+     * @return an <tt>org.jivesoftware.smack.packet.IQ</tt> stanza which
+     * represents the response to the specified request or <tt>null</tt> to
+     * reply with <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     */
+    private org.jivesoftware.smack.packet.IQ handleColibriConferenceIQ(
+            ColibriConferenceIQ conferenceIQ)
+        throws Exception
+    {
+        Videobridge videobridge = getVideobridge();
+        org.jivesoftware.smack.packet.IQ iq;
+
+        if (videobridge == null)
+            iq = null;
+        else
+            iq = videobridge.handleColibriConferenceIQ(conferenceIQ);
+        return iq;
+    }
+
+    /**
+     * Handles a <tt>GracefulShutdownIQ</tt> stanza which represents a request.
+     *
+     * @param shutdownIQ the <tt>GracefulShutdownIQ</tt> stanza represents
+     * the request to handle
+     * @return an <tt>org.jivesoftware.smack.packet.IQ</tt> stanza which
+     * represents the response to the specified request or <tt>null</tt> to
+     * reply with <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     */
+    private org.jivesoftware.smack.packet.IQ handleGracefulShutdownIQ(
+            GracefulShutdownIQ shutdownIQ)
+        throws Exception
+    {
+        Videobridge videobridge = getVideobridge();
+        org.jivesoftware.smack.packet.IQ iq;
+
+        if (videobridge == null)
+            iq = null;
+        else
+            iq = videobridge.handleGracefulShutdownIQ(shutdownIQ);
+        return iq;
+    }
+
+    /**
+     * Handles an <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>get</tt> or
+     * <tt>set</tt> which represents a request. Converts the specified
+     * <tt>org.xmpp.packet.IQ</tt> to an
+     * <tt>org.jivesoftware.smack.packet.IQ</tt> stanza, handles the Smack
+     * stanza via a call to {@link #handleIQ(org.jivesoftware.smack.packet.IQ)},
+     * converts the result Smack stanza to an <tt>org.xmpp.packet.iQ</tt> which
+     * is returned as the response to the request.
+     *
+     * @param iq the <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>get</tt> or
+     * <tt>set</tt> which represents the request to handle
+     * @return an <tt>org.xmpp.packet.IQ</tt> stanza which represents the
+     * response to the specified request or <tt>null</tt> to reply with
+     * <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     */
+    private IQ handleIQ(IQ iq)
+        throws Exception
+    {
+        try
+        {
+            logd("RECV: " + iq.toXML());
+
+            org.jivesoftware.smack.packet.IQ smackIQ = IQUtils.convert(iq);
+            org.jivesoftware.smack.packet.IQ resultSmackIQ = handleIQ(smackIQ);
+            IQ resultIQ;
+
+            if (resultSmackIQ == null)
+            {
+                resultIQ = null;
+            }
+            else
+            {
+                resultIQ = IQUtils.convert(resultSmackIQ);
+
+                logd("SENT: " + resultIQ.toXML());
+            }
+
+            return resultIQ;
+        }
+        catch (Exception e)
+        {
+            loge(e);
+            throw e;
+        }
+    }
+
+    /**
+     * Handles an <tt>org.jivesoftware.smack.packet.IQ</tt> stanza of type
+     * <tt>get</tt> or <tt>set</tt> which represents a request.
+     *
+     * @param iq the <tt>org.jivesoftware.smack.packet.IQ</tt> stanza of type
+     * <tt>get</tt> or <tt>set</tt> which represents the request to handle
+     * @return an <tt>org.jivesoftware.smack.packet.IQ</tt> stanza which
+     * represents the response to the specified request or <tt>null</tt> to
+     * reply with <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     */
+    private org.jivesoftware.smack.packet.IQ handleIQ(
+            org.jivesoftware.smack.packet.IQ iq)
+        throws Exception
+    {
+        org.jivesoftware.smack.packet.IQ responseIQ = null;
+
+        if (iq != null)
+        {
+            org.jivesoftware.smack.packet.IQ.Type type = iq.getType();
+
+            if (org.jivesoftware.smack.packet.IQ.Type.GET.equals(type)
+                    || org.jivesoftware.smack.packet.IQ.Type.SET.equals(type))
+            {
+                responseIQ = handleIQRequest(iq);
+                if (responseIQ != null)
+                {
+                    responseIQ.setFrom(iq.getTo());
+                    responseIQ.setPacketID(iq.getPacketID());
+                    responseIQ.setTo(iq.getFrom());
+                }
+            }
+            else if (org.jivesoftware.smack.packet.IQ.Type.ERROR.equals(type)
+                    || org.jivesoftware.smack.packet.IQ.Type.RESULT.equals(
+                            type))
+            {
+                handleIQResponse(iq);
+            }
+        }
+        return responseIQ;
+    }
+
+    @Override
+    protected void handleIQError(IQ iq)
+    {
+        super.handleIQError(iq);
+
+        try
+        {
+            handleIQ(iq);
+        }
+        catch (Exception e)
+        {
+            logd("An error occurred while trying to handle error IQ.");
+            loge(e);
+        }
+    }
+
+    /**
+     * Handles an <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>get</tt> which
+     * represents a request.
+     *
+     * @param iq the <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>get</tt>
+     * which represents the request to handle
+     * @return an <tt>org.xmpp.packet.IQ</tt> stanza which represents the
+     * response to the specified request or <tt>null</tt> to reply with
+     * <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     * @see AbstractComponent#handleIQGet(IQ)
+     */
+    @Override
+    protected IQ handleIQGet(IQ iq)
+        throws Exception
+    {
+        IQ resultIQ = handleIQ(iq);
+
+        return (resultIQ == null) ? super.handleIQGet(iq) : resultIQ;
+    }
+
+    private org.jivesoftware.smack.packet.IQ handleIQRequest(
+            org.jivesoftware.smack.packet.IQ request)
+        throws Exception
+    {
+        /*
+         * Requests can be categorized in pieces of Videobridge functionality
+         * based on the org.jivesoftware.smack.packet.IQ runtime type (of their
+         * child element) and forwarded to specialized Videobridge methods for
+         * convenience.
+         */
+        org.jivesoftware.smack.packet.IQ response;
+
+        if (request instanceof ColibriConferenceIQ)
+            response = handleColibriConferenceIQ((ColibriConferenceIQ) request);
+        else if (request instanceof GracefulShutdownIQ)
+            response = handleGracefulShutdownIQ((GracefulShutdownIQ)request);
+        else
+            response = null;
+        return response;
+    }
+
+    private void handleIQResponse(org.jivesoftware.smack.packet.IQ response)
+        throws Exception
+    {
+        /*
+         * Requests can be categorized in pieces of Videobridge functionality
+         * based on the org.jivesoftware.smack.packet.IQ runtime type (of their
+         * child element) and forwarded to specialized Videobridge methods for
+         * convenience. However, responses cannot be categorized because they
+         * care the id of their respective requests only.
+         */
+        Videobridge videobridge = getVideobridge();
+
+        if (videobridge != null)
+            videobridge.handleIQResponse(response);
+    }
+
+    @Override
+    protected void handleIQResult(IQ iq)
+    {
+        super.handleIQResult(iq);
+
+        try
+        {
+            handleIQ(iq);
+        }
+        catch (Exception e)
+        {
+            logd("An error occurred while trying to handle result IQ.");
+            loge(e);
+        }
+    }
+
+    /**
+     * Handles an <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>set</tt> which
+     * represents a request.
+     *
+     * @param iq the <tt>org.xmpp.packet.IQ</tt> stanza of type <tt>set</tt>
+     * which represents the request to handle
+     * @return an <tt>org.xmpp.packet.IQ</tt> stanza which represents the
+     * response to the specified request or <tt>null</tt> to reply with
+     * <tt>feature-not-implemented</tt>
+     * @throws Exception to reply with <tt>internal-server-error</tt> to the
+     * specified request
+     * @see AbstractComponent#handleIQSet(IQ)
+     */
+    @Override
+    protected IQ handleIQSet(IQ iq)
+        throws Exception
+    {
+        IQ resultIQ = handleIQ(iq);
+
+        return (resultIQ == null) ? super.handleIQSet(iq) : resultIQ;
+    }
+
+    /**
+     * Called as part of the execution of {@link AbstractComponent#shutdown()}
+     * to enable this <tt>Component</tt> to finish cleaning resources up after
+     * it gets completely shutdown.
+     *
+     * @see AbstractComponent#postComponentShutdown()
+     */
+    @Override
+    public void postComponentShutdown()
+    {
+        super.postComponentShutdown();
+
+        OSGi.stop(this);
+    }
+
+    /**
+     * Called as part of the execution of {@link AbstractComponent#start()} to
+     * enable this <tt>Component</tt> to finish initializing resources after it
+     * gets completely started.
+     *
+     * @see AbstractComponent#postComponentStart()
+     */
+    @Override
+    public void postComponentStart()
+    {
+        super.postComponentStart();
+
+        OSGi.start(this);
+    }
+
+    /**
+     * Implements a helper to send <tt>org.jivesoftware.smack.packet.IQ</tt>s.
+     *
+     * @param iq the <tt>org.jivesoftware.smack.packet.IQ</tt> to send
+     * @throws Exception if an error occurs during the conversion of the
+     * specified <tt>iq</tt> to an <tt>org.xmpp.packet.IQ</tt> instance or while
+     * sending the specified <tt>iq</tt>
+     */
+    public void send(org.jivesoftware.smack.packet.IQ iq)
+        throws Exception
+    {
+        try
+        {
+            /*
+             * The javadoc on ComponentManager.sendPacket(Component,Packet)
+             * which is invoked by AbstractComponent.send(Packet) says that the
+             * value of the from property of the Packet must not be null;
+             * otherwise, an IllegalArgumentException will be thrown.
+             */
+            String from = iq.getFrom();
+
+            if ((from == null) || (from.length() == 0))
+            {
+                JID fromJID = getJID();
+
+                if (fromJID != null)
+                    iq.setFrom(fromJID.toString());
+            }
+
+            Packet packet = IQUtils.convert(iq);
+
+            send(packet);
+
+            logd("SENT: " + packet.toXML());
+        }
+        catch (Exception e)
+        {
+            loge(e);
+            throw e;
+        }
+    }
+
+    /**
+     * Starts this Jabber component implementation and the Jitsi Videobridge it
+     * provides in a specific OSGi <tt>BundleContext</tt>.
+     *
+     * @param bundleContext the OSGi <tt>BundleContext</tt> in which this Jabber
+     * component implementation and the Jitsi Videobridge it provides are to be
+     * started
+     * @throws Exception if anything irreversible goes wrong while starting this
+     * Jabber component implementation and the Jitsi Videobridge it provides in
+     * the specified <tt>bundleContext</tt>
+     */
+    @Override
+    public void start(BundleContext bundleContext)
+        throws Exception
+    {
+        this.bundleContext = bundleContext;
+
+        // Register this instance as an OSGi service.
+        Collection<ComponentImpl> components = getComponents(bundleContext);
+
+        if (!components.contains(this))
+            bundleContext.registerService(ComponentImpl.class, this, null);
+    }
+
+    /**
+     * Stops this Jabber component implementation and the Jitsi Videobridge it
+     * provides in a specific OSGi <tt>BundleContext</tt>.
+     *
+     * @param bundleContext the OSGi <tt>BundleContext</tt> in which this Jabber
+     * component implementation and the Jitsi Videobridge it provides are to be
+     * stopped
+     * @throws Exception if anything irreversible goes wrong while stopping this
+     * Jabber component implementation and the Jitsi Videobridge it provides in
+     * the specified <tt>bundleContext</tt>
+     */
+    @Override
+    public void stop(BundleContext bundleContext)
+        throws Exception
+    {
+        try
+        {
+            // Unregister this instance as an OSGi service.
+            Collection<ServiceReference<ComponentImpl>> serviceReferences
+                = bundleContext.getServiceReferences(ComponentImpl.class, null);
+
+            if (serviceReferences != null)
+            {
+                for (ServiceReference<ComponentImpl> serviceReference
+                        : serviceReferences)
+                {
+                    Object service = bundleContext.getService(serviceReference);
+
+                    if (service == this)
+                        bundleContext.ungetService(serviceReference);
+                }
+            }
+        }
+        finally
+        {
+            this.bundleContext = null;
+        }
+    }
+}