Menu
▾
▴
[dcm4che-commits] CVS: dcm4jboss/src/java/org/dcm4chex/service/mppsscp MppsScpService.java,1.1,1.2 MppsService.java,1.1,1.2
|
From: gunter z. <gun...@us...> - 2003-03-23 08:58:41
|
Update of /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/mppsscp
In directory sc8-pr-cvs1:/tmp/cvs-serv8168/src/java/org/dcm4chex/service/mppsscp
Modified Files:
MppsScpService.java MppsService.java
Log Message:
refactor jboss service mbeans
Index: MppsScpService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/mppsscp/MppsScpService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MppsScpService.java 20 Mar 2003 23:49:34 -0000 1.1
--- MppsScpService.java 23 Mar 2003 08:58:37 -0000 1.2
***************
*** 22,27 ****
--- 22,31 ----
import java.io.File;
import java.io.IOException;
+ import java.io.StringWriter;
+ import java.util.HashMap;
+ import java.util.Map;
import javax.management.ObjectName;
+ import org.dcm4che.data.Dataset;
import org.dcm4che.dict.UIDs;
***************
*** 36,42 ****
* <description>
*
! * @author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! * @since March 20, 2003
! * @version $Revision$
*/
public class MppsScpService
--- 40,47 ----
* <description>
*
! *@author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! *@created March 22, 2003
! *@since March 20, 2003
! *@version $Revision$
*/
public class MppsScpService
***************
*** 49,52 ****
--- 54,63 ----
UIDs.ImplicitVRLittleEndian
};
+ final static Map dumpParam = new HashMap(5);
+ static {
+ dumpParam.put("maxlen", new Integer(128));
+ dumpParam.put("vallen", new Integer(64));
+ dumpParam.put("prefix", "\t");
+ }
// Attributes ----------------------------------------------------
***************
*** 56,59 ****
--- 67,84 ----
// Methods
+ void logDataset(String prompt, Dataset ds)
+ {
+ if (!log.isDebugEnabled()) {
+ return;
+ }
+ try {
+ StringWriter w = new StringWriter();
+ w.write(prompt);
+ ds.dumpDataset(w, dumpParam);
+ log.debug(w.toString());
+ } catch (Exception e) {
+ log.warn("Failed to dump dataset", e);
+ }
+ }
// MppsScpServiceMBean implementation ---------------------------
***************
*** 62,66 ****
* Gets the dcmServerName attribute of the MppsScpService object
*
! * @return The dcmServerName value
*/
public ObjectName getDcmServerName()
--- 87,91 ----
* Gets the dcmServerName attribute of the MppsScpService object
*
! *@return The dcmServerName value
*/
public ObjectName getDcmServerName()
***************
*** 73,77 ****
* Sets the dcmServerName attribute of the MppsScpService object
*
! * @param dcmServerName The new dcmServerName value
*/
public void setDcmServerName(ObjectName dcmServerName)
--- 98,102 ----
* Sets the dcmServerName attribute of the MppsScpService object
*
! *@param dcmServerName The new dcmServerName value
*/
public void setDcmServerName(ObjectName dcmServerName)
***************
*** 84,88 ****
* Gets the acTimeout attribute of the StgCmtService object
*
! * @return The acTimeout value
*/
public int getAcTimeout()
--- 109,113 ----
* Gets the acTimeout attribute of the StgCmtService object
*
! *@return The acTimeout value
*/
public int getAcTimeout()
***************
*** 95,99 ****
* Sets the acTimeout attribute of the StgCmtService object
*
! * @param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
--- 120,124 ----
* Sets the acTimeout attribute of the StgCmtService object
*
! *@param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
***************
*** 106,110 ****
* Gets the dimseTimeout attribute of the StgCmtService object
*
! * @return The dimseTimeout value
*/
public int getDimseTimeout()
--- 131,135 ----
* Gets the dimseTimeout attribute of the StgCmtService object
*
! *@return The dimseTimeout value
*/
public int getDimseTimeout()
***************
*** 117,121 ****
* Sets the dimseTimeout attribute of the StgCmtService object
*
! * @param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
--- 142,146 ----
* Sets the dimseTimeout attribute of the StgCmtService object
*
! *@param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
***************
*** 128,132 ****
* Gets the soCloseDelay attribute of the StgCmtService object
*
! * @return The soCloseDelay value
*/
public int getSoCloseDelay()
--- 153,157 ----
* Gets the soCloseDelay attribute of the StgCmtService object
*
! *@return The soCloseDelay value
*/
public int getSoCloseDelay()
***************
*** 139,143 ****
* Sets the soCloseDelay attribute of the StgCmtService object
*
! * @param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
--- 164,168 ----
* Sets the soCloseDelay attribute of the StgCmtService object
*
! *@param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
***************
*** 150,154 ****
* Gets the forwardMppsTo attribute of the MppsScpService object
*
! * @return The forwardMppsTo value
*/
public String getForwardMppsTo()
--- 175,179 ----
* Gets the forwardMppsTo attribute of the MppsScpService object
*
! *@return The forwardMppsTo value
*/
public String getForwardMppsTo()
***************
*** 161,165 ****
* Sets the forwardMppsTo attribute of the MppsScpService object
*
! * @param forwardMppsTo The new forwardMppsTo value
*/
public void setForwardMppsTo(String forwardMppsTo)
--- 186,190 ----
* Sets the forwardMppsTo attribute of the MppsScpService object
*
! *@param forwardMppsTo The new forwardMppsTo value
*/
public void setForwardMppsTo(String forwardMppsTo)
***************
*** 169,172 ****
--- 194,203 ----
+ /**
+ * Description of the Method
+ *
+ *@param s Description of the Parameter
+ *@return Description of the Return Value
+ */
static String hypenToNull(String s)
{
***************
*** 175,178 ****
--- 206,215 ----
+ /**
+ * Description of the Method
+ *
+ *@param s Description of the Parameter
+ *@return Description of the Return Value
+ */
static String nullToHypen(String s)
{
***************
*** 184,188 ****
* Description of the Method
*
! * @exception Exception Description of the Exception
*/
public void startService()
--- 221,225 ----
* Description of the Method
*
! *@exception Exception Description of the Exception
*/
public void startService()
***************
*** 201,205 ****
* Description of the Method
*
! * @exception Exception Description of the Exception
*/
public void stopService()
--- 238,242 ----
* Description of the Method
*
! *@exception Exception Description of the Exception
*/
public void stopService()
***************
*** 212,215 ****
--- 249,253 ----
+ /** Description of the Method */
private void bindDcmServices()
{
***************
*** 219,222 ****
--- 257,261 ----
+ /** Description of the Method */
private void unbindDcmServices()
{
***************
*** 226,229 ****
--- 265,273 ----
+ /**
+ * Description of the Method
+ *
+ *@param tsuids Description of the Parameter
+ */
private void updatePolicy(String[] tsuids)
{
Index: MppsService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/mppsscp/MppsService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MppsService.java 20 Mar 2003 23:49:35 -0000 1.1
--- MppsService.java 23 Mar 2003 08:58:37 -0000 1.2
***************
*** 47,53 ****
/**
! * @author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! * @since March 20, 2003
! * @version $Revision$ $Date$
*/
class MppsService
--- 47,54 ----
/**
! *@author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! *@created March 22, 2003
! *@since March 20, 2003
! *@version $Revision$ $Date$
*/
class MppsService
***************
*** 75,81 ****
// Constructors --------------------------------------------------
/**
! *Constructor for the MoveService object
*
! * @param scp Description of the Parameter
*/
public MppsService(MppsScpService scp)
--- 76,82 ----
// Constructors --------------------------------------------------
/**
! * Constructor for the MoveService object
*
! *@param scp Description of the Parameter
*/
public MppsService(MppsScpService scp)
***************
*** 88,92 ****
* Sets the sSLContextAdapter attribute of the StgCmtSCP object
*
! * @param tls The new sSLContextAdapter value
*/
public void setSSLContextAdapter(SSLContextAdapter tls)
--- 89,93 ----
* Sets the sSLContextAdapter attribute of the StgCmtSCP object
*
! *@param tls The new sSLContextAdapter value
*/
public void setSSLContextAdapter(SSLContextAdapter tls)
***************
*** 99,103 ****
* Gets the acTimeout attribute of the MoveService object
*
! * @return The acTimeout value
*/
public int getAcTimeout()
--- 100,104 ----
* Gets the acTimeout attribute of the MoveService object
*
! *@return The acTimeout value
*/
public int getAcTimeout()
***************
*** 110,114 ****
* Sets the acTimeout attribute of the MoveService object
*
! * @param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
--- 111,115 ----
* Sets the acTimeout attribute of the MoveService object
*
! *@param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
***************
*** 121,125 ****
* Gets the dimseTimeout attribute of the MoveService object
*
! * @return The dimseTimeout value
*/
public int getDimseTimeout()
--- 122,126 ----
* Gets the dimseTimeout attribute of the MoveService object
*
! *@return The dimseTimeout value
*/
public int getDimseTimeout()
***************
*** 132,136 ****
* Sets the dimseTimeout attribute of the MoveService object
*
! * @param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
--- 133,137 ----
* Sets the dimseTimeout attribute of the MoveService object
*
! *@param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
***************
*** 143,147 ****
* Gets the soCloseDelay attribute of the MoveService object
*
! * @return The soCloseDelay value
*/
public int getSoCloseDelay()
--- 144,148 ----
* Gets the soCloseDelay attribute of the MoveService object
*
! *@return The soCloseDelay value
*/
public int getSoCloseDelay()
***************
*** 154,158 ****
* Sets the soCloseDelay attribute of the MoveService object
*
! * @param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
--- 155,159 ----
* Sets the soCloseDelay attribute of the MoveService object
*
! *@param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
***************
*** 165,169 ****
* Gets the forwardMppsTo attribute of the MppsSCP object
*
! * @return The forwardMppsTo value
*/
public String getForwardMppsTo()
--- 166,170 ----
* Gets the forwardMppsTo attribute of the MppsSCP object
*
! *@return The forwardMppsTo value
*/
public String getForwardMppsTo()
***************
*** 176,180 ****
* Sets the forwardMppsTo attribute of the MppsSCP object
*
! * @param forwardTo The new forwardMppsTo value
*/
public void setForwardMppsTo(String forwardTo)
--- 177,181 ----
* Sets the forwardMppsTo attribute of the MppsSCP object
*
! *@param forwardTo The new forwardMppsTo value
*/
public void setForwardMppsTo(String forwardTo)
***************
*** 189,198 ****
* Description of the Method
*
! * @param assoc Description of the Parameter
! * @param rq Description of the Parameter
! * @param rspCmd Description of the Parameter
! * @return Description of the Return Value
! * @exception IOException Description of the Exception
! * @exception DcmServiceException Description of the Exception
*/
protected Dataset doNCreate(ActiveAssociation assoc, Dimse rq,
--- 190,199 ----
* Description of the Method
*
! *@param assoc Description of the Parameter
! *@param rq Description of the Parameter
! *@param rspCmd Description of the Parameter
! *@return Description of the Return Value
! *@exception IOException Description of the Exception
! *@exception DcmServiceException Description of the Exception
*/
protected Dataset doNCreate(ActiveAssociation assoc, Dimse rq,
***************
*** 202,205 ****
--- 203,207 ----
Command cmd = rq.getCommand();
Dataset ds = rq.getDataset();
+ scp.logDataset("Create MPPS:\n", ds);
getMppsMgr().create(cmd.getAffectedSOPInstanceUID(),
cmd.getAffectedSOPClassUID(), ds);
***************
*** 214,223 ****
* Description of the Method
*
! * @param assoc Description of the Parameter
! * @param rq Description of the Parameter
! * @param rspCmd Description of the Parameter
! * @return Description of the Return Value
! * @exception IOException Description of the Exception
! * @exception DcmServiceException Description of the Exception
*/
protected Dataset doNSet(ActiveAssociation assoc, Dimse rq, Command rspCmd)
--- 216,225 ----
* Description of the Method
*
! *@param assoc Description of the Parameter
! *@param rq Description of the Parameter
! *@param rspCmd Description of the Parameter
! *@return Description of the Return Value
! *@exception IOException Description of the Exception
! *@exception DcmServiceException Description of the Exception
*/
protected Dataset doNSet(ActiveAssociation assoc, Dimse rq, Command rspCmd)
***************
*** 226,229 ****
--- 228,232 ----
Command cmd = rq.getCommand();
Dataset ds = rq.getDataset();
+ scp.logDataset("Set MPPS:\n", ds);
getMppsMgr().set(cmd.getRequestedSOPInstanceUID(),
cmd.getRequestedSOPClassUID(), ds);
***************
*** 235,238 ****
--- 238,247 ----
+ /**
+ * Gets the mppsMgr attribute of the MppsService object
+ *
+ *@return The mppsMgr value
+ *@exception DcmServiceException Description of the Exception
+ */
private MppsMgrLocal getMppsMgr()
throws DcmServiceException
***************
*** 253,256 ****
--- 262,274 ----
+ /**
+ * Description of the Method
+ *
+ *@param host Description of the Parameter
+ *@param port Description of the Parameter
+ *@param cipherSuites Description of the Parameter
+ *@return Description of the Return Value
+ *@exception Exception Description of the Exception
+ */
private Socket createSocket(String host, int port, String[] cipherSuites)
throws Exception
***************
*** 262,265 ****
--- 280,289 ----
+ /**
+ * Description of the Method
+ *
+ *@param from Description of the Parameter
+ *@param dimse Description of the Parameter
+ */
private void forward(ActiveAssociation from, Dimse dimse)
{
|