Changes leading to use OSGI'fied libjitsi

smack4
Ingo Bauersachs 10 years ago
commit 723b2bb99a

@ -20,7 +20,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/installer-exclude/easymock-3.1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/fmj.jar" sourcepath="/fmj"/>
<classpathentry kind="lib" path="lib/installer-exclude/fmj-1.0-SNAPSHOT.jar" sourcepath="/fmj"/>
<classpathentry kind="lib" path="lib/installer-exclude/forms-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-1.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-meta-1.0.jar"/>
@ -58,14 +58,14 @@
<attribute name="javadoc_location" value="http://dbus.freedesktop.org/doc/dbus-java/api/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/installer-exclude/libjitsi.jar" sourcepath="/libjitsi/src"/>
<classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar" sourcepath="/libjitsi/src"/>
<classpathentry kind="lib" path="lib/bundle/log4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/otr4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/profiler4j-1.0-beta3-SC.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-5.9.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/sdes4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/sdes4j-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/smack.jar" sourcepath="lib/installer-exclude/smack-src.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
@ -83,7 +83,7 @@
<classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.4.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/hsqldb.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/irc-api-1.0.jar" sourcepath="lib/installer-exclude/irc-api-1.0-sources.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/google-http-client-1.20.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/google-http-client-jackson2-1.20.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/google-oauth-client-1.20.0.jar"/>

@ -497,7 +497,7 @@
<classpath>
<pathelement path="${dest}"/>
<pathelement location="${lib.noinst}/libjitsi.jar"/>
<pathelement location="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar"/>
</classpath>
</taskdef>
@ -1309,28 +1309,11 @@
</target>
<!--BUNDLE-LIBJITSI -->
<target name="bundle-libjitsi"
depends="bundle-libjitsi-dynamically,bundle-libjitsi-statically" />
<target name="bundle-libjitsi-dynamically" if="dynamic.linking">
<jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
prefix="net/java/sip/communicator/impl/libjitsi" />
<zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
</jar>
</target>
<target name="bundle-libjitsi-statically" unless="dynamic.linking">
<jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
prefix="net/java/sip/communicator/impl/libjitsi" />
<zipfileset src="${lib.noinst}/bcpkix-jdk15on-151.jar" prefix=""
excludes="META-INF/BCKEY.*" />
<zipfileset src="${lib.noinst}/fmj.jar" prefix="" />
<zipfileset src="${lib.noinst}/jitsi-lgpl-dependencies.jar"
prefix="" />
<zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
</jar>
<target name="bundle-libjitsi">
<copy file="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/libjitsi.jar"/>
<copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/>
<copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
<copy file="${lib.noinst}/bcpkix-jdk15on-151.jar" tofile="${bundles.dest}/bcpkix.jar"/>
</target>
<!--BUNDLE-NEOMEDIA-->
@ -2155,7 +2138,7 @@ javax.swing.event, javax.swing.border"/>
<!--BUNDLE-COMMONS-CODEC -->
<target name="bundle-commons-codec">
<copy file="${lib.noinst}/commons-codec-1.4.jar"
<copy file="${lib.noinst}/commons-codec-1.6.jar"
tofile="${bundles.dest}/commons-codec.jar"/>
</target>
@ -2513,14 +2496,7 @@ org.bouncycastle.util"/>
<!--BUNDLE-SDES4J -->
<target name="bundle-sdes4j">
<jar compress="true" destfile="${bundles.dest}/sdes4j.jar"
filesetmanifest="merge">
<zipfileset src="${lib.noinst}/sdes4j.jar" prefix=""/>
<manifest>
<attribute name="System-Bundle" value="yes"/>
</manifest>
</jar>
<copy file="${lib.noinst}/sdes4j-1.1.3.jar" tofile="${bundles.dest}/sdes4j.jar"/>
</target>
<!--BUNDLE-JSON -->

