• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1Index: org/jivesoftware/smackx/packet/JingleContentInfo.java
2===================================================================
3--- org/jivesoftware/smackx/packet/JingleContentInfo.java	(revision 11644)
4+++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(working copy)
5@@ -96,7 +96,7 @@
6      */
7     public static class Audio extends JingleContentInfo {
8
9-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
10+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
11
12         public Audio(final ContentInfo mi) {
13             super(mi);
14Index: org/jivesoftware/smackx/packet/JingleError.java
15===================================================================
16--- org/jivesoftware/smackx/packet/JingleError.java	(revision 11644)
17+++ org/jivesoftware/smackx/packet/JingleError.java	(working copy)
18@@ -27,7 +27,7 @@
19
20 public class JingleError implements PacketExtension {
21
22-    public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
23+    public static String NAMESPACE = "urn:xmpp:jingle:errors:1";
24
25     public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");
26
27Index: org/jivesoftware/smackx/packet/JingleTransport.java
28===================================================================
29--- org/jivesoftware/smackx/packet/JingleTransport.java	(revision 11644)
30+++ org/jivesoftware/smackx/packet/JingleTransport.java	(working copy)
31@@ -270,7 +270,7 @@
32      * RTP-ICE profile
33      */
34     public static class Ice extends JingleTransport {
35-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp";
36+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1";
37
38         public Ice() {
39             super();
40@@ -352,7 +352,7 @@
41      * Raw UDP profile.
42      */
43     public static class RawUdp extends JingleTransport {
44-        public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0177.html#ns";
45+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:raw-udp:1";
46
47         public RawUdp() {
48             super();
49Index: org/jivesoftware/smackx/packet/JingleContentDescription.java
50===================================================================
51--- org/jivesoftware/smackx/packet/JingleContentDescription.java	(revision 11644)
52+++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(working copy)
53@@ -66,6 +66,13 @@
54     public abstract String getNamespace();
55
56     /**
57+     * Return the media type.
58+     *
59+     * @return The media type
60+     */
61+    public abstract String getMediaType();
62+
63+    /**
64      * Adds a audio payload type to the packet.
65      *
66      * @param pt the audio payload type to add.
67@@ -153,7 +160,8 @@
68         synchronized (payloads) {
69             if (payloads.size() > 0) {
70                 buf.append("<").append(getElementName());
71-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
72+                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
73+                buf.append(" media=\"").append(getMediaType()).append("\" >");
74
75                 Iterator pt = payloads.listIterator();
76                 while (pt.hasNext()) {
77@@ -172,7 +180,8 @@
78      */
79     public static class Audio extends JingleContentDescription {
80
81-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
82+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
83+        public static final String MEDIA_TYPE = "audio";
84
85         public Audio() {
86             super();
87@@ -189,6 +198,10 @@
88         public String getNamespace() {
89             return NAMESPACE;
90         }
91+
92+        public String getMediaType() {
93+            return MEDIA_TYPE;
94+        }
95     }
96
97     /**
98Index: org/jivesoftware/smackx/packet/Jingle.java
99===================================================================
100--- org/jivesoftware/smackx/packet/Jingle.java	(revision 11644)
101+++ org/jivesoftware/smackx/packet/Jingle.java	(working copy)
102@@ -44,7 +44,7 @@
103
104     // static
105
106-    public static final String NAMESPACE = "urn:xmpp:tmp:jingle";
107+    public static final String NAMESPACE = "urn:xmpp:jingle:1";
108
109     public static final String NODENAME = "jingle";
110
111Index: org/jivesoftware/smackx/packet/JingleDescription.java
112===================================================================
113--- org/jivesoftware/smackx/packet/JingleDescription.java	(revision 11644)
114+++ org/jivesoftware/smackx/packet/JingleDescription.java	(working copy)
115@@ -69,6 +69,13 @@
116     public abstract String getNamespace();
117
118     /**
119+     * Return the media type.
120+     *
121+     * @return The media type
122+     */
123+    public abstract String getMediaType();
124+
125+    /**
126      * Adds a audio payload type to the packet.
127      *
128      * @param pt the audio payload type to add.
129@@ -160,7 +167,8 @@
130         synchronized (payloads) {
131             if (payloads.size() > 0) {
132                 buf.append("<").append(getElementName());
133-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
134+                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
135+                buf.append(" media=\"").append(getMediaType()).append("\" >");
136
137                 for (PayloadType payloadType : payloads) {
138                     if (payloadType != null) {
139@@ -179,7 +187,8 @@
140      */
141     public static class Audio extends JingleDescription {
142
143-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
144+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
145+        public static final String MEDIA_TYPE = "audio";
146
147         public Audio() {
148             super();
149@@ -196,5 +205,9 @@
150         public String getNamespace() {
151             return NAMESPACE;
152         }
153+
154+        public String getMediaType() {
155+            return MEDIA_TYPE;
156+        }
157     }
158 }
159Index: org/jivesoftware/smackx/jingle/JingleManager.java
160===================================================================
161--- org/jivesoftware/smackx/jingle/JingleManager.java	(revision 11644)
162+++ org/jivesoftware/smackx/jingle/JingleManager.java	(working copy)
163@@ -255,7 +255,7 @@
164      */
165     public static void setJingleServiceEnabled() {
166         ProviderManager providerManager = ProviderManager.getInstance();
167-        providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider());
168+        providerManager.addIQProvider("jingle", "urn:xmpp:jingle:1", new JingleProvider());
169
170         // Enable the Jingle support on every established connection
171         // The ServiceDiscoveryManager class should have been already
172