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

Update ice4j and jain-sip dependencies

Browse Source 
* ice4j: v1.0
* jain-sip-api: move to FLOSS version from Opentelecoms (v1.2)
* jain-sdp-api: move to FLOSS version from Opentelecoms (v1.0)
* jain-sip-ri:
  jitsi branch with oss-only components, based on 1.2.279
  (tag v1.2.279-jitsi-oss1)
* sdp-nist-bridge: v1.1

These libraries are used as released on Maven Central.

* Update OSGi manifests

Now that jain-sip and ice4j are no longer directly bundled,
import the required packages.
sip-call-params
Ingo Bauersachs 10 years ago
parent 3c2285ccce
commit cd62892c27
18 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File

9
.classpath
Unescape View File

@ -31,14 +31,15 @@
<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar" sourcepath="../ice4j/src"/>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
<classpathentry kind="lib" path="lib/installer-exclude/ice4j-1.0.jar" sourcepath="../ice4j/src/main/java"/>
<classpathentry kind="lib" path="lib/installer-exclude/sdp-api-1.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/sip-api-1.2-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar">
<classpathentry kind="lib" path="lib/installer-exclude/java-sdp-nist-bridge-1.1.jar"/>
<attributes>
<attribute name="javadoc_location" value="https://hudson.jboss.org/jenkins/job/jain-sip/lastStableBuild/artifact/javadoc/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-api.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jdic_misc.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jfontchooser-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jmdns.jar"/>

9
build.xml
Unescape View File

@ -1122,6 +1122,11 @@
<copy file="${lib.noinst}/bccontrib-1.0.jar" tofile="${bundles.dest}/bccontrib.jar"/>
<copy file="${lib.noinst}/jmork-1.0.5.jar" tofile="${bundles.dest}/jmork.jar"/>
<copy file="${lib.noinst}/weupnp-0.1.4.jar" tofile="${bundles.dest}/weupnp.jar"/>
<copy file="${lib.noinst}/ice4j-1.0.jar" tofile="${bundles.dest}/ice4j.jar"/>
<copy file="${lib.noinst}/sdp-api-1.0.jar" tofile="${bundles.dest}/sdp-api.jar"/>
<copy file="${lib.noinst}/sip-api-1.2-1.2.jar" tofile="${bundles.dest}/sip-api.jar"/>
<copy file="${lib.noinst}/java-sdp-nist-bridge-1.1.jar" tofile="${bundles.dest}/java-sdp-nist-bridge.jar"/>
<copy file="${lib.noinst}/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar" tofile="${bundles.dest}/jain-sip-ri.jar"/>
</target>
<!--BUNDLE-SC-LAUNCHER-->
@ -1472,7 +1477,6 @@ javax.swing.event, javax.swing.border"/>
prefix="net/java/sip/communicator/service/netaddr" />
<zipfileset dir="${dest}/net/java/sip/communicator/impl/netaddr"
prefix="net/java/sip/communicator/impl/netaddr" />
<zipfileset src="${lib.noinst}/ice4j.jar" prefix="" />
</jar>
</target>
@ -1512,9 +1516,6 @@ javax.swing.event, javax.swing.border"/>
manifest="${src}/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/sip"
prefix="net/java/sip/communicator/impl/protocol/sip"/>
<zipfileset src="${lib.noinst}/jain-sip-ri.jar" prefix=""/>
<zipfileset src="${lib.noinst}/jain-sip-api.jar" prefix=""/>
<zipfileset src="${lib.noinst}/jain-sdp.jar" prefix=""/>
</jar>
</target>

12
lib/felix.client.run.properties
Unescape View File

@ -25,7 +25,9 @@ org.osgi.framework.system.packages.extra= \
sun.net.dns; \
sun.security.action; \
sun.security.pkcs11;\
sun.audio
sun.audio;\
sun.nio.ch;\
com.sun.nio.sctp
felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
@ -45,6 +47,14 @@ felix.auto.start.10= \
reference:file:sc-bundles/slf4j-api.jar \
reference:file:sc-bundles/weupnp.jar
felix.auto.start.11= \
reference:file:sc-bundles/sip-api.jar \
reference:file:sc-bundles/sdp-api.jar \
reference:file:sc-bundles/jain-sip-ri.jar \
reference:file:sc-bundles/java-sdp-nist-bridge.jar \
reference:file:sc-bundles/ice4j.jar
# file:lib/bundle/shell.jar \
# file:lib/bundle/servicebinder.jar \
# file:lib/bundle/tablelayout.jar

15
lib/felix.unit.test.properties
Unescape View File