@ -24,14 +24,16 @@ org.osgi.framework.system.packages.extra= \
sun.net.util; \
sun.net.dns; \
sun.security.action; \
sun.security.pkcs11
sun.security.pkcs11;\
sun.audio
felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
#slf4j-jdk is an OSGi fragment, so install but don't start it
felix.auto.install.10= \
reference:file:sc-bundles/slf4j-jdk14.jar
reference:file:sc-bundles/slf4j-jdk14.jar \
reference:file:sc-bundles/jitsi-lgpl-dependencies.jar
felix.auto.start.10= \
reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
@ -45,7 +47,15 @@ felix.auto.start.10= \
# file:lib/bundle/servicebinder.jar \
# file:lib/bundle/tablelayout.jar
felix.auto.start.14= \
reference:file:sc-bundles/commons-codec.jar
felix.auto.start.15= \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/sdes4j.jar
felix.auto.start.16= \
reference:file:sc-bundles/fmj.jar \
reference:file:sc-bundles/bcpkix.jar \
reference:file:sc-bundles/libjitsi.jar \
reference:file:sc-bundles/dnsservice.jar \
reference:file:sc-bundles/hsqldb.jar
@ -70,7 +80,6 @@ felix.auto.start.32= \
reference:file:sc-bundles/dnsconfig.jar
felix.auto.start.35= \
reference:file:sc-bundles/commons-codec.jar \
reference:file:sc-bundles/httpcore.jar \
reference:file:sc-bundles/httpclient.jar \
reference:file:sc-bundles/httputil.jar
@ -102,8 +111,6 @@ felix.auto.start.45= \
felix.auto.start.49= \
reference:file:sc-bundles/provisioning.jar \
reference:file:sc-bundles/zrtp4j.jar \
reference:file:sc-bundles/sdes4j.jar \
reference:file:sc-bundles/protocol.jar \
reference:file:sc-bundles/protocol-media.jar \
reference:file:sc-bundles/hid-service.jar \

Binary file not shown.

Binary file not shown.

@ -2112,7 +2112,7 @@ public void run()
qualityControl.setPreferredRemoteSendMaxPreset(
qualityPreset);
}
catch(org.jitsi.service.protocol.OperationFailedException e)
catch(Exception e)
{
logger.info("Unable to change video quality.", e);

@ -30,7 +30,7 @@
import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.protocol.*;
import org.jitsi.service.neomedia.*;
/**
* Handles DTMF sending and playing sound notifications for that.

@ -40,7 +40,6 @@
import net.java.sip.communicator.util.skin.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
import org.jitsi.util.swing.*;
/**

@ -35,7 +35,6 @@
import org.jitsi.service.configuration.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
import org.jitsi.service.resources.*;
import org.jitsi.util.event.*;

@ -30,7 +30,6 @@
import net.java.sip.communicator.util.skin.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
/**
* The basic panel used to render any conference participant. Meant to be

@ -28,8 +28,6 @@
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.skin.*;
import org.jitsi.service.protocol.event.*;
/**
* Depicts a specific <tt>CallPeer</tt> who is a focus of a telephony conference
* and the <tt>ConferenceMember</tt>s whom the specified <tt>CallPeer</tt> is

@ -36,7 +36,6 @@
import net.java.sip.communicator.util.call.CallPeerAdapter;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
import org.jitsi.service.resources.*;
/**

@ -72,8 +72,6 @@ Import-Package: com.apple.eawt,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.neomedia.recording,
org.jitsi.service.protocol,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.util,
org.jitsi.util.event,

@ -1,71 +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.libjitsi;
import java.lang.reflect.*;
import org.jitsi.service.libjitsi.*;
import org.osgi.framework.*;
public class LibJitsiActivator
implements BundleActivator
{
public void start(BundleContext bundleContext)
throws Exception
{
/*
* XXX To start/initialize the libjitsi library, simply call
* LibJitsi#start(). The following is a temporary workaround for the
* benefit of the Jitsi Videobridge project (which uses Jitsi's libjitsi
* bundle and runs on an incomplete OSGi implementation) and not the
* Jitsi project.
*/
Method start;
try
{
start = LibJitsi.class.getDeclaredMethod("start", Object.class);
if (Modifier.isStatic(start.getModifiers()))
{
start.setAccessible(true);
if (!start.isAccessible())
start = null;
}
else
start = null;
}
catch (NoSuchMethodException nsme)
{
start = null;
}
catch (SecurityException se)
{
start = null;
}
if (start == null)
LibJitsi.start();
else
start.invoke(null, bundleContext);
}
public void stop(BundleContext bundleContext)
throws Exception
{
LibJitsi.stop();
}
}

