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>
Sun, 26 Dec 2010 01:01:58 +0100
changeset 840 322071d17c00
child 841 dfee4a6ffdad
permissions -rw-r--r--
merge beem-audio with trunk + some bugfix/improvements
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
 
===================================================================
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     3
 
--- org/jivesoftware/smackx/packet/JingleContentInfo.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     4
 
+++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(working copy)
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
 
===================================================================
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    16
 
--- org/jivesoftware/smackx/packet/JingleError.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    17
 
+++ org/jivesoftware/smackx/packet/JingleError.java	(working copy)
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
 
===================================================================
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    29
 
--- org/jivesoftware/smackx/packet/JingleTransport.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    30
 
+++ org/jivesoftware/smackx/packet/JingleTransport.java	(working copy)
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();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    40
 
Index: org/jivesoftware/smackx/packet/JingleContentDescription.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    41
 
===================================================================
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    42
 
--- org/jivesoftware/smackx/packet/JingleContentDescription.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    43
 
+++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(working copy)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    44
 
@@ -172,7 +172,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    45
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    46
 
     public static class Audio extends JingleContentDescription {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    47
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    48
 
-        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 
    49
 
+        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 
    50
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    51
 
         public Audio() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    52
 
             super();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    53
 
Index: org/jivesoftware/smackx/packet/Jingle.java
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
 
--- org/jivesoftware/smackx/packet/Jingle.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    56
 
+++ org/jivesoftware/smackx/packet/Jingle.java	(working copy)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    57
 
@@ -44,7 +44,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    58
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    59
 
     // static
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    60
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    61
 
-    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 
    62
 
+    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 
    63
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    64
 
     public static final String NODENAME = "jingle";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    65
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    66
 
Index: org/jivesoftware/smackx/jingle/JingleManager.java
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
 
--- org/jivesoftware/smackx/jingle/JingleManager.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    69
 
+++ org/jivesoftware/smackx/jingle/JingleManager.java	(working copy)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    70
 
@@ -255,7 +255,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    71
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    72
 
     public static void setJingleServiceEnabled() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    73
 
         ProviderManager providerManager = ProviderManager.getInstance();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    74
 
-        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 
    75
 
+        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 
    76
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    77
 
         // 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 
    78
 
         // The ServiceDiscoveryManager class should have been already
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    79
 
@@ -598,4 +598,4 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    80
 
         }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    81
 
         return null;
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    82
 
     }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    83
 
-}
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    84
 
\ No newline at end of file
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    85
 
+}
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    86
 
Index: org/jivesoftware/smackx/packet/JingleDescription.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    87
 
===================================================================
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    88
 
--- org/jivesoftware/smackx/packet/JingleDescription.java	(revision 11644)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    89
 
+++ org/jivesoftware/smackx/packet/JingleDescription.java	(working copy)
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    90
 
@@ -179,7 +179,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    91
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    92
 
     public static class Audio extends JingleDescription {
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 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 
    95
 
+        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 
    96
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    97
 
         public Audio() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    98
 
             super();
BEEM-Jingle