[dcm4che-commits] CVS: dcm4chex-ejb14/src/java/org/dcm4chex/mbeans AEService.java,1.3,1.4 DcmSrv.java,1.3,1.4

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4chex-ejb14/src/java/org/dcm4chex/mbeans
In directory usw-pr-cvs1:/tmp/cvs-serv6162/src/java/org/dcm4chex/mbeans

Modified Files:
	AEService.java DcmSrv.java 
Log Message:
implement MOVE SCP


Index: AEService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4chex-ejb14/src/java/org/dcm4chex/mbeans/AEService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AEService.java	26 Jul 2002 13:22:40 -0000	1.3
--- AEService.java	28 Jul 2002 20:48:39 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  import org.dcm4chex.ejb.interfaces.AELocalHome;
  import org.dcm4chex.ejb.interfaces.AELocal;
+ import org.dcm4chex.ejb.interfaces.AE_DTO;
  
  import org.dcm4che.util.DcmURL;
***************
*** 101,105 ****
          Iterator it = c.iterator();
          for (int i = 0; i < retval.length; ++i) {
!             retval[i] = ((AELocal)it.next()).getUrl();
          }
          return retval;
--- 102,106 ----
          Iterator it = c.iterator();
          for (int i = 0; i < retval.length; ++i) {
!             retval[i] = ((AELocal)it.next()).getAE_DTO().toString();
          }
          return retval;

Index: DcmSrv.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4chex-ejb14/src/java/org/dcm4chex/mbeans/DcmSrv.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DcmSrv.java	26 Jul 2002 18:19:19 -0000	1.3
--- DcmSrv.java	28 Jul 2002 20:48:39 -0000	1.4
***************
*** 23,31 ****
  package org.dcm4chex.mbeans;
  
- import org.dcm4chex.mbeans.dcmsrv.StoreSCP;
  import org.dcm4chex.mbeans.dcmsrv.FindSCP;
  
  import org.dcm4che.dict.UIDs;
! import org.dcm4che.net.Factory;
  import org.dcm4che.net.AcceptorPolicy;
  import org.dcm4che.net.DcmServiceRegistry;
--- 23,32 ----
  package org.dcm4chex.mbeans;
  
  import org.dcm4chex.mbeans.dcmsrv.FindSCP;
+ import org.dcm4chex.mbeans.dcmsrv.MoveSCP;
+ import org.dcm4chex.mbeans.dcmsrv.StoreSCP;
  
  import org.dcm4che.dict.UIDs;
! import org.dcm4che.net.AssociationFactory;
  import org.dcm4che.net.AcceptorPolicy;
  import org.dcm4che.net.DcmServiceRegistry;
***************
*** 64,69 ****
      private static final ServerFactory srvFact =
          ServerFactory.getInstance();
!     private static final Factory assocFact =
!         Factory.getInstance();
      
      private AcceptorPolicy policy = assocFact.newAcceptorPolicy();
--- 65,70 ----
      private static final ServerFactory srvFact =
          ServerFactory.getInstance();
!     private static final AssociationFactory assocFact =
!         AssociationFactory.getInstance();
      
      private AcceptorPolicy policy = assocFact.newAcceptorPolicy();
***************
*** 73,76 ****
--- 74,78 ----
      private StoreSCP storeSCP = new StoreSCP();
      private FindSCP findSCP = new FindSCP();
+     private MoveSCP moveSCP = new MoveSCP();
      
      private int port = 104;
***************
*** 180,183 ****
--- 182,189 ----
          services.bind(UIDs.StudyRootQueryRetrieveInformationModelFIND,
              findSCP);
+         policy.addPresContext(UIDs.StudyRootQueryRetrieveInformationModelMOVE,
+             TS_UIDS);
+         services.bind(UIDs.StudyRootQueryRetrieveInformationModelMOVE,
+             moveSCP);
      }
  }