@ -32,7 +32,9 @@ org.osgi.framework.system.packages.extra= \
sun.security.pkcs11; \
sun.reflect; \
org.xbill.DNS;\
sun.audio
sun.audio;\
sun.nio.ch;\
com.sun.nio.sctp
#
@ -58,7 +60,16 @@ felix.auto.start.10= \
reference:file:sc-bundles/bccontrib.jar \
reference:file:sc-bundles/hsqldb.jar \
reference:file:sc-bundles/commons-lang.jar \
reference:file:sc-bundles/guava.jar
reference:file:sc-bundles/guava.jar \
reference:file:sc-bundles/weupnp.jar
felix.auto.start.11= \
reference:file:sc-bundles/sip-api.jar \
reference:file:sc-bundles/sdp-api.jar \
reference:file:sc-bundles/jain-sip-ri.jar \
reference:file:sc-bundles/java-sdp-nist-bridge.jar \
reference:file:sc-bundles/ice4j.jar
# file:lib/bundle/shell.jar \
# file:lib/bundle/bundlerepository.jar \
# file:lib/bundle/servicebinder.jar \

BIN
lib/installer-exclude/ice4j-1.0.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/ice4j.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/jain-sdp.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/jain-sip-api.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/jain-sip-ri.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/java-sdp-nist-bridge-1.1.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/sdp-api-1.0.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/sip-api-1.2-1.2.jar
View File

Binary file not shown.

15
src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
Unescape View File

@ -12,21 +12,16 @@ Import-Package: org.jitsi.service.configuration,
net.java.sip.communicator.service.sysactivity,
net.java.sip.communicator.service.sysactivity.event,
org.osgi.framework,
org.ice4j,
org.ice4j.ice,
org.ice4j.ice.harvest,
org.ice4j.security,
org.ice4j.stack,
org.xml.sax,
org.xml.sax.helpers,
javax.crypto,
javax.crypto.spec,
javax.sdp,
gov.nist.javax.sdp.fields,
com.sun.jna,
com.sun.jna.ptr
Export-Package: net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.netaddr.event,
org.ice4j,
org.ice4j.socket,
org.ice4j.stack,
org.ice4j.ice,
org.ice4j.ice.harvest,
org.ice4j.ice.sdp,
org.ice4j.security
net.java.sip.communicator.service.netaddr.event

6
src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
Unescape View File

@ -18,6 +18,7 @@
package net.java.sip.communicator.impl.protocol.sip.net;
import gov.nist.core.net.*;
import gov.nist.javax.sip.*;
import java.io.*;
import java.net.*;
@ -421,4 +422,9 @@ private int getDSCP()
return 0;
}
@Override
public void setSipStack(SipStackImpl sipStack)
{
}
}

3
src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
Unescape View File

@ -36,6 +36,7 @@
import org.jitsi.service.neomedia.MediaType;
import org.jitsi.service.neomedia.format.*;
import org.jitsi.util.*;
import org.opentelecoms.javax.sdp.*;
/**
* The class contains a number of utility methods that are meant to facilitate
@ -64,7 +65,7 @@ public class SdpUtils
/**
* A reference to the currently valid SDP factory instance.
*/
private static final SdpFactory sdpFactory = SdpFactory.getInstance();
private static final SdpFactory sdpFactory = new NistSdpFactory();
/**
* The name of the SDP attribute that defines zrtp hello hash.

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

@ -5,9 +5,22 @@ Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
Bundle-SymbolicName: net.java.sip.communicator.protocol.sip
Import-Package: ch.imvs.sdes4j.srtp,
gov.nist.core,
gov.nist.core.net,
gov.nist.javax.sip,
gov.nist.javax.sip.address,
gov.nist.javax.sip.header,
gov.nist.javax.sip.header.extensions,
gov.nist.javax.sip.message,
gov.nist.javax.sip.stack,
javax.net,
javax.net.ssl,
javax.security.auth.x500,
javax.sdp,
javax.sip,
javax.sip.address,
javax.sip.header,
javax.sip.message,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.parsers,
@ -76,6 +89,7 @@ Import-Package: ch.imvs.sdes4j.srtp,
org.jitsi.util.xml,
org.json.simple,
org.osgi.framework,
org.opentelecoms.javax.sdp,
org.w3c.dom,
org.xml.sax
Export-Package: net.java.sip.communicator.impl.protocol.sip,
@ -88,6 +102,4 @@ Export-Package: net.java.sip.communicator.impl.protocol.sip,
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,
javax.sdp,
gov.nist.javax.sdp.fields
net.java.sip.communicator.impl.protocol.sip.xcap.utils

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

@ -15,7 +15,6 @@ Import-Package: javax.xml.parsers,
org.ice4j,
org.ice4j.ice,
org.ice4j.ice.harvest,
org.ice4j.ice.sdp,
org.ice4j.security,
org.ice4j.socket,
org.ice4j.stack,

Write Preview
Loading…
Cancel
Save