diff options
18 files changed, 62 insertions, 26 deletions
@@ -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"/> @@ -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> diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index 82ff800..15e34f2 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -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 diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index 415af6d..044f24e 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -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 \ diff --git a/lib/installer-exclude/ice4j-1.0.jar b/lib/installer-exclude/ice4j-1.0.jar Binary files differnew file mode 100644 index 0000000..f899c28 --- /dev/null +++ b/lib/installer-exclude/ice4j-1.0.jar diff --git a/lib/installer-exclude/ice4j.jar b/lib/installer-exclude/ice4j.jar Binary files differdeleted file mode 100644 index 0bdde1c..0000000 --- a/lib/installer-exclude/ice4j.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sdp.jar b/lib/installer-exclude/jain-sdp.jar Binary files differdeleted file mode 100644 index 8f4b7a6..0000000 --- a/lib/installer-exclude/jain-sdp.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sip-api.jar b/lib/installer-exclude/jain-sip-api.jar Binary files differdeleted file mode 100644 index 3ed1a74..0000000 --- a/lib/installer-exclude/jain-sip-api.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar Binary files differnew file mode 100644 index 0000000..f19d986 --- /dev/null +++ b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar diff --git a/lib/installer-exclude/jain-sip-ri.jar b/lib/installer-exclude/jain-sip-ri.jar Binary files differdeleted file mode 100644 index e5298b6..0000000 --- a/lib/installer-exclude/jain-sip-ri.jar +++ /dev/null diff --git a/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar b/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar Binary files differnew file mode 100644 index 0000000..77b8b59 --- /dev/null +++ b/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar diff --git a/lib/installer-exclude/sdp-api-1.0.jar b/lib/installer-exclude/sdp-api-1.0.jar Binary files differnew file mode 100644 index 0000000..fc50919 --- /dev/null +++ b/lib/installer-exclude/sdp-api-1.0.jar diff --git a/lib/installer-exclude/sip-api-1.2-1.2.jar b/lib/installer-exclude/sip-api-1.2-1.2.jar Binary files differnew file mode 100644 index 0000000..3adf4c3 --- /dev/null +++ b/lib/installer-exclude/sip-api-1.2-1.2.jar diff --git a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf index f02d7e4..935ff09 100644 --- a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf +++ b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf @@ -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 diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java index f1c5856..9d088a2 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java @@ -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 @@ public class SslNetworkLayer return 0; } + + @Override + public void setSipStack(SipStackImpl sipStack) + { + } } diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java index c51a96c..47c26a9 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java @@ -36,6 +36,7 @@ import org.jitsi.service.neomedia.*; 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. diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf index c15c025..2015a17 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf +++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf @@ -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 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 4436e93..7bac7aa 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 @@ -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, |