diff --git a/lib/jain-sdp.jar b/lib/jain-sdp.jar deleted file mode 100644 index b61f636..0000000 Binary files a/lib/jain-sdp.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index e612385..dc66e38 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ org.jitsi - jitsi-universe - 1.0-20160202.203332-11 + jitsi-universe-public + 1.0 ice4j @@ -19,8 +19,12 @@ - javax.sdp - jain-sdp + org.opentelecoms.sdp + java-sdp-nist-bridge + + + org.jitsi + jain-sip-ri-ossonly org.bitlet @@ -72,31 +76,4 @@ - - - - jitsi-maven-repository-releases - default - Jitsi Maven Repository (Releases) - - true - - - false - - https://github.com/jitsi/jitsi-maven-repository/raw/master/releases/ - - - jitsi-maven-repository-snapshots - default - Jitsi Maven Repository (Snapshots) - - false - - - true - - https://github.com/jitsi/jitsi-maven-repository/raw/master/snapshots/ - - diff --git a/src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java b/src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java index c23d613..a472b32 100644 --- a/src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java +++ b/src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java @@ -19,6 +19,7 @@ package org.ice4j.ice.sdp; import org.ice4j.*; import org.ice4j.ice.*; +import org.opentelecoms.javax.sdp.*; import javax.sdp.*; import java.util.*; @@ -71,7 +72,7 @@ public class IceSdpUtils /** * A reference to the currently valid SDP factory instance. */ - private static final SdpFactory sdpFactory = SdpFactory.getInstance(); + private static final SdpFactory sdpFactory = new NistSdpFactory(); /** * The Logger used by the IceSdpUtils @@ -138,6 +139,7 @@ public class IceSdpUtils * @param iceMediaStream the media stream where we should extract candidates * from. */ + @SuppressWarnings({ "rawtypes", "unchecked" }) public static void initMediaDescription(MediaDescription mediaDescription, IceMediaStream iceMediaStream) { @@ -156,10 +158,10 @@ public class IceSdpUtils if(firstComponent == null) firstComponent = component; + Vector attributes = mediaDescription.getAttributes(true); for(Candidate candidate : component.getLocalCandidates()) { - mediaDescription.addAttribute( - new CandidateAttribute(candidate)); + attributes.add(new CandidateAttribute(candidate)); } } diff --git a/src/test/java/test/SdpUtils.java b/src/test/java/test/SdpUtils.java index efc552c..96b4e0f 100644 --- a/src/test/java/test/SdpUtils.java +++ b/src/test/java/test/SdpUtils.java @@ -24,6 +24,7 @@ import javax.sdp.*; import org.ice4j.*; import org.ice4j.ice.*; import org.ice4j.ice.sdp.*; +import org.opentelecoms.javax.sdp.*; /** * Utilities for manipulating SDP. Some of the utilities in this method do @@ -53,7 +54,7 @@ public class SdpUtils */ public static String createSDPDescription(Agent agent) throws Throwable { - SdpFactory factory = SdpFactory.getInstance(); + SdpFactory factory = new NistSdpFactory(); SessionDescription sdess = factory.createSessionDescription(); IceSdpUtils.initSessionDescription(sdess, agent); @@ -75,7 +76,7 @@ public class SdpUtils public static void parseSDP(Agent localAgent, String sdp) throws Exception { - SdpFactory factory = SdpFactory.getInstance(); + SdpFactory factory = new NistSdpFactory(); SessionDescription sdess = factory.createSessionDescription(sdp); for(IceMediaStream stream : localAgent.getStreams())