Menu
▾
▴
[dcm4che-commits] CVS: dcm4jboss/src/java/org/dcm4chex/service/qrscp FindService.java,1.1,1.2 MoveService.java,1.1,1.2 QRScpService.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/qrscp
In directory sc8-pr-cvs1:/tmp/cvs-serv8168/src/java/org/dcm4chex/service/qrscp
Modified Files:
FindService.java MoveService.java QRScpService.java
Log Message:
refactor jboss service mbeans
Index: FindService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/qrscp/FindService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FindService.java 20 Mar 2003 23:49:35 -0000 1.1
--- FindService.java 23 Mar 2003 08:58:37 -0000 1.2
***************
*** 82,85 ****
--- 82,86 ----
{
Dataset ds = rq.getDataset();// read out dataset
+ scp.logDataset("Find RQ Identifier:\n", ds);
scp.logDicomQuery(assoc.getAssociation(), rq);
try {
***************
*** 166,169 ****
--- 167,171 ----
return null;
}
+ scp.logDataset("Find RSP Identifier:\n", ds);
rspCmd.putUS(Tags.Status, Status.Pending);
ds.putAE(Tags.RetrieveAET, assoc.getAssociation().getCalledAET());
Index: MoveService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/qrscp/MoveService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MoveService.java 20 Mar 2003 23:49:35 -0000 1.1
--- MoveService.java 23 Mar 2003 08:58:37 -0000 1.2
***************
*** 184,187 ****
--- 184,188 ----
Association origAssoc = assoc.getAssociation();
Dataset ds = rq.getDataset();// read out dataset
+ scp.logDataset("Move RQ Identifier:\n", ds);
RetrieveData[] toMove = null;
try {
Index: QRScpService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/org/dcm4chex/service/qrscp/QRScpService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QRScpService.java 20 Mar 2003 23:49:35 -0000 1.1
--- QRScpService.java 23 Mar 2003 08:58:37 -0000 1.2
***************
*** 22,25 ****
--- 22,28 ----
import java.io.File;
import java.io.IOException;
+ import java.io.StringWriter;
+ import java.util.HashMap;
+ import java.util.Map;
import javax.management.ObjectName;
***************
*** 44,50 ****
* <description>
*
! * @author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! * @since March 20, 2003
! * @version $Revision$
*/
public class QRScpService
--- 47,54 ----
* <description>
*
! *@author <a href="mailto:gu...@ti...">gunter zeilinger</a>
! *@created March 22, 2003
! *@since March 20, 2003
! *@version $Revision$
*/
public class QRScpService
***************
*** 57,60 ****
--- 61,70 ----
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 ----------------------------------------------------
***************
*** 68,72 ****
private MoveService move = new MoveService(this);
! // Methods
void logDicomQuery(Association assoc, Dimse rq)
{
--- 78,104 ----
private MoveService move = new MoveService(this);
! // Package protected ---------------------------------------------
! 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);
! }
! }
!
!
! /**
! * Description of the Method
! *
! *@param assoc Description of the Parameter
! *@param rq Description of the Parameter
! */
void logDicomQuery(Association assoc, Dimse rq)
{
***************
*** 84,88 ****
* Gets the auditLoggerName attribute of the QRScpService object
*
! * @return The auditLoggerName value
*/
public ObjectName getAuditLoggerName()
--- 116,120 ----
* Gets the auditLoggerName attribute of the QRScpService object
*
! *@return The auditLoggerName value
*/
public ObjectName getAuditLoggerName()
***************
*** 95,99 ****
* Sets the auditLoggerName attribute of the QRScpService object
*
! * @param auditLogName The new auditLoggerName value
*/
public void setAuditLoggerName(ObjectName auditLogName)
--- 127,131 ----
* Sets the auditLoggerName attribute of the QRScpService object
*
! *@param auditLogName The new auditLoggerName value
*/
public void setAuditLoggerName(ObjectName auditLogName)
***************
*** 103,106 ****
--- 135,143 ----
+ /**
+ * Gets the auditLogger attribute of the QRScpService object
+ *
+ *@return The auditLogger value
+ */
AuditLogger getAuditLogger()
{
***************
*** 112,116 ****
* Gets the dcmServerName attribute of the QRScpService object
*
! * @return The dcmServerName value
*/
public ObjectName getDcmServerName()
--- 149,153 ----
* Gets the dcmServerName attribute of the QRScpService object
*
! *@return The dcmServerName value
*/
public ObjectName getDcmServerName()
***************
*** 123,127 ****
* Sets the dcmServerName attribute of the QRScpService object
*
! * @param dcmServerName The new dcmServerName value
*/
public void setDcmServerName(ObjectName dcmServerName)
--- 160,164 ----
* Sets the dcmServerName attribute of the QRScpService object
*
! *@param dcmServerName The new dcmServerName value
*/
public void setDcmServerName(ObjectName dcmServerName)
***************
*** 134,138 ****
* Gets the acTimeout attribute of the StgCmtService object
*
! * @return The acTimeout value
*/
public int getAcTimeout()
--- 171,175 ----
* Gets the acTimeout attribute of the StgCmtService object
*
! *@return The acTimeout value
*/
public int getAcTimeout()
***************
*** 145,149 ****
* Sets the acTimeout attribute of the StgCmtService object
*
! * @param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
--- 182,186 ----
* Sets the acTimeout attribute of the StgCmtService object
*
! *@param timeout The new acTimeout value
*/
public void setAcTimeout(int timeout)
***************
*** 156,160 ****
* Gets the dimseTimeout attribute of the StgCmtService object
*
! * @return The dimseTimeout value
*/
public int getDimseTimeout()
--- 193,197 ----
* Gets the dimseTimeout attribute of the StgCmtService object
*
! *@return The dimseTimeout value
*/
public int getDimseTimeout()
***************
*** 167,171 ****
* Sets the dimseTimeout attribute of the StgCmtService object
*
! * @param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
--- 204,208 ----
* Sets the dimseTimeout attribute of the StgCmtService object
*
! *@param timeout The new dimseTimeout value
*/
public void setDimseTimeout(int timeout)
***************
*** 178,182 ****
* Gets the soCloseDelay attribute of the StgCmtService object
*
! * @return The soCloseDelay value
*/
public int getSoCloseDelay()
--- 215,219 ----
* Gets the soCloseDelay attribute of the StgCmtService object
*
! *@return The soCloseDelay value
*/
public int getSoCloseDelay()
***************
*** 189,193 ****
* Sets the soCloseDelay attribute of the StgCmtService object
*
! * @param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
--- 226,230 ----
* Sets the soCloseDelay attribute of the StgCmtService object
*
! *@param delay The new soCloseDelay value
*/
public void setSoCloseDelay(int delay)
***************
*** 200,204 ****
* Description of the Method
*
! * @exception Exception Description of the Exception
*/
public void startService()
--- 237,241 ----
* Description of the Method
*
! *@exception Exception Description of the Exception
*/
public void startService()
***************
*** 219,223 ****
* Description of the Method
*
! * @exception Exception Description of the Exception
*/
public void stopService()
--- 256,260 ----
* Description of the Method
*
! *@exception Exception Description of the Exception
*/
public void stopService()
***************
*** 230,233 ****
--- 267,271 ----
+ /** Description of the Method */
private void bindDcmServices()
{
***************
*** 238,241 ****
--- 276,280 ----
+ /** Description of the Method */
private void unbindDcmServices()
{
***************
*** 246,249 ****
--- 285,293 ----
+ /**
+ * Description of the Method
+ *
+ *@param tsuids Description of the Parameter
+ */
private void updatePolicy(String[] tsuids)
{
|