From 361f2c3d1a549cf24e9bf43d4a0ff3b90662a0d7 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Fri, 29 Jun 2012 12:24:35 +0000 Subject: [PATCH] Switches Jitsi trunk to libjitsi. --- .../impl/gui/swing.ui.manifest.mf | 2 +- .../impl/neomedia/neomedia.manifest.mf | 2 +- .../protocol/media/protocol.media.manifest.mf | 2 +- .../protocol/protocol.provider.manifest.mf | 2 +- .../sip/communicator/util/util.manifest.mf | 70 +++++++++---------- 5 files changed, 39 insertions(+), 39 deletions(-) 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 2673e6ab1..a210f8b17 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 @@ -45,7 +45,7 @@ Import-Package: com.apple.eawt, net.java.sip.communicator.service.shutdown, net.java.sip.communicator.service.systray, net.java.sip.communicator.util, - net.java.sip.communicator.util.event, + org.jitsi.util.event, net.java.sip.communicator.util.skin, net.java.sip.communicator.util.swing, net.java.sip.communicator.util.swing.border, diff --git a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf index a7979b859..f61822d27 100644 --- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf +++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf @@ -29,7 +29,6 @@ Import-Package: apple.awt, net.java.sip.communicator.service.protocol.event, net.java.sip.communicator.service.resources, net.java.sip.communicator.util, - net.java.sip.communicator.util.event, net.java.sip.communicator.util.swing, org.bouncycastle.crypto, org.bouncycastle.crypto.digests, @@ -56,6 +55,7 @@ Import-Package: apple.awt, org.jitsi.service.resources, org.jitsi.service.version, org.jitsi.util, + org.jitsi.util.event, org.jitsi.util.swing, org.json, org.osgi.framework, diff --git a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf index 7955aad67..e2755cc02 100644 --- a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf +++ b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf @@ -16,6 +16,6 @@ Import-Package: org.osgi.framework, net.java.sip.communicator.service.netaddr, org.jitsi.util, net.java.sip.communicator.util, - net.java.sip.communicator.util.event, + org.jitsi.util.event, org.ice4j.ice Export-Package: net.java.sip.communicator.service.protocol.media 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 7da2c040b..e442ff981 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 @@ -10,7 +10,7 @@ Import-Package: org.osgi.framework, org.jitsi.service.neomedia, org.jitsi.service.resources, net.java.sip.communicator.service.resources, net.java.sip.communicator.util, - net.java.sip.communicator.util.event + org.jitsi.util.event Export-Package: net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.aimconstants, net.java.sip.communicator.service.protocol.event, diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf index 9b27cfc7e..3929e1b8d 100644 --- a/src/net/java/sip/communicator/util/util.manifest.mf +++ b/src/net/java/sip/communicator/util/util.manifest.mf @@ -4,53 +4,53 @@ Bundle-Description: A bundle that export packages with utility classes. Bundle-Vendor: jitsi.org Bundle-Version: 0.0.1 System-Bundle: yes -Import-Package: org.xml.sax, - org.w3c.dom, - org.osgi.framework, - org.apache.xml.serialize, - javax.xml.transform.stream, - javax.xml.transform.dom, - javax.xml.transform, - javax.xml.parsers, - javax.swing.text.html, - javax.swing.text.html.parser, - javax.swing.text, - javax.swing.plaf.basic, - javax.swing.plaf, - javax.swing.plaf.metal, - javax.swing.event, - javax.swing.border, - javax.swing.filechooser, - javax.swing, +Import-Package: com.sun.awt, + javax.imageio, javax.naming, javax.naming.directory, javax.naming.ldap, - javax.imageio, javax.security.auth.x500, - org.jitsi.util, - org.jitsi.util.swing, + javax.swing, + javax.swing.border, + javax.swing.event, + javax.swing.filechooser, + javax.swing.plaf, + javax.swing.plaf.basic, + javax.swing.plaf.metal, + javax.swing.text, + javax.swing.text.html, + javax.swing.text.html.parser, + javax.xml.parsers, + javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.stream, net.java.sip.communicator.util, net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, - org.jitsi.service.resources, net.java.sip.communicator.service.resources, net.java.sip.communicator.service.keybindings, net.java.sip.communicator.service.netaddr, net.java.sip.communicator.service.netaddr.event, - org.jitsi.service.configuration, net.java.sip.communicator.service.contactlist, + org.apache.xml.serialize, + org.jitsi.service.configuration, + org.jitsi.service.resources, + org.jitsi.util, + org.jitsi.util.event, + org.jitsi.util.swing, + org.osgi.framework, + org.w3c.dom, + org.xbill.DNS, + org.xml.sax, sun.awt.shell, - sun.net.util, sun.net.dns, - com.sun.awt, - org.xbill.DNS -Export-Package: net.java.sip.communicator.util.xml, - net.java.sip.communicator.util.swing.transparent, - net.java.sip.communicator.util.swing.plaf, - net.java.sip.communicator.util.swing.event, - net.java.sip.communicator.util.swing.border, - net.java.sip.communicator.util.swing, - net.java.sip.communicator.util.skin, + sun.net.util +Export-Package: net.java.sip.communicator.util, net.java.sip.communicator.util.launchutils, - net.java.sip.communicator.util.event, - net.java.sip.communicator.util + net.java.sip.communicator.util.skin, + net.java.sip.communicator.util.swing, + net.java.sip.communicator.util.swing.border, + net.java.sip.communicator.util.swing.event, + net.java.sip.communicator.util.swing.plaf, + net.java.sip.communicator.util.swing.transparent, + net.java.sip.communicator.util.xml