Index: neoconf/etc/commserver/domain-config.vm
===================================================================
--- neoconf/etc/commserver/domain-config.vm	(revision 13005)
+++ neoconf/etc/commserver/domain-config.vm	(working copy)
@@ -2,3 +2,4 @@
 SIP_REALM : ${realm}
 SHARED_SECRET : ${domain.SharedSecret}
 DEFAULT_LANGUAGE : $language
+ALARM_SERVER_URL : ${alarmServerUrl}
Index: neoconf/etc/sipxconfig.properties.in
===================================================================
--- neoconf/etc/sipxconfig.properties.in	(revision 13005)
+++ neoconf/etc/sipxconfig.properties.in	(working copy)
@@ -38,6 +38,7 @@
 # imdb/sipdb location for https access
 registrationContext.hostname=${MY_FULL_HOSTNAME}
 domainManagerImpl.authorizationRealm=${SIPXCHANGE_REALM}
+domainManagerImpl.alarmServerUrl=https://${SIPXCHANGE_DOMAIN_NAME}:8092
 domainManagerImpl.initialDomain=${SIPXCHANGE_DOMAIN_NAME}
 domainManagerImpl.initialAlias=${PROXY_SERVER_ADDR}
 adminContextImpl.backupDirectory=@sipxpbx.backup.dir@
Index: neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java	(revision 13005)
+++ neoconf/src/org/sipfoundry/sipxconfig/domain/DomainConfiguration.java	(working copy)
@@ -17,11 +17,13 @@
     private Domain m_domain;
     private String m_realm;
     private String m_language;
+    private String m_alarmServerUrl;
 
-    public void generate(Domain domain, String realm, String language) {
+    public void generate(Domain domain, String realm, String language, String alarmServerUrl) {
         m_domain = domain;
         m_realm = realm;
         m_language = language;
+        m_alarmServerUrl = alarmServerUrl;
     }
 
     @Override
@@ -30,6 +32,7 @@
         context.put("domain", m_domain);
         context.put("realm", m_realm);
         context.put("language", m_language);
+        context.put("alarmServerUrl", m_alarmServerUrl);
         return context;
     }
 }
Index: neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManager.java
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManager.java	(revision 13005)
+++ neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManager.java	(working copy)
@@ -19,6 +19,8 @@
 
     String getAuthorizationRealm();
 
+    String getAlarmServerUrl();
+    
     void initialize();
 
     void saveDomain(Domain domain);
Index: neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java	(revision 13005)
+++ neoconf/src/org/sipfoundry/sipxconfig/domain/DomainManagerImpl.java	(working copy)
@@ -29,6 +29,7 @@
     private SipxReplicationContext m_replicationContext;
     private SipxServiceManager m_sipxServiceManager;
     private String m_authorizationRealm;
+    private String m_alarmServerUrl;
     private String m_initialDomain;
     private String m_initialAlias;
 
@@ -101,7 +102,7 @@
         }
         DomainConfiguration domainConfiguration = createDomainConfiguration();
         domainConfiguration.generate(existingDomain, m_authorizationRealm,
-                getExistingLocalization().getLanguage());
+                getExistingLocalization().getLanguage(), m_alarmServerUrl);
         m_replicationContext.replicate(domainConfiguration);
         m_replicationContext.publishEvent(new DomainConfigReplicatedEvent(this));
     }
@@ -159,6 +160,14 @@
         m_authorizationRealm = authorizationRealm;
     }
 
+    public String getAlarmServerUrl() {
+        return m_alarmServerUrl;
+    }
+
+    public void setAlarmServerUr(String alarmServerUrl) {
+        m_alarmServerUrl = alarmServerUrl;
+    }
+
     public void setInitialDomain(String initialDomain) {
         m_initialDomain = initialDomain;
     }
Index: neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java
===================================================================
--- neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java	(revision 13005)
+++ neoconf/test/org/sipfoundry/sipxconfig/domain/DomainConfigurationTest.java	(working copy)
@@ -24,6 +24,7 @@
     private Domain m_domain;
     private String m_language;
     private String m_realm;
+    private String m_alarmServerUrl;
     private DomainConfiguration m_out;
     private String m_referenceConfig;
 
@@ -33,6 +34,7 @@
         m_domain.setSharedSecret("mySecret");
         m_language = "en";
         m_realm = "realm.example.com";
+        m_alarmServerUrl = "https://domain.example.com:8092";
 
         m_out = new DomainConfiguration();
         m_out.setTemplate("commserver/domain-config.vm");
@@ -45,7 +47,7 @@
 
     public void testWrite() throws Exception {
         StringWriter actualConfigWriter = new StringWriter();
-        m_out.generate(m_domain, m_realm, m_language);
+        m_out.generate(m_domain, m_realm, m_language, m_alarmServerUrl);
         m_out.write(actualConfigWriter);
 
         Reader actualConfigReader = new StringReader(actualConfigWriter.toString());
Index: neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config
===================================================================
--- neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config	(revision 13005)
+++ neoconf/test/org/sipfoundry/sipxconfig/domain/expected-domain-config	(working copy)
@@ -2,3 +2,4 @@
 SIP_REALM : realm.example.com
 SHARED_SECRET : mySecret
 DEFAULT_LANGUAGE : en
+ALARM_SERVER_URL : https://domain.example.com:8092
Index: neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java	(revision 13005)
+++ neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java	(working copy)
@@ -178,6 +178,7 @@
         sysProps.setProperty("acdHistoricalStatsImpl.enabled", Boolean.toString(true));
         sysProps.setProperty("adminContextImpl.backupDirectory", outputDirectory + "/backup");
         sysProps.setProperty("domainManagerImpl.authorizationRealm", realm);
+        sysProps.setProperty("domainManagerImpl.alarmServerUrl", "https://" + domainName + ":8092");
         sysProps.setProperty("domainManagerImpl.initialAlias", "alias.example.org");
         sysProps.setProperty("orbitsGenerator.audioDirectory", outputDirectory
                 + "/parkserver/music");
Index: neoconf/src/org/sipfoundry/sipxconfig/domain/domain.beans.xml
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/domain/domain.beans.xml	(revision 13005)
+++ neoconf/src/org/sipfoundry/sipxconfig/domain/domain.beans.xml	(working copy)
@@ -18,6 +18,7 @@
 
     <!-- initialize for tests only: the real value gets set by sipxconfig.properties.in -->
     <property name="initialDomain" value="example.org" />
+    <property name="alarmServerUrl" value="http://example.org:8092" />
 
     <!--
       - CIRCULAR REFERENCE WARNING: