sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Switches Jitsi trunk to libjitsi. (Tries to fix the build tests.)

Browse Source
cusax-fix
Lyubomir Marinov 14 years ago
parent 361f2c3d1a
commit 1ebd6e2896
18 changed files with 125 additions and 115 deletions
Show Stats Download Patch File Download Diff File

4
src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
Unescape View File

@ -45,7 +45,6 @@ Import-Package: com.apple.eawt,
net.java.sip.communicator.service.shutdown,
net.java.sip.communicator.service.systray,
net.java.sip.communicator.util,
org.jitsi.util.event,
net.java.sip.communicator.util.skin,
net.java.sip.communicator.util.swing,
net.java.sip.communicator.util.swing.border,
@ -60,8 +59,11 @@ Import-Package: com.apple.eawt,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.format,
org.jitsi.service.protocol,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.util,
org.jitsi.util.event,
org.jitsi.util.swing,
org.osgi.framework,
say.swing

84
src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
Unescape View File

@ -4,64 +4,66 @@ Bundle-Description: An Jabber implementation of the Protocol Provider Service.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
Import-Package: javax.net,
javax.net.ssl,
javax.security.auth.callback,
javax.security.sasl,
javax.xml.parsers,
net.java.sip.communicator.service.argdelegation,
net.java.sip.communicator.service.certificate,
net.java.sip.communicator.service.credentialsstorage,
net.java.sip.communicator.service.customavatar,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.hid,
net.java.sip.communicator.service.httputil,
net.java.sip.communicator.service.netaddr,
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.media,
net.java.sip.communicator.service.protocol.whiteboardobjects,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
net.java.sip.communicator.util.dns,
org.ice4j,
org.ice4j.socket,
org.ice4j.stack,
org.ice4j.ice,
org.ice4j.ice.harvest,
org.ice4j.security,
org.ice4j.socket,
org.ice4j.stack,
org.jitsi.service.configuration,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.device,
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.jivesoftware.smack,
org.jivesoftware.smack.filter,
org.jivesoftware.smack.packet,
org.jivesoftware.smack.provider,
org.jivesoftware.smack.util,
org.jivesoftware.smack.filter,
org.jivesoftware.smack.proxy,
org.jivesoftware.smack.sasl,
org.jivesoftware.smack.util,
org.jivesoftware.smackx,
org.jivesoftware.smackx.bytestreams.socks5.provider,
org.jivesoftware.smackx.bytestreams.ibb.provider,
org.jivesoftware.smackx.muc,
org.jivesoftware.smackx.packet,
org.jivesoftware.smack.proxy,
org.jivesoftware.smackx.bytestreams.socks5.provider,
org.jivesoftware.smackx.filetransfer,
org.jivesoftware.smackx.jingle,
org.jivesoftware.smackx.jingle.listeners,
org.jivesoftware.smackx.jingle.media,
org.jivesoftware.smackx.jingle.nat,
org.jivesoftware.smackx.jingle.packet,
org.jivesoftware.smackx.jingle.provider,
org.jivesoftware.smackx.filetransfer,
org.jivesoftware.smackx.muc,
org.jivesoftware.smackx.packet,
org.jivesoftware.smackx.provider,
org.jitsi.service.version,
org.osgi.framework,
org.w3c.dom,
net.java.sip.communicator.service.customavatar,
org.jitsi.service.configuration,
org.jitsi.service.resources, net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
net.java.sip.communicator.util.dns,
org.jitsi.service.packetlogging,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.jabberconstants,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.whiteboardobjects,
net.java.sip.communicator.service.protocol.media,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
net.java.sip.communicator.service.credentialsstorage,
net.java.sip.communicator.service.hid,
net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.argdelegation,
net.java.sip.communicator.service.certificate,
net.java.sip.communicator.service.httputil,
net.java.sip.communicator.service.gui,
org.xmlpull.v1,
org.xmlpull.mxp1,
javax.xml.parsers,
javax.net,
javax.net.ssl,
javax.security.sasl,
javax.security.auth.callback,
org.xmlpull.v1,
org.xmpp.jnodes,
org.xmpp.jnodes.smack,
org.xmpp.jnodes.nio
org.xmpp.jnodes.nio,
org.xmpp.jnodes.smack

90
src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
Unescape View File

