Move security events back from libjitsi as they are solely used here.

Corresponds to commit jitsi/libjitsi@263cc1e53e4d2ebd3f4762c42b2c27462b4d830c

31 files changed, 171 insertions, 39 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
index aa25719..4f04fdb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java
@@ -40,7 +40,6 @@ import net.java.sip.communicator.util.call.CallPeerAdapter;
 import net.java.sip.communicator.util.skin.*;
 
 import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
 import org.jitsi.util.swing.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
index ce45ded..18a0c5a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java
@@ -35,7 +35,6 @@ import net.java.sip.communicator.service.resources.*;
 
 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.*;
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
index 6212435..c088a79 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java
@@ -30,7 +30,6 @@ import net.java.sip.communicator.service.resources.*;
 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
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
index 27eb09c..e408498 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java
@@ -28,8 +28,6 @@ import net.java.sip.communicator.service.protocol.*;
 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
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
index f29cd05..b49bb75 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java
@@ -36,7 +36,6 @@ import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.call.CallPeerAdapter;
 
 import org.jitsi.service.neomedia.*;
-import org.jitsi.service.protocol.event.*;
 import org.jitsi.service.resources.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
index 4b983b0..2d1522d 100644
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@@ -73,7 +73,6 @@ Import-Package: com.apple.eawt,
  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,
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
index 5dab563..64eb5fa 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
@@ -25,7 +25,6 @@ import net.java.sip.communicator.impl.protocol.jabber.extensions.jingle.*;
 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.*;

diff --git a/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java b/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
index 575d9ed..e7332a7 100644
--- a/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
@@ -31,8 +31,8 @@ import net.java.sip.communicator.util.*;
 
 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 class NotificationManager
             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;
diff --git a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
index 5f3a542..2795e25 100644
--- a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
@@ -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
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java b/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java
index a908733..3922e96 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractCallPeer.java
@@ -23,7 +23,6 @@ import java.util.*;
 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.*;
 
 /**
diff --git a/src/net/java/sip/communicator/service/protocol/CallPeer.java b/src/net/java/sip/communicator/service/protocol/CallPeer.java
index 4204f5a..2fc5a30 100644
--- a/src/net/java/sip/communicator/service/protocol/CallPeer.java
+++ b/src/net/java/sip/communicator/service/protocol/CallPeer.java
@@ -23,8 +23,6 @@ import java.util.*;
 
 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
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java
index 59d5ea7..e972d17 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityListener.java
@@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event;
 
 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
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java
new file mode 100644
index 0000000..bcbb66a
--- /dev/null
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java
@@ -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;
+    }
+}
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java
index 0462388..2bf7226 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityNegotiationStartedEvent.java
@@ -20,7 +20,6 @@ package net.java.sip.communicator.service.protocol.event;
 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
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java
index 4fa7185..f49a3f4 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOffEvent.java
@@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event;
 
 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.
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java
index 2293a74..45a803e 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityOnEvent.java
@@ -20,7 +20,6 @@ package net.java.sip.communicator.service.protocol.event;
 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
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java
new file mode 100644
index 0000000..6720f4b
--- /dev/null
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityStatusEvent.java
@@ -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;
+    }
+}
diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java
index b6cf784..55aa351 100644
--- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityTimeoutEvent.java
@@ -19,8 +19,6 @@ package net.java.sip.communicator.service.protocol.event;
 
 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
diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
index 1c46000..4e15038 100644
--- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
+++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
@@ -26,7 +26,6 @@ import net.java.sip.communicator.util.*;
 

 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

diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
index 20295af..f2b467b 100644
--- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
@@ -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,
diff --git a/src/net/java/sip/communicator/util/call/CallPeerAdapter.java b/src/net/java/sip/communicator/util/call/CallPeerAdapter.java
index 39517d3..e1850e7 100644
--- a/src/net/java/sip/communicator/util/call/CallPeerAdapter.java
+++ b/src/net/java/sip/communicator/util/call/CallPeerAdapter.java
@@ -23,8 +23,6 @@ import net.java.sip.communicator.service.gui.call.*;
 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
diff --git a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
index b3c32fc..76579d9 100644
--- a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
@@ -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,
diff --git a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
index d9701e3..00318f7 100644
--- a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
@@ -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
diff --git a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
index af97d92..cbb9ea2 100644
--- a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
@@ -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,
diff --git a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
index d1d5e53..5162662 100644
--- a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
@@ -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,
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
index 7808c87..c24beee 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
@@ -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
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
index 8f7c59f..68d09e2 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
@@ -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
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
index f35f7f2..b6fc5d0 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
@@ -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
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
index 61a2783..60e7afb 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
@@ -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,
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
index b50e23a..e57e344 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
@@ -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
diff --git a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
index 18832fc..a2d15f2 100644
--- a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
@@ -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,