Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 0 insertions, 145 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java b/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java
deleted file mode 100644
index 7108020..0000000
--- a/src/net/java/sip/communicator/impl/protocol/ssh/SSHActivator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Copyright @ 2015 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.java.sip.communicator.impl.protocol.ssh;
-
-import java.util.*;
-
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
-
-import org.jitsi.service.resources.*;
-import org.osgi.framework.*;
-
-/**
- * Loads the SSH provider factory and registers its services in the OSGI
- * bundle context.
- *
- * @author Shobhit Jindal
- */
-public class SSHActivator
-        implements BundleActivator
-{
-    private static final Logger logger
-            = Logger.getLogger(SSHActivator.class);
-
-    /**
-     * A reference to the registration of our SSH protocol provider
-     * factory.
-     */
-    private ServiceRegistration  sshPpFactoryServReg   = null;
-
-    /**
-     * A reference to the SSH protocol provider factory.
-     */
-    private static ProtocolProviderFactorySSHImpl
-            sshProviderFactory = null;
-
-    /**
-     * The currently valid bundle context.
-     */
-    private static BundleContext bundleContext = null;
-
-    private static ResourceManagementService resourcesService;
-
-    /**
-     * Called when this bundle is started. In here we'll export the
-     * ssh ProtocolProviderFactory implementation so that it could be
-     * possible to register accounts with it in SIP Communicator.
-     *
-     * @param context The execution context of the bundle being started.
-     * @throws Exception If this method throws an exception, this bundle is
-     *   marked as stopped and the Framework will remove this bundle's
-     *   listeners, unregister all services registered by this bundle, and
-     *   release all services used by this bundle.
-     */
-    public void start(BundleContext context)
-    throws Exception
-    {
-        bundleContext = context;
-
-        Hashtable<String, String> hashtable = new Hashtable<String, String>();
-        hashtable.put(ProtocolProviderFactory.PROTOCOL, "SSH");
-
-        sshProviderFactory = new ProtocolProviderFactorySSHImpl();
-
-        //reg the ssh provider factory.
-        sshPpFactoryServReg =  context.registerService(
-                ProtocolProviderFactory.class.getName(),
-                sshProviderFactory,
-                hashtable);
-
-        if (logger.isInfoEnabled())
-            logger.info("SSH protocol implementation [STARTED].");
-    }
-
-    /**
-     * Returns a reference to the bundle context that we were started with.
-     * @return bundleContext a reference to the BundleContext instance
-     * that we were started with.
-     */
-    public static BundleContext getBundleContext()
-    {
-        return bundleContext;
-    }
-
-    /**
-     * Retrurns a reference to the protocol provider factory that we have
-     * registered.
-     * @return a reference to the <tt>ProtocolProviderFactoryJabberImpl</tt>
-     * instance that we have registered from this package.
-     */
-    public static ProtocolProviderFactorySSHImpl
-            getProtocolProviderFactory()
-    {
-        return sshProviderFactory;
-    }
-
-
-    /**
-     * Called when this bundle is stopped so the Framework can perform the
-     * bundle-specific activities necessary to stop the bundle.
-     *
-     * @param context The execution context of the bundle being stopped.
-     * @throws Exception If this method throws an exception, the bundle is
-     *   still marked as stopped, and the Framework will remove the bundle's
-     *   listeners, unregister all services registered by the bundle, and
-     *   release all services used by the bundle.
-     */
-    public void stop(BundleContext context)
-    throws Exception
-    {
-        sshProviderFactory.stop();
-        sshPpFactoryServReg.unregister();
-        if (logger.isInfoEnabled())
-            logger.info("SSH protocol implementation [STOPPED].");
-    }
-
-    /**
-     * Returns the <tt>ResourceManagementService</tt>.
-     *
-     * @return the <tt>ResourceManagementService</tt>.
-     */
-    public static ResourceManagementService getResources()
-    {
-        if (resourcesService == null)
-            resourcesService =
-                ResourceManagementServiceUtils.getService(bundleContext);
-        return resourcesService;
-    }
-}