@ -4,17 +4,30 @@ Bundle-Description: A bundle that implements the Protocol Provider package over
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.apache.log4j,
Import-Package: javax.net,
javax.net.ssl,
javax.security.auth.x500,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.parsers,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.stream,
net.java.sip.communicator.service.argdelegation,
net.java.sip.communicator.service.credentialsstorage,
net.java.sip.communicator.service.certificate,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.hid,
net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.netaddr.event,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.media,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
net.java.sip.communicator.util.dns,
net.java.sip.communicator.util.xml,
org.apache.http,
org.apache.http.entity,
org.apache.http.impl,
org.apache.http.impl.entity,
org.apache.http.impl.io,
org.apache.http.io,
org.apache.http.message,
org.apache.http.params,
org.apache.http.protocol,
org.apache.http.util,
org.apache.http.annotation,
org.apache.http.auth,
org.apache.http.auth.params,
@ -30,53 +43,40 @@ Import-Package: org.apache.log4j,
org.apache.http.conn.scheme,
org.apache.http.conn.ssl,
org.apache.http.conn.util,
org.apache.http.entity,
org.apache.http.impl,
org.apache.http.impl.client,
org.jitsi.service.version,
org.osgi.framework,
org.w3c.dom,
org.xml.sax,
org.json,
net.java.sip.communicator.service.argdelegation,
org.apache.http.impl.entity,
org.apache.http.impl.io,
org.apache.http.io,
org.apache.http.message,
org.apache.http.params,
org.apache.http.protocol,
org.apache.http.util,
org.apache.log4j,
org.jitsi.service.configuration,
net.java.sip.communicator.service.credentialsstorage,
net.java.sip.communicator.service.certificate,
net.java.sip.communicator.service.gui,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.control,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
net.java.sip.communicator.service.hid,
net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.netaddr.event,
org.jitsi.service.packetlogging,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.media,
org.jitsi.service.resources, net.java.sip.communicator.service.resources,
org.jitsi.service.protocol,
org.jitsi.service.resources,
org.jitsi.service.version,
org.jitsi.util,
net.java.sip.communicator.util,
net.java.sip.communicator.util.dns,
net.java.sip.communicator.util.xml,
javax.net,
javax.net.ssl,
javax.security.auth.x500,
javax.xml.datatype,
javax.xml.parsers,
javax.xml.namespace,
javax.xml.transform,
javax.xml.transform.dom,
javax.xml.transform.stream
org.json,
org.osgi.framework,
org.w3c.dom,
org.xml.sax
Export-Package: net.java.sip.communicator.impl.protocol.sip,
net.java.sip.communicator.impl.protocol.sip.net,
net.java.sip.communicator.impl.protocol.sip.xcap,
net.java.sip.communicator.impl.protocol.sip.xcap.utils,
net.java.sip.communicator.impl.protocol.sip.xcap.model,
net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps,
net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists,
net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent,
net.java.sip.communicator.impl.protocol.sip.xcap.model.commonpolicy,
net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent,
net.java.sip.communicator.impl.protocol.sip.xcap.model.presrules,
net.java.sip.communicator.impl.protocol.sip.xcap.model.xcaperror
net.java.sip.communicator.impl.protocol.sip.xcap.model.resourcelists,
net.java.sip.communicator.impl.protocol.sip.xcap.model.xcapcaps,
net.java.sip.communicator.impl.protocol.sip.xcap.model.xcaperror,
net.java.sip.communicator.impl.protocol.sip.xcap.utils

13
src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
Unescape View File

@ -4,13 +4,16 @@ Bundle-Description: Wires events from various bundles to the notification servic
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
javax.imageio,
net.java.sip.communicator.util,
Import-Package: javax.imageio,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.gui,
org.jitsi.service.neomedia,
net.java.sip.communicator.service.notification,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
org.jitsi.service.resources, net.java.sip.communicator.service.resources
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
org.jitsi.service.neomedia,
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.osgi.framework

13
src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
Unescape View File

@ -4,18 +4,19 @@ Bundle-Description: Media Utilities for the Protocol Provider Service.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
Import-Package: net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.util,
org.ice4j.ice,
org.jitsi.service.configuration,
org.jitsi.service.neomedia,
org.jitsi.service.neomedia.control,
org.jitsi.service.neomedia.device,
org.jitsi.service.neomedia.event,
org.jitsi.service.neomedia.format,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.netaddr,
org.jitsi.service.protocol,
org.jitsi.util,
net.java.sip.communicator.util,
org.jitsi.util.event,
org.ice4j.ice
org.osgi.framework
Export-Package: net.java.sip.communicator.service.protocol.media

12
src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
Unescape View File

@ -4,13 +4,15 @@ Bundle-Description: Protocol Provider Service.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.osgi.framework,
Import-Package: net.java.sip.communicator.service.credentialsstorage,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
org.jitsi.service.configuration,
net.java.sip.communicator.service.credentialsstorage,
org.jitsi.service.neomedia,
org.jitsi.service.resources, net.java.sip.communicator.service.resources,
net.java.sip.communicator.util,
org.jitsi.util.event
org.jitsi.service.protocol.event,
org.jitsi.service.resources,
org.jitsi.util.event,
org.osgi.framework
Export-Package: net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.aimconstants,
net.java.sip.communicator.service.protocol.event,

2
test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
Unescape View File

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

2
test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
Unescape View File

@ -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,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.impl.protocol.mock

2
test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
Unescape View File

@ -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,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
org.osgi.framework,
org.w3c.dom,
javax.xml.parsers,

2
test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
Unescape View File

@ -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,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
org.osgi.framework,
org.w3c.dom,
javax.xml.parsers,

2
test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
Unescape View File

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

2
test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
Unescape View File

@ -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,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
org.jitsi.service.fileaccess

2
test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
Unescape View File

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

2
test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf
Unescape View File

@ -10,7 +10,7 @@ Import-Package: junit.framework,
javax.xml.parsers,
org.jitsi.service.configuration,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.protocol.msnconstants,
net.java.sip.communicator.util,
net.java.sip.communicator.util.dns,

2
test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf
Unescape View File

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

2
test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
Unescape View File

@ -14,7 +14,7 @@ Import-Package: org.jitsi.service.configuration,
net.java.sip.communicator.util.dns,
net.java.sip.communicator.util.xml,
net.java.sip.communicator.service.protocol,
net.java.sip.communicator.service.protocol.event,
net.java.sip.communicator.service.protocol.event,org.jitsi.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,

2
test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
Unescape View File

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

2
test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
Unescape View File

@ -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,
net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
net.java.sip.communicator.service.contactlist,
net.java.sip.communicator.service.contactlist.event,
net.java.sip.communicator.service.gui,

Write Preview
Loading…
Cancel
Save