From e1eabb5ca84d9fac35eed8d5401b8ac809d32b17 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Mon, 24 Jun 2013 13:32:35 +0300 Subject: [PATCH] Moves ConferenceInfoDocument to the net.java.sip.communicator.service.protocol.media package. --- .../jabber/OperationSetTelephonyConferencingJabberImpl.java | 1 - .../sip/OperationSetTelephonyConferencingSipImpl.java | 2 -- .../protocol/media}/ConferenceInfoDocument.java | 3 ++- .../service/protocol/media/protocol.media.manifest.mf | 4 ++++ src/net/java/sip/communicator/util/util.manifest.mf | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) rename src/net/java/sip/communicator/{util => service/protocol/media}/ConferenceInfoDocument.java (99%) diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java index 17039253b..9526539e4 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java @@ -15,7 +15,6 @@ import net.java.sip.communicator.service.protocol.media.*; import net.java.sip.communicator.util.*; -import org.jitsi.service.neomedia.*; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.*; import org.jivesoftware.smack.packet.*; diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java index 11ea071db..e8d924c30 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java @@ -22,8 +22,6 @@ import net.java.sip.communicator.service.protocol.media.*; import net.java.sip.communicator.util.*; -import org.jitsi.service.neomedia.*; -import org.jitsi.service.neomedia.MediaType; import org.jitsi.util.xml.*; /** diff --git a/src/net/java/sip/communicator/util/ConferenceInfoDocument.java b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java similarity index 99% rename from src/net/java/sip/communicator/util/ConferenceInfoDocument.java rename to src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java index 376861b43..b9ed5e487 100644 --- a/src/net/java/sip/communicator/util/ConferenceInfoDocument.java +++ b/src/net/java/sip/communicator/service/protocol/media/ConferenceInfoDocument.java @@ -4,8 +4,9 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.util; +package net.java.sip.communicator.service.protocol.media; +import net.java.sip.communicator.util.*; import org.jitsi.util.xml.*; import org.w3c.dom.*; 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 fe14a18df..9ecfd1da1 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 @@ -5,6 +5,9 @@ Bundle-Vendor: jitsi.org Bundle-Version: 0.0.1 System-Bundle: yes Import-Package: javax.xml.parsers, + javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.stream, net.java.sip.communicator.service.netaddr, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.event, @@ -20,6 +23,7 @@ Import-Package: javax.xml.parsers, org.jitsi.service.protocol, org.jitsi.util, org.jitsi.util.event, + org.jitsi.util.xml, org.osgi.framework, org.w3c.dom, org.xml.sax diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf index 8911c34d3..5dc7cd51d 100644 --- a/src/net/java/sip/communicator/util/util.manifest.mf +++ b/src/net/java/sip/communicator/util/util.manifest.mf @@ -49,7 +49,6 @@ Import-Package: com.sun.awt, org.jitsi.util, org.jitsi.util.event, org.jitsi.util.swing, - org.jitsi.util.xml, org.osgi.framework, org.xbill.DNS, org.w3c.dom,