Use only OSS components for jain-sdp

The embedded jain-sdp library includes some interface-files that are
covered by a non-free license. Remove them and use a free version instead
that is published on Maven Central.
This commit is contained in:
Ingo Bauersachs 2016-04-02 14:28:04 +02:00
parent 2014cb9fef
commit 9cbedb3a95
4 changed files with 16 additions and 7 deletions

Binary file not shown.

10
pom.xml
View File

@ -19,8 +19,14 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.sdp</groupId> <groupId>org.opentelecoms.sdp</groupId>
<artifactId>jain-sdp</artifactId> <artifactId>java-sdp-nist-bridge</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.jitsi</groupId>
<artifactId>jain-sip-ri-ossonly</artifactId>
<version>1.2.98c7f8c-jitsi-oss1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bitlet</groupId> <groupId>org.bitlet</groupId>

View File

@ -19,6 +19,7 @@ package org.ice4j.ice.sdp;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.ice.*; import org.ice4j.ice.*;
import org.opentelecoms.javax.sdp.*;
import javax.sdp.*; import javax.sdp.*;
import java.util.*; import java.util.*;
@ -71,7 +72,7 @@ public class IceSdpUtils
/** /**
* A reference to the currently valid SDP factory instance. * A reference to the currently valid SDP factory instance.
*/ */
private static final SdpFactory sdpFactory = SdpFactory.getInstance(); private static final SdpFactory sdpFactory = new NistSdpFactory();
/** /**
* The <tt>Logger</tt> used by the <tt>IceSdpUtils</tt> * The <tt>Logger</tt> used by the <tt>IceSdpUtils</tt>
@ -138,6 +139,7 @@ public class IceSdpUtils
* @param iceMediaStream the media stream where we should extract candidates * @param iceMediaStream the media stream where we should extract candidates
* from. * from.
*/ */
@SuppressWarnings({ "rawtypes", "unchecked" })
public static void initMediaDescription(MediaDescription mediaDescription, public static void initMediaDescription(MediaDescription mediaDescription,
IceMediaStream iceMediaStream) IceMediaStream iceMediaStream)
{ {
@ -156,10 +158,10 @@ public class IceSdpUtils
if(firstComponent == null) if(firstComponent == null)
firstComponent = component; firstComponent = component;
Vector attributes = mediaDescription.getAttributes(true);
for(Candidate<?> candidate : component.getLocalCandidates()) for(Candidate<?> candidate : component.getLocalCandidates())
{ {
mediaDescription.addAttribute( attributes.add(new CandidateAttribute(candidate));
new CandidateAttribute(candidate));
} }
} }

View File

@ -24,6 +24,7 @@ import javax.sdp.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.ice.*; import org.ice4j.ice.*;
import org.ice4j.ice.sdp.*; import org.ice4j.ice.sdp.*;
import org.opentelecoms.javax.sdp.*;
/** /**
* Utilities for manipulating SDP. Some of the utilities in this method <b>do * Utilities for manipulating SDP. Some of the utilities in this method <b>do
@ -53,7 +54,7 @@ public class SdpUtils
*/ */
public static String createSDPDescription(Agent agent) throws Throwable public static String createSDPDescription(Agent agent) throws Throwable
{ {
SdpFactory factory = SdpFactory.getInstance(); SdpFactory factory = new NistSdpFactory();
SessionDescription sdess = factory.createSessionDescription(); SessionDescription sdess = factory.createSessionDescription();
IceSdpUtils.initSessionDescription(sdess, agent); IceSdpUtils.initSessionDescription(sdess, agent);
@ -75,7 +76,7 @@ public class SdpUtils
public static void parseSDP(Agent localAgent, String sdp) public static void parseSDP(Agent localAgent, String sdp)
throws Exception throws Exception
{ {
SdpFactory factory = SdpFactory.getInstance(); SdpFactory factory = new NistSdpFactory();
SessionDescription sdess = factory.createSessionDescription(sdp); SessionDescription sdess = factory.createSessionDescription(sdp);
for(IceMediaStream stream : localAgent.getStreams()) for(IceMediaStream stream : localAgent.getStreams())