@ -1,97 +0,0 @@
Bundle-Activator: net.java.sip.communicator.impl.libjitsi.LibJitsiActivator
Bundle-Description: The core of Jitsi as a stand-alone library
Bundle-Name: libjitsi
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Bundle-SymbolicName: net.java.sip.communicator.libjitsi
Export-Package: javax.media,
javax.media.protocol,
org.jitsi.impl.neomedia,
org.jitsi.impl.neomedia.codec,
org.jitsi.impl.neomedia.codec.video.h264,
org.jitsi.impl.neomedia.device,
org.jitsi.impl.neomedia.format,
org.jitsi.impl.neomedia.recording,
org.jitsi.service.audionotifier,
org.jitsi.service.configuration,
org.jitsi.service.fileaccess,
org.jitsi.service.libjitsi,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.codec,
org.jitsi.service.neomedia.control,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.neomedia.recording,
org.jitsi.service.packetlogging,
org.jitsi.service.protocol,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.service.version,
org.jitsi.service.version.util,
org.jitsi.util,
org.jitsi.util.event,
org.jitsi.util.swing,
org.jitsi.util.xml
Import-Package: apple.awt,
ch.imvs.sdes4j,
ch.imvs.sdes4j.srtp,
com.sun.jna,
com.sun.jna.ptr,
com.sun.jna.win32,
gnu.java.zrtp,
gnu.java.zrtp.packets,
gnu.java.zrtp.utils,
gnu.java.zrtp.zidfile,
javax.imageio,
javax.sound.sampled,
javax.swing,
javax.swing.border,
javax.swing.event,
javax.swing.filechooser,
javax.swing.table,
javax.swing.text,
javax.xml.parsers,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.stream,
org.bouncycastle.asn1,
org.bouncycastle.asn1.bsi,
org.bouncycastle.asn1.cryptopro,
org.bouncycastle.asn1.eac,
org.bouncycastle.asn1.nist,
org.bouncycastle.asn1.oiw,
org.bouncycastle.asn1.pkcs,
org.bouncycastle.asn1.teletrust,
org.bouncycastle.asn1.x500,
org.bouncycastle.asn1.x500.style,
org.bouncycastle.asn1.x509,
org.bouncycastle.asn1.x9,
org.bouncycastle.crypto,
org.bouncycastle.crypto.digests,
org.bouncycastle.crypto.engines,
org.bouncycastle.crypto.generators,
org.bouncycastle.crypto.macs,
org.bouncycastle.crypto.params,
org.bouncycastle.crypto.prng,
org.bouncycastle.crypto.signers,
org.bouncycastle.crypto.tls,
org.bouncycastle.crypto.util,
org.bouncycastle.util,
org.jitsi.bccontrib.digests,
org.jitsi.bccontrib.engines,
org.jitsi.bccontrib.macs,
org.jitsi.bccontrib.params,
org.jitsi.bccontrib.prng,
org.ice4j.socket,
org.json.simple,
org.osgi.framework,
org.w3c.dom,
org.xml.sax,
sun.lwawt,
sun.lwawt.macosx,
quicktime,
quicktime.qd,
quicktime.std.image,
quicktime.std.sg,
quicktime.util

@ -25,7 +25,6 @@
import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.ContentPacketExtension.SendersEnum;
import net.java.sip.communicator.impl.protocol.jabber.jinglesdp.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.media.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;

@ -23,7 +23,6 @@
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.*;
/**
* Class responsible for sending a DTMF Tone using using rfc4733 or Inband.

@ -18,10 +18,8 @@
package net.java.sip.communicator.impl.protocol.jabber;
import net.java.sip.communicator.service.protocol.media.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.*;
/**
* A wrapper of media quality control.
@ -32,12 +30,6 @@
public class QualityControlWrapper
extends AbstractQualityControlWrapper<CallPeerJabberImpl>
{
/**
* Our class logger.
*/
private static final Logger logger
= Logger.getLogger(QualityControlWrapper.class);
/**
* Creates quality control for peer.
* @param peer peer
@ -53,35 +45,17 @@ public class QualityControlWrapper
* with those settings.
*
* @param preset the desired video settings
* @throws OperationFailedException
*/
@Override
public void setPreferredRemoteSendMaxPreset(QualityPreset preset)
throws OperationFailedException
{
QualityControl qControls = getMediaQualityControl();
if(qControls != null)
{
qControls.setRemoteSendMaxPreset(preset);
try
{
// re-invites the peer with the new settings
peer.sendModifyVideoResolutionContent();
}
catch (Throwable cause)
{
String message
= "Failed to re-invite for video quality change.";
logger.error(message, cause);
throw new OperationFailedException(
message,
OperationFailedException.INTERNAL_ERROR,
cause);
}
// re-invites the peer with the new settings
peer.sendModifyVideoResolutionContent();
}
}
}

