Changeset 1257 for EDIS/trunk/java/tracking-server-core/src/main

Timestamp:

Oct 2, 2011, 6:06:34 PM (13 years ago)

Author:

Solomon Blaz

Message:

deleted duplicate classes from gov.va.med.edp.rpc package in favor of ones in gov.va.med.edp.vistalink and configured rest of application accordingly

Location:

EDIS/trunk/java/tracking-server-core/src/main/java/gov/va/med/edp

Files:

• dao/rpc/VistaLinkBigBoardDao.java (modified) (1 diff)
• dao/rpc/VistaLinkServerPackageVersionDao.java (modified) (3 diffs)
• dao/rpc/VistaLinkTrackingDao.java (modified) (2 diffs)
• rpc (deleted)

EDIS/trunk/java/tracking-server-core/src/main/java/gov/va/med/edp/dao/rpc/VistaLinkBigBoardDao.java

@@ -2 +2 @@
 
 import gov.va.med.edp.dao.TrackingDao;
-import gov.va.med.edp.rpc.VistaLinkDaoSupport;
+import gov.va.med.edp.vistalink.VistaLinkDaoSupport;
 import org.springframework.dao.DataAccessException;
 

EDIS/trunk/java/tracking-server-core/src/main/java/gov/va/med/edp/dao/rpc/VistaLinkServerPackageVersionDao.java

@@ -1 +1 @@
 package gov.va.med.edp.dao.rpc;
 
-import gov.va.med.edp.rpc.VistaLinkDaoSupport;
+import gov.va.med.edp.vistalink.VistaLinkTemplate;
 import gov.va.med.edp.vo.BigBoardDebugInfoVO;
 import gov.va.med.edp.dao.ServerPackageVersionDao;
@@ -10 +10 @@
 import java.io.IOException;
 
+import gov.va.med.vistalink.adapter.spi.VistaLinkServerInfo;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -35 +36 @@
 
     public BigBoardDebugInfoVO getVistaLinkConnectionInfo(String stationNumber) throws DataAccessException {
-        return getRpcTemplate().getVistaLinkConnectionInfo(stationNumber, EDPTRACKING_APPLICATION_USER);
-    }    
+        VistaLinkServerInfo vistaLinkServerInfo = getRpcTemplate().getConnectionInfo(stationNumber, EDPTRACKING_APPLICATION_USER, VistaLinkTemplate.USER_TYPE_APPLICATION_PROXY);
+        BigBoardDebugInfoVO bbd = new BigBoardDebugInfoVO(vistaLinkServerInfo.getAddress().toString(), new Integer(vistaLinkServerInfo.getPort()).toString());
+            return bbd;
+    }
     
     private String getVersion(String result) {

EDIS/trunk/java/tracking-server-core/src/main/java/gov/va/med/edp/dao/rpc/VistaLinkTrackingDao.java

@@ -1 +1 @@
 package gov.va.med.edp.dao.rpc;
 
+import gov.va.med.edp.vistalink.VistaLinkDaoSupport;
 import org.springframework.dao.DataAccessException;
 
@@ -8 +9 @@
 
 import gov.va.med.edp.dao.TrackingDao;
-import gov.va.med.edp.rpc.VistaLinkDaoSupport;
 
 public class VistaLinkTrackingDao extends VistaLinkDaoSupport implements TrackingDao {