Switches Jitsi trunk to libjitsi.

4 files changed, 17 insertions, 13 deletions

diff --git a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java
index 2fb54b8..3f65c57 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java
@@ -6,11 +6,11 @@
  */
 package net.java.sip.communicator.impl.packetlogging;
 
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.fileaccess.*;
-import net.java.sip.communicator.service.packetlogging.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.Logger;
+
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.fileaccess.*;
+import org.jitsi.service.packetlogging.*;
 import org.osgi.framework.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
index fb9224d..809ee2e 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigurationImpl.java
@@ -6,8 +6,9 @@
  */
 package net.java.sip.communicator.impl.packetlogging;
 
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.packetlogging.*;
+import org.jitsi.service.configuration.*;
+
+import org.jitsi.service.packetlogging.*;
 
 /**
  * Extends PacketLoggingConfiguration by storing and loading values from
diff --git a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
index 4f7f9dc..08d80b6 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingServiceImpl.java
@@ -6,12 +6,15 @@
  */
 package net.java.sip.communicator.impl.packetlogging;
 
-import net.java.sip.communicator.service.packetlogging.*;
-import net.java.sip.communicator.util.*;
-
 import java.io.*;
 import java.util.*;
 
+import net.java.sip.communicator.util.*;
+
+import org.jitsi.service.packetlogging.*;
+import org.jitsi.service.packetlogging.PacketLoggingService.ProtocolName;
+import org.jitsi.service.packetlogging.PacketLoggingService.TransportName;
+
 /**
  * Packet Logging Service implementation dumping logs in
  * pcap(tcpdump/wireshark) format file.
diff --git a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
index c7800d3..9028ca7 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
+++ b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
@@ -5,10 +5,11 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.fileaccess,
+ org.jitsi.service.configuration,
+ org.jitsi.service.fileaccess,
+ org.jitsi.service.packetlogging,
  net.java.sip.communicator.service.gui,
- net.java.sip.communicator.service.neomedia,
+ org.jitsi.service.neomedia,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.swing,
@@ -16,4 +17,3 @@ Import-Package: org.osgi.framework,
  javax.swing.border,
  javax.swing.event,
  javax.swing.text
-Export-Package: net.java.sip.communicator.service.packetlogging