Index: neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/LocationsManagerImpl.java
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/LocationsManagerImpl.java	(revision 14641)
+++ neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/LocationsManagerImpl.java	(working copy)
@@ -15,6 +15,7 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
+import org.sipfoundry.sipxconfig.admin.AdminContext;
 import org.sipfoundry.sipxconfig.common.SipxHibernateDaoSupport;
 import org.sipfoundry.sipxconfig.common.event.DaoEventPublisher;
 import org.springframework.dao.support.DataAccessUtils;
@@ -26,10 +27,16 @@
     private static final String LOCATION_PROP_PRIMARY = "primary";
 
     private DaoEventPublisher m_daoEventPublisher;
+    
+    private AdminContext m_adminContext;
 
     public void setDaoEventPublisher(DaoEventPublisher daoEventPublisher) {
         m_daoEventPublisher = daoEventPublisher;
     }
+    
+    public void setAdminContext(AdminContext adminContext) {
+        m_adminContext = adminContext;
+    }
 
     /** Return the replication URLs, retrieving them on demand */
     public Location[] getLocations() {
Index: neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/commserver.beans.xml
===================================================================
--- neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/commserver.beans.xml	(revision 14641)
+++ neoconf/src/org/sipfoundry/sipxconfig/admin/commserver/commserver.beans.xml	(working copy)
@@ -8,10 +8,10 @@
 	<property name="daoEventPublisher" ref="daoEventPublisher" />
   </bean>
 
-  <bean id="locationsManagerImpl"
-    class="org.sipfoundry.sipxconfig.admin.commserver.LocationsManagerImpl">
+  <bean id="locationsManagerImpl" class="org.sipfoundry.sipxconfig.admin.commserver.LocationsManagerImpl" autowire="byType">
     <property name="sessionFactory" ref="sessionFactory" />
     <property name="daoEventPublisher" ref="daoEventPublisher" />
+    <property name="adminContext" ref="adminContext" />    
   </bean>
   
   <bean id="locationsManager" class="org.springframework.aop.framework.ProxyFactoryBean" parent="abstractDao">