[CalendarServer-changes] [2682] CalendarServer/branches/users/sagen/xmpp

source_changes at macosforge.org source_changes at macosforge.org
Fri Jul 11 10:18:41 PDT 2008


Revision: 2682
          http://trac.macosforge.org/projects/calendarserver/changeset/2682
Author:   wsanchez at apple.com
Date:     2008-07-11 10:18:41 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
Enable Notifications autometically if any Notification service is enabled.

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/xmpp/conf/caldavd-test.plist
    CalendarServer/branches/users/sagen/xmpp/conf/caldavd.plist
    CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py

Modified: CalendarServer/branches/users/sagen/xmpp/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/conf/caldavd-test.plist	2008-07-11 16:08:37 UTC (rev 2681)
+++ CalendarServer/branches/users/sagen/xmpp/conf/caldavd-test.plist	2008-07-11 17:18:41 UTC (rev 2682)
@@ -410,8 +410,6 @@
 
   <key>Notifications</key>
   <dict>
-    <key>Enabled</key>
-    <true/>
     <key>CoalesceSeconds</key>
     <integer>10</integer>
     <key>InternalNotificationHost</key>
@@ -448,7 +446,6 @@
         <integer>120</integer>
       </dict>
     </array>
-
   </dict>
 
 

Modified: CalendarServer/branches/users/sagen/xmpp/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/conf/caldavd.plist	2008-07-11 16:08:37 UTC (rev 2681)
+++ CalendarServer/branches/users/sagen/xmpp/conf/caldavd.plist	2008-07-11 17:18:41 UTC (rev 2682)
@@ -277,6 +277,43 @@
 
 
   <!--
+    Notifications
+  -->
+
+  <key>Notifications</key>
+  <dict>
+    <key>CoalesceSeconds</key>
+    <integer>10</integer>
+    <key>InternalNotificationHost</key>
+    <string>localhost</string>
+    <key>InternalNotificationPort</key>
+    <integer>62309</integer>
+
+    <key>Services</key>
+    <array>
+      <dict>
+        <key>Service</key>
+        <string>twistedcaldav.notify.XMPPNotifierService</string>
+        <key>Enabled</key>
+        <false/>
+        <key>Host</key>
+        <string>xmpp.host.name</string>
+        <key>Port</key>
+        <integer>5222</integer>
+        <key>JID</key>
+        <string>jid at xmpp.host/resource</string>
+        <key>Password</key>
+        <string>password_goes_here</string>
+        <key>ServiceAddress</key>
+        <string>pubsub.xmpp.host.name</string>
+        <key>KeepAliveSeconds</key>
+        <integer>120</integer>
+      </dict>
+    </array>
+  </dict>
+
+
+  <!--
     Miscellaneous items
   -->
 

Modified: CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py	2008-07-11 16:08:37 UTC (rev 2681)
+++ CalendarServer/branches/users/sagen/xmpp/twistedcaldav/config.py	2008-07-11 17:18:41 UTC (rev 2682)
@@ -172,8 +172,6 @@
     # Notifications
     #
     "Notifications" : {
-
-        "Enabled" : True,
         "CoalesceSeconds" : 10,
         "InternalNotificationHost" : "localhost",
         "InternalNotificationPort" : 62309,
@@ -181,7 +179,7 @@
         "Services" : [
             {
                 "Service" : "twistedcaldav.notify.SimpleLineNotifierService",
-                "Enabled" : True,
+                "Enabled" : False,
                 "Port" : 62308,
             },
             {
@@ -378,6 +376,16 @@
 
         self.updateLogLevels()
 
+        #
+        # Notifications
+        #
+        for service in self.Notifications["Services"]:
+            if service["Enabled"]:
+                self.Notifications["Enabled"] = True
+                break
+        else:
+            self.Notifications["Enabled"] = False
+
     def updateLogLevels(self):
         clearLogLevels()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080711/07336593/attachment-0001.html 


More information about the calendarserver-changes mailing list