Index: EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml
===================================================================
--- EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml	(revision 1253)
+++ EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/data-access-config.xml	(revision 1257)
@@ -2,8 +2,15 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-    <bean id="trackingDao" class="gov.va.med.edp.dao.rpc.VistaLinkTrackingDao"/>
-    <bean id="bigBoardDao" class="gov.va.med.edp.dao.rpc.VistaLinkBigBoardDao"/>
-    <bean id="sessionDao" class="gov.va.med.edp.dao.rpc.VistaLinkSessionDao"/>
-    <bean id="serverPackageVersionDao" class="gov.va.med.edp.dao.rpc.VistaLinkServerPackageVersionDao"/>
-    
+    <bean id="trackingDao" class="gov.va.med.edp.dao.rpc.VistaLinkTrackingDao">
+        <property name="rpcTemplate" ref="vistaLinkRpcTemplate"/>
+    </bean>
+    <bean id="bigBoardDao" class="gov.va.med.edp.dao.rpc.VistaLinkBigBoardDao">
+        <property name="rpcTemplate" ref="vistaLinkRpcTemplate"/>
+    </bean>
+    <bean id="sessionDao" class="gov.va.med.edp.dao.rpc.VistaLinkSessionDao">
+        <property name="rpcTemplate" ref="vistaLinkRpcTemplate"/>
+    </bean>
+    <bean id="serverPackageVersionDao" class="gov.va.med.edp.dao.rpc.VistaLinkServerPackageVersionDao">
+        <property name="rpcTemplate" ref="vistaLinkRpcTemplate"/>
+    </bean>
 </beans>
Index: EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml
===================================================================
--- EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml	(revision 1253)
+++ EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/security-config.xml	(revision 1257)
@@ -33,5 +33,5 @@
           class="gov.va.med.edp.springframework.security.userdetails.vistalink.VistaLinkUserDetailService">
         <property name="applicationName" value="${app.name}"/>
-        <property name="connectionFactoryLocator" ref="vistaLinkConnectionFactoryLocator"/>
+        <property name="rpcTemplate" ref="vistaLinkRpcTemplate"/>
     </bean>
 
@@ -60,8 +60,3 @@
         <property name="filterProcessesUrl" value="/logout.html"/>
     </bean>
-
-    <bean id="vistaLinkConnectionFactoryLocator"
-          class="gov.va.med.edp.vistalink.locator.VistaLinkConnectorConfigConnectionFactoryLocator">
-        <property name="connectors" ref="vistaAccounts"/>
-    </bean>
 </beans>
Index: EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/vistalink-config.xml
===================================================================
--- EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/vistalink-config.xml	(revision 1253)
+++ EDIS/trunk/java/tracking-server-main/src/main/webapp/WEB-INF/config/vistalink-config.xml	(revision 1257)
@@ -5,11 +5,21 @@
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
+    <bean id="vistaLinkConnectionFactoryLocator"
+          class="gov.va.med.edp.vistalink.locator.VistaLinkConnectorConfigConnectionFactoryLocator">
+        <property name="connectors" ref="vistaAccounts"/>
+    </bean>
+
+    <bean id="vistaLinkRpcTemplate" class="gov.va.med.edp.vistalink.VistaLinkTemplate">
+        <constructor-arg index="0" ref="vistaLinkConnectionFactoryLocator"/>
+    </bean>
+
     <util:set id="vistaAccounts">
         <bean class="gov.va.med.edp.vistalink.locator.VistaLinkConnectorConfig">
-            <property name="host" value="foo"/>
-            <property name="name" value="FOO"/>
+            <property name="host" value="66.206.177.84"/>
+            <property name="port" value="9310"/>
+            <property name="name" value="WORLDVISTA DEMO CLINIC"/>
             <property name="primaryStation" value="500"/>
-            <property name="accessCode" value="foo"/>
-            <property name="verifyCode" value="bar"/>
+            <property name="accessCode" value="EDISUSER1"/>
+            <property name="verifyCode" value="VISTAIS#1"/>
         </bean>
     </util:set>