Mercurial Mercurial > beem > jingle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/asmack-beem/beem_patches/50-jingle-ext.patch
author Nikita Kozlov <nikita@mbdsys.com>
Tue, 28 Dec 2010 16:23:06 +0100
changeset 841 dfee4a6ffdad
parent 840 322071d17c00
child 842 aa80be833fc6
permissions -rw-r--r--
fix jingle raw-udp namespace name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     1
 
Index: org/jivesoftware/smackx/packet/JingleContentInfo.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     2
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
     3
 
--- org/jivesoftware/smackx/packet/JingleContentInfo.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
     4
 
+++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     5
 
@@ -96,7 +96,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     6
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     7
 
     public static class Audio extends JingleContentInfo {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     8
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     9
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    10
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    11
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    12
 
         public Audio(final ContentInfo mi) {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    13
 
             super(mi);
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    14
 
Index: org/jivesoftware/smackx/packet/JingleError.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    15
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    16
 
--- org/jivesoftware/smackx/packet/JingleError.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    17
 
+++ org/jivesoftware/smackx/packet/JingleError.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    18
 
@@ -27,7 +27,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    19
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    20
 
 public class JingleError implements PacketExtension {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    21
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    22
 
-    public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    23
 
+    public static String NAMESPACE = "urn:xmpp:jingle:errors:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    24
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    25
 
     public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    26
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    27
 
Index: org/jivesoftware/smackx/packet/JingleTransport.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    28
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    29
 
--- org/jivesoftware/smackx/packet/JingleTransport.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    30
 
+++ org/jivesoftware/smackx/packet/JingleTransport.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    31
 
@@ -270,7 +270,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    32
 
      * RTP-ICE profile
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    33
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    34
 
     public static class Ice extends JingleTransport {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    35
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    36
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    37
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    38
 
         public Ice() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    39
 
             super();
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    40
 
@@ -352,7 +352,7 @@
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    41
 
      * Raw UDP profile.
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    42
 
      */
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    43
 
     public static class RawUdp extends JingleTransport {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    44
 
-        public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0177.html#ns";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    45
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:raw-udp:1";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    46
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    47
 
         public RawUdp() {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    48
 
             super();
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    49
 
Index: org/jivesoftware/smackx/packet/JingleContentDescription.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    50
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    51
 
--- org/jivesoftware/smackx/packet/JingleContentDescription.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    52
 
+++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    53
 
@@ -172,7 +172,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    54
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    55
 
     public static class Audio extends JingleContentDescription {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    56
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    57
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    58
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    59
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    60
 
         public Audio() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    61
 
             super();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    62
 
Index: org/jivesoftware/smackx/packet/Jingle.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    63
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    64
 
--- org/jivesoftware/smackx/packet/Jingle.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    65
 
+++ org/jivesoftware/smackx/packet/Jingle.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    66
 
@@ -44,7 +44,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    67
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    68
 
     // static
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    69
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    70
 
-    public static final String NAMESPACE = "urn:xmpp:tmp:jingle";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    71
 
+    public static final String NAMESPACE = "urn:xmpp:jingle:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    72
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    73
 
     public static final String NODENAME = "jingle";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    74
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    75
 
Index: org/jivesoftware/smackx/packet/JingleDescription.java
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    76
 
===================================================================
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    77
 
--- org/jivesoftware/smackx/packet/JingleDescription.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    78
 
+++ org/jivesoftware/smackx/packet/JingleDescription.java	(copie de travail)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    79
 
@@ -179,7 +179,7 @@
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    80
 
      */
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    81
 
     public static class Audio extends JingleDescription {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    82
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    83
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    84
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    85
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    86
 
         public Audio() {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    87
 
             super();
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    88
 
Index: org/jivesoftware/smackx/jingle/JingleManager.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    89
 
===================================================================
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    90
 
--- org/jivesoftware/smackx/jingle/JingleManager.java	(révision 11644)
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    91
 
+++ org/jivesoftware/smackx/jingle/JingleManager.java	(copie de travail)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    92
 
@@ -255,7 +255,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    93
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    94
 
     public static void setJingleServiceEnabled() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    95
 
         ProviderManager providerManager = ProviderManager.getInstance();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    96
 
-        providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider());
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    97
 
+        providerManager.addIQProvider("jingle", "urn:xmpp:jingle:1", new JingleProvider());
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    98
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    99
 
         // Enable the Jingle support on every established connection
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   100
 
         // The ServiceDiscoveryManager class should have been already
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   101
 
@@ -598,4 +598,4 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   102
 
         }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   103
 
         return null;
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   104
 
     }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   105
 
-}
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   106
 
\ No newline at end of file
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   107
 
+}
BEEM-Jingle