1 Index: org/jivesoftware/smackx/packet/JingleContentInfo.java |
1 Index: org/jivesoftware/smackx/packet/JingleContentInfo.java |
2 =================================================================== |
2 =================================================================== |
3 --- org/jivesoftware/smackx/packet/JingleContentInfo.java (revision 11644) |
3 --- org/jivesoftware/smackx/packet/JingleContentInfo.java (révision 11644) |
4 +++ org/jivesoftware/smackx/packet/JingleContentInfo.java (working copy) |
4 +++ org/jivesoftware/smackx/packet/JingleContentInfo.java (copie de travail) |
5 @@ -96,7 +96,7 @@ |
5 @@ -96,7 +96,7 @@ |
6 */ |
6 */ |
7 public static class Audio extends JingleContentInfo { |
7 public static class Audio extends JingleContentInfo { |
8 |
8 |
9 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
9 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
11 |
11 |
12 public Audio(final ContentInfo mi) { |
12 public Audio(final ContentInfo mi) { |
13 super(mi); |
13 super(mi); |
14 Index: org/jivesoftware/smackx/packet/JingleError.java |
14 Index: org/jivesoftware/smackx/packet/JingleError.java |
15 =================================================================== |
15 =================================================================== |
16 --- org/jivesoftware/smackx/packet/JingleError.java (revision 11644) |
16 --- org/jivesoftware/smackx/packet/JingleError.java (révision 11644) |
17 +++ org/jivesoftware/smackx/packet/JingleError.java (working copy) |
17 +++ org/jivesoftware/smackx/packet/JingleError.java (copie de travail) |
18 @@ -27,7 +27,7 @@ |
18 @@ -27,7 +27,7 @@ |
19 |
19 |
20 public class JingleError implements PacketExtension { |
20 public class JingleError implements PacketExtension { |
21 |
21 |
22 - public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors"; |
22 - public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors"; |
24 |
24 |
25 public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order"); |
25 public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order"); |
26 |
26 |
27 Index: org/jivesoftware/smackx/packet/JingleTransport.java |
27 Index: org/jivesoftware/smackx/packet/JingleTransport.java |
28 =================================================================== |
28 =================================================================== |
29 --- org/jivesoftware/smackx/packet/JingleTransport.java (revision 11644) |
29 --- org/jivesoftware/smackx/packet/JingleTransport.java (révision 11644) |
30 +++ org/jivesoftware/smackx/packet/JingleTransport.java (working copy) |
30 +++ org/jivesoftware/smackx/packet/JingleTransport.java (copie de travail) |
31 @@ -270,7 +270,7 @@ |
31 @@ -270,7 +270,7 @@ |
32 * RTP-ICE profile |
32 * RTP-ICE profile |
33 */ |
33 */ |
34 public static class Ice extends JingleTransport { |
34 public static class Ice extends JingleTransport { |
35 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp"; |
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"; |
36 + public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1"; |
37 |
37 |
38 public Ice() { |
38 public Ice() { |
39 super(); |
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(); |
40 Index: org/jivesoftware/smackx/packet/JingleContentDescription.java |
49 Index: org/jivesoftware/smackx/packet/JingleContentDescription.java |
41 =================================================================== |
50 =================================================================== |
42 --- org/jivesoftware/smackx/packet/JingleContentDescription.java (revision 11644) |
51 --- org/jivesoftware/smackx/packet/JingleContentDescription.java (révision 11644) |
43 +++ org/jivesoftware/smackx/packet/JingleContentDescription.java (working copy) |
52 +++ org/jivesoftware/smackx/packet/JingleContentDescription.java (copie de travail) |
44 @@ -172,7 +172,7 @@ |
53 @@ -172,7 +172,7 @@ |
45 */ |
54 */ |
46 public static class Audio extends JingleContentDescription { |
55 public static class Audio extends JingleContentDescription { |
47 |
56 |
48 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
57 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
50 |
59 |
51 public Audio() { |
60 public Audio() { |
52 super(); |
61 super(); |
53 Index: org/jivesoftware/smackx/packet/Jingle.java |
62 Index: org/jivesoftware/smackx/packet/Jingle.java |
54 =================================================================== |
63 =================================================================== |
55 --- org/jivesoftware/smackx/packet/Jingle.java (revision 11644) |
64 --- org/jivesoftware/smackx/packet/Jingle.java (révision 11644) |
56 +++ org/jivesoftware/smackx/packet/Jingle.java (working copy) |
65 +++ org/jivesoftware/smackx/packet/Jingle.java (copie de travail) |
57 @@ -44,7 +44,7 @@ |
66 @@ -44,7 +44,7 @@ |
58 |
67 |
59 // static |
68 // static |
60 |
69 |
61 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle"; |
70 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle"; |
62 + public static final String NAMESPACE = "urn:xmpp:jingle:1"; |
71 + public static final String NAMESPACE = "urn:xmpp:jingle:1"; |
63 |
72 |
64 public static final String NODENAME = "jingle"; |
73 public static final String NODENAME = "jingle"; |
65 |
74 |
|
75 Index: org/jivesoftware/smackx/packet/JingleDescription.java |
|
76 =================================================================== |
|
77 --- org/jivesoftware/smackx/packet/JingleDescription.java (révision 11644) |
|
78 +++ org/jivesoftware/smackx/packet/JingleDescription.java (copie de travail) |
|
79 @@ -179,7 +179,7 @@ |
|
80 */ |
|
81 public static class Audio extends JingleDescription { |
|
82 |
|
83 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
|
84 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
|
85 |
|
86 public Audio() { |
|
87 super(); |
66 Index: org/jivesoftware/smackx/jingle/JingleManager.java |
88 Index: org/jivesoftware/smackx/jingle/JingleManager.java |
67 =================================================================== |
89 =================================================================== |
68 --- org/jivesoftware/smackx/jingle/JingleManager.java (revision 11644) |
90 --- org/jivesoftware/smackx/jingle/JingleManager.java (révision 11644) |
69 +++ org/jivesoftware/smackx/jingle/JingleManager.java (working copy) |
91 +++ org/jivesoftware/smackx/jingle/JingleManager.java (copie de travail) |
70 @@ -255,7 +255,7 @@ |
92 @@ -255,7 +255,7 @@ |
71 */ |
93 */ |
72 public static void setJingleServiceEnabled() { |
94 public static void setJingleServiceEnabled() { |
73 ProviderManager providerManager = ProviderManager.getInstance(); |
95 ProviderManager providerManager = ProviderManager.getInstance(); |
74 - providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider()); |
96 - providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider()); |
81 return null; |
103 return null; |
82 } |
104 } |
83 -} |
105 -} |
84 \ No newline at end of file |
106 \ No newline at end of file |
85 +} |
107 +} |
86 Index: org/jivesoftware/smackx/packet/JingleDescription.java |
|
87 =================================================================== |
|
88 --- org/jivesoftware/smackx/packet/JingleDescription.java (revision 11644) |
|
89 +++ org/jivesoftware/smackx/packet/JingleDescription.java (working copy) |
|
90 @@ -179,7 +179,7 @@ |
|
91 */ |
|
92 public static class Audio extends JingleDescription { |
|
93 |
|
94 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
|
95 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
|
96 |
|
97 public Audio() { |
|
98 super(); |
|