@ -43,7 +43,6 @@ Import-Package: ch.imvs.sdes4j.srtp,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.packetlogging,
org.jitsi.service.protocol,
org.jitsi.service.resources,
org.jitsi.service.version,
org.jitsi.util,

@ -24,7 +24,6 @@
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.*;
/**
* Class responsible for sending a DTMF Tone using SIP INFO or using rfc4733.

@ -21,7 +21,6 @@
import net.java.sip.communicator.util.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.*;
/**
* A wrapper of media quality control.
@ -51,18 +50,17 @@ public class QualityControlWrapper
* with those settings.
*
* @param preset the desired video settings
* @throws OperationFailedException
* @throws MediaException when the re-invite fails
*/
@Override
public void setPreferredRemoteSendMaxPreset(QualityPreset preset)
throws OperationFailedException
throws MediaException
{
QualityControl qControls = getMediaQualityControl();
if(qControls != null)
{
qControls.setRemoteSendMaxPreset(preset);
try
{
// re-invites the peer with the new settings
@ -75,9 +73,9 @@ public void setPreferredRemoteSendMaxPreset(QualityPreset preset)
logger.error(message, cause);
throw new OperationFailedException(
throw new MediaException(
message,
OperationFailedException.INTERNAL_ERROR,
MediaException.GENERAL_ERROR,
cause);
}
}

@ -33,7 +33,7 @@
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.protocol.*;
import org.jitsi.service.neomedia.*;
/**
* Sending DTMFs with SIP INFO.

@ -70,7 +70,6 @@ Import-Package: ch.imvs.sdes4j.srtp,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.packetlogging,
org.jitsi.service.protocol,
org.jitsi.service.resources,
org.jitsi.service.version,
org.jitsi.util,

@ -10,7 +10,6 @@ Import-Package: javax.swing,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.jabberconstants,
net.java.sip.communicator.service.protocol.msnconstants,
net.java.sip.communicator.service.protocol.yahooconstants,
net.java.sip.communicator.util,
org.jitsi.service.configuration,

@ -31,8 +31,8 @@
import org.apache.commons.lang3.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.neomedia.event.*;
import org.jitsi.service.neomedia.recording.*;
import org.jitsi.service.protocol.event.*;
import org.jitsi.service.resources.*;
import org.osgi.framework.*;
@ -1649,17 +1649,17 @@ public void securityMessageRecieved(CallPeerSecurityMessageEvent ev)
switch (ev.getEventSeverity())
{
// Don't play alert sound for Info or warning.
case CallPeerSecurityMessageEvent.INFORMATION:
case SrtpListener.INFORMATION:
messageTitleKey = "service.gui.SECURITY_INFO";
break;
case CallPeerSecurityMessageEvent.WARNING:
case SrtpListener.WARNING:
messageTitleKey = "service.gui.SECURITY_WARNING";
break;
// Security cannot be established! Play an alert sound.
case CallPeerSecurityMessageEvent.SEVERE:
case CallPeerSecurityMessageEvent.ERROR:
case SrtpListener.SEVERE:
case SrtpListener.ERROR:
messageTitleKey = "service.gui.SECURITY_ERROR";
fireNotification(CALL_SECURITY_ERROR);
break;

@ -15,7 +15,6 @@ Import-Package: javax.imageio,
net.java.sip.communicator.plugin.desktoputil,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.recording,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.osgi.framework,
org.apache.commons.lang3

@ -23,7 +23,6 @@
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
import org.jitsi.service.protocol.event.*;
import org.jitsi.util.event.*;
/**

@ -23,8 +23,6 @@
import net.java.sip.communicator.service.protocol.event.*;
import org.jitsi.service.protocol.event.*;
/**
* The CallPeer is an interface that represents peers in a call.
* Users of the UIService need to implement this interface (or one of its

@ -17,7 +17,7 @@
*/
package net.java.sip.communicator.service.protocol;
import org.jitsi.service.protocol.*;
import org.jitsi.service.neomedia.*;
/**
* An <tt>OperationSet</tt> that allows other modules to send DMF tones through

@ -19,8 +19,6 @@
import java.util.*;
import org.jitsi.service.protocol.event.*;
/**
* CallPeerSecurityListener interface extends EventListener. This is the
* listener interface used to handle an event related with a change in security

@ -0,0 +1,93 @@
/*
* Jitsi, the OpenSource Java VoIP and Instant Messaging client.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.service.protocol.event;
import java.util.*;
/**
* The <tt>CallPeerSecurityFailedEvent</tt> is triggered whenever
* a problem has occurred during call security process.
*
* @author Yana Stamcheva
* @author Werner Dittmann
*/
public class CallPeerSecurityMessageEvent
extends EventObject
{
/**
* Serial version UID.
*/
private static final long serialVersionUID = 0L;
/**
* The internationalized message associated with this event.
*/
private final String eventI18nMessage;
/**
* The message associated with this event.
*/
private final String eventMessage;
/**
* The severity of the security message event.
*/
private final int eventSeverity;
/**
* Creates a <tt>CallPeerSecurityFailedEvent</tt> by specifying the
* call peer, event type and message associated with this event.
*
* @param source the object on which the event initially occurred
* @param eventMessage the message associated with this event.
* @param i18nMessage the internationalized message associated with this
* event that could be shown to the user.
* @param eventSeverity severity level.
*/
public CallPeerSecurityMessageEvent(
Object source,
String eventMessage,
String i18nMessage,
int eventSeverity)
{
super(source);
this.eventMessage = eventMessage;
this.eventI18nMessage = i18nMessage;
this.eventSeverity = eventSeverity;
}
/**
* Returns the message associated with this event.
*
* @return the message associated with this event.
*/
public String getMessage()
{
return eventMessage;
}
/**
* Returns the internationalized message associated with this event.
*
* @return the internationalized message associated with this event.
*/
public String getI18nMessage()
{
return eventI18nMessage;
}
/**
* Returns the event severity.
*
* @return the eventSeverity
*/
public int getEventSeverity()
{
return eventSeverity;
}
}

@ -20,7 +20,6 @@
import net.java.sip.communicator.service.protocol.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
/**
* The <tt>CallPeerSecurityNegotiationStartedEvent</tt> is triggered whenever a

@ -19,8 +19,6 @@
import net.java.sip.communicator.service.protocol.*;
import org.jitsi.service.protocol.event.*;
/**
* The <tt>CallPeerSecurityAuthenticationEvent</tt> is triggered whenever
* a the security strings are received in a secure call.

@ -20,7 +20,6 @@
import net.java.sip.communicator.service.protocol.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.event.*;
/**
* The <tt>CallPeerSecurityOnEvent</tt> is triggered whenever a

@ -0,0 +1,64 @@
/*
* Jitsi, the OpenSource Java VoIP and Instant Messaging client.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.service.protocol.event;
import java.util.*;
/**
* Parent class for SecurityOn and SecurityOff events.
*
* @author Yana Stamcheva
*/
public abstract class CallPeerSecurityStatusEvent
extends EventObject
{
/**
* Serial version UID.
*/
private static final long serialVersionUID = 0L;
/**
* Constant value defining that security is enabled.
*/
public static final int AUDIO_SESSION = 1;
/**
* Constant value defining that security is disabled.
*/
public static final int VIDEO_SESSION = 2;
/**
* Session type of the event {@link #AUDIO_SESSION} or
* {@link #VIDEO_SESSION}.
*/
private final int sessionType;
/**
* Constructor required by the EventObject.
*
* @param source the source object for this event.
* @param sessionType either <code>AUDIO_SESSION</code> or
* <code>VIDEO_SESSION</code> to indicate the type of the
* session
*/
public CallPeerSecurityStatusEvent(Object source, int sessionType)
{
super(source);
this.sessionType = sessionType;
}
/**
* Returns the type of the session, either AUDIO_SESSION or VIDEO_SESSION.
*
* @return the type of the session, either AUDIO_SESSION or VIDEO_SESSION.
*/
public int getSessionType()
{
return sessionType;
}
}

@ -19,8 +19,6 @@
import net.java.sip.communicator.service.protocol.*;
import org.jitsi.service.protocol.event.*;
/**
* The <tt>CallPeerSecurityTimeoutEvent</tt> is triggered whenever a
* communication with a given peer cannot be established, the peer

@ -19,7 +19,7 @@
import java.util.*;
import org.jitsi.service.protocol.*;
import org.jitsi.service.neomedia.*;
/**
* <tt>DTMFReceivedEvent</tt>s indicate reception of a DTMF tone.

@ -18,7 +18,6 @@
package net.java.sip.communicator.service.protocol.media;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.protocol.*;
/**
* A wrapper of media quality control.
@ -153,8 +152,8 @@ public void setRemoteSendMaxPreset(QualityPreset preset)
* with those settings.
*
* @param preset the desired video settings
* @throws OperationFailedException
* @throws MediaException
*/
public abstract void setPreferredRemoteSendMaxPreset(QualityPreset preset)
throws OperationFailedException;
throws MediaException;
}

@ -26,7 +26,6 @@
import org.jitsi.service.neomedia.*;
import org.jitsi.service.neomedia.event.*;
import org.jitsi.service.protocol.event.*;
/**
* A utility class implementing media control code shared between current

@ -32,7 +32,6 @@
import org.jitsi.service.neomedia.device.*;
import org.jitsi.service.neomedia.event.*;
import org.jitsi.service.neomedia.format.*;
import org.jitsi.service.protocol.*;
import org.jitsi.util.event.*;
/**

@ -27,7 +27,6 @@ Import-Package: javax.xml.parsers,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
org.jitsi.service.neomedia.recording,
org.jitsi.service.protocol,
org.jitsi.util,
org.jitsi.util.event,
org.jitsi.util.xml,

@ -12,7 +12,6 @@ Import-Package: net.java.sip.communicator.service.credentialsstorage,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.codec,
org.jitsi.service.neomedia.recording,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.util,
org.jitsi.util.event,
@ -24,7 +23,6 @@ Export-Package: net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.icqconstants,
net.java.sip.communicator.service.protocol.jabber,
net.java.sip.communicator.service.protocol.jabberconstants,
net.java.sip.communicator.service.protocol.msnconstants,
net.java.sip.communicator.service.protocol.sip,
net.java.sip.communicator.service.protocol.whiteboardobjects,
net.java.sip.communicator.service.protocol.yahooconstants

@ -23,8 +23,6 @@
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import org.jitsi.service.protocol.event.*;
/**
* <tt>CallPeerAdapter</tt> implements common <tt>CallPeer</tt> related
* listeners in order to facilitate the task of implementing

@ -14,7 +14,6 @@ Import-Package: junit.framework,
net.java.sip.communicator.impl.protocol.mock,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
org.jitsi.service.protocol.event,
org.osgi.framework,
org.w3c.dom,
javax.xml.parsers,

@ -13,5 +13,5 @@ Import-Package: net.java.sip.communicator.service.contactlist,
org.jitsi.service.configuration,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.icqconstants,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.impl.protocol.mock

@ -15,7 +15,7 @@ Import-Package: junit.framework,
net.java.sip.communicator.service.metahistory,
net.java.sip.communicator.impl.protocol.mock,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
org.osgi.framework,
org.w3c.dom,
javax.xml.parsers,

@ -12,7 +12,7 @@ Import-Package: junit.framework,
net.java.sip.communicator.service.msghistory,
net.java.sip.communicator.impl.protocol.mock,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
com.google.common.xml,
com.google.common.escape,
org.osgi.framework,

@ -10,4 +10,4 @@ Import-Package: org.jitsi.service.configuration,
net.java.sip.communicator.util,
net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event
net.java.sip.communicator.service.protocol.event

@ -13,5 +13,5 @@ Import-Package: junit.framework,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.icqconstants,
net.java.sip.communicator.service.protocol.aimconstants,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
org.jitsi.service.fileaccess

@ -15,5 +15,5 @@ Import-Package: org.jitsi.service.configuration,
net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.jabberconstants,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
org.jitsi.service.fileaccess

@ -15,7 +15,7 @@ Import-Package: org.jitsi.service.configuration,
org.jitsi.util.xml,
net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.impl.protocol.sip,
net.java.sip.communicator.impl.protocol.sip.net,
net.java.sip.communicator.impl.protocol.sip.xcap,

@ -13,5 +13,5 @@ Import-Package: org.jitsi.service.configuration,
net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.yahooconstants,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
org.jitsi.service.fileaccess

@ -10,7 +10,7 @@ Import-Package: org.osgi.framework,
org.jitsi.service.configuration,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.icqconstants,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,
net.java.sip.communicator.service.gui,

Loading…
Cancel
Save