|
From: Donahue S. <dc...@us...> - 2004-08-19 06:16:50
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31085 Modified Files: Constants.java Log Message: Add the settings for customized delivery of MSH Index: Constants.java =================================================================== RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Constants.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Constants.java 16 Jan 2004 06:52:42 -0000 1.36 --- Constants.java 19 Aug 2004 06:16:40 -0000 1.37 *************** *** 90,95 **** */ ! public static final String MSH_SERVER_PROPERTY_FILE = ! "msh.properties.xml"; public static final String MSH_CLIENT_PROPERTY_FILE = --- 90,94 ---- */ ! public static final String MSH_SERVER_PROPERTY_FILE = "msh.properties.xml"; public static final String MSH_CLIENT_PROPERTY_FILE = *************** *** 118,127 **** public static final String PROPERTY_HTTP_PROXY_PORT = "http.proxyPort"; - /* * Constants for Server Side Properties */ - // Settings for MSH --- 117,124 ---- *************** *** 162,168 **** * invoked by MSH upon initialization to do local configuration. */ ! public static final String PROPERTY_CONFIG_LOCAL = ! "MSH/Config/Local"; ! // Settings for proxy --- 159,163 ---- * invoked by MSH upon initialization to do local configuration. */ ! public static final String PROPERTY_CONFIG_LOCAL = "MSH/Config/Local"; // Settings for proxy *************** *** 180,184 **** public static final String PROPERTY_PROXY_PORT = "MSH/Proxy/Port"; - // Settings for keystore on Digital Signature --- 175,178 ---- *************** *** 231,235 **** "MSH/DigitalSignature/AckSign/KeyStore/Password"; - // Settings for logger --- 225,228 ---- *************** *** 243,260 **** * Path to access the log path in configuration file. */ ! public static final String PROPERTY_LOG_PATH = ! "MSH/Log/LogPath"; /** * Path to access the log file in configuration file. */ ! public static final String PROPERTY_LOG_FILE = ! "MSH/Log/LogFile"; /** * Path to access the log level in configuration file. */ ! public static final String PROPERTY_LOG_LEVEL = ! "MSH/Log/LogLevel"; /** --- 236,250 ---- * Path to access the log path in configuration file. */ ! public static final String PROPERTY_LOG_PATH = "MSH/Log/LogPath"; /** * Path to access the log file in configuration file. */ ! public static final String PROPERTY_LOG_FILE = "MSH/Log/LogFile"; /** * Path to access the log level in configuration file. */ ! public static final String PROPERTY_LOG_LEVEL = "MSH/Log/LogLevel"; /** *************** *** 263,267 **** public static final String PROPERTY_MAX_LOG_SIZE = "MSH/Log/MaxFileSize"; - // Settings for Database --- 253,256 ---- *************** *** 294,299 **** * Specification [ebMSS 3.1.4]. */ ! public static final String SERVICE = ! "urn:oasis:names:tc:ebxml-msg:service"; /** --- 283,287 ---- * Specification [ebMSS 3.1.4]. */ ! public static final String SERVICE = "urn:oasis:names:tc:ebxml-msg:service"; /** *************** *** 327,331 **** */ public static final String ACTION_STATUS_RESPONSE = "StatusResponse"; ! // Settings for SSL /** --- 315,319 ---- */ public static final String ACTION_STATUS_RESPONSE = "StatusResponse"; ! // Settings for SSL /** *************** *** 385,390 **** Path to access the Keystore password inside ssl client authentication info. */ ! public static final String PROPERTY_KEY_STORE_PASSWORD ! = "KeyStore/Password"; // Settings for Repositories --- 373,378 ---- Path to access the Keystore password inside ssl client authentication info. */ ! public static final String PROPERTY_KEY_STORE_PASSWORD = ! "KeyStore/Password"; // Settings for Repositories *************** *** 400,409 **** public static final String PROPERTY_MESSAGE_REPOSITORY = "MSH/Persistent/MessageRepository"; ! /** * The PersistenceHandler to store the message in message repository */ ! public static final String PROPERTY_MESSAGE_REPOSITORY_PERSIST_HANDLER ! = "MSH/Persistent/MessageRepositoryPersistHandler"; /** Maximum number of files allowed in a directory for saving ebXML --- 388,397 ---- public static final String PROPERTY_MESSAGE_REPOSITORY = "MSH/Persistent/MessageRepository"; ! /** * The PersistenceHandler to store the message in message repository */ ! public static final String PROPERTY_MESSAGE_REPOSITORY_PERSIST_HANDLER = ! "MSH/Persistent/MessageRepositoryPersistHandler"; /** Maximum number of files allowed in a directory for saving ebXML *************** *** 430,434 **** public static final String TEMP_FILE_SUFFIX = ".message"; - // Settings for mail --- 418,421 ---- *************** *** 452,457 **** * Path to get mail folder in configuration file */ ! public static final String PROPERTY_MAIL_FOLDER = ! "MSH/Mail/Poll/Folder"; /** --- 439,443 ---- * Path to get mail folder in configuration file */ ! public static final String PROPERTY_MAIL_FOLDER = "MSH/Mail/Poll/Folder"; /** *************** *** 473,477 **** "MSH/Mail/Poll/MonitorInterval"; - // Settings for special behaviours of MSH --- 459,462 ---- *************** *** 485,488 **** --- 470,489 ---- "MSH/Config/ContentTransferEncoding"; + // Settings for customized delivery of MSH + + public static final String PROPERTY_DELIVERYHANDLER = + "MSH/Delivery/DeliveryHandler"; + + public static final String PROPERTY_RETRYINTERVAL = + "MSH/Delivery/RetryInterval"; + + public static final String PROPERTY_MAXIMUMRETRY = + "MSH/Delivery/MaximumRetry"; + + // Settings for Delivery Monitor of MSH + + public static final String PROPERTY_DELIVERY_MONITOR_INTERVAL = + "MSH/Config/DeliveryInterval"; + /* * Constants for Client-Side Properties *************** *** 492,499 **** "Request/Log/ExternalProperties"; ! public static final String PROPERTY_REQUEST_LOG_PATH = "Request/Log/LogPath"; ! public static final String PROPERTY_REQUEST_LOG_FILE = "Request/Log/LogFile"; --- 493,500 ---- "Request/Log/ExternalProperties"; ! public static final String PROPERTY_REQUEST_LOG_PATH = "Request/Log/LogPath"; ! public static final String PROPERTY_REQUEST_LOG_FILE = "Request/Log/LogFile"; *************** *** 512,518 **** * The Persistence Handler class to handler the persistence of objectStore */ ! public static final String ! PROPERTY_MESSAGE_LISTENER_OBJECT_STORE_PERSIST_HANDLER ! = "MSH/MessageListener/ObjectStorePersistHandler"; /** --- 513,518 ---- * The Persistence Handler class to handler the persistence of objectStore */ ! public static final String PROPERTY_MESSAGE_LISTENER_OBJECT_STORE_PERSIST_HANDLER = ! "MSH/MessageListener/ObjectStorePersistHandler"; /** *************** *** 562,566 **** "Request/Config/MonitorInterval"; - /* * Constants for Diagnosis tool --- 562,565 ---- *************** *** 650,654 **** public static final String DIRECTORY_LOG = "logs"; - /* * Transport protocols --- 649,652 ---- *************** *** 680,686 **** * Different levels of ackRequested */ ! public static final int ACK_REQUESTED_PERMESSAGE = 0; ! public static final int ACK_REQUESTED_ALWAYS = 1; ! public static final int ACK_REQUESTED_NEVER = 2; /* --- 678,684 ---- * Different levels of ackRequested */ ! public static final int ACK_REQUESTED_PERMESSAGE = 0; ! public static final int ACK_REQUESTED_ALWAYS = 1; ! public static final int ACK_REQUESTED_NEVER = 2; /* *************** *** 741,746 **** */ public static final String MULTIPART_RELATED_TYPE = ! MULTIPART_RELATED + "; type=\"" + TEXT_XML_TYPE + "\"; " + ! MIME_BOUNDARY + "="; /** --- 739,748 ---- */ public static final String MULTIPART_RELATED_TYPE = ! MULTIPART_RELATED ! + "; type=\"" ! + TEXT_XML_TYPE ! + "\"; " ! + MIME_BOUNDARY ! + "="; /** *************** *** 749,753 **** public static final String CHARACTER_SET = "charset"; - /** * Default XML character encoding. --- 751,754 ---- *************** *** 778,782 **** public static final String ATTRIBUTE_NAME = "name"; - /* * XML tags for MSH Responses to Client Requests --- 779,782 ---- *************** *** 811,816 **** * Application Context. */ ! public static final String ELEMENT_APPLICATION_CONTEXT ! = "ApplicationContext"; /** --- 811,816 ---- * Application Context. */ ! public static final String ELEMENT_APPLICATION_CONTEXT = ! "ApplicationContext"; /** *************** *** 908,912 **** public static final String ATTRIBUTE_MESSAGE_ID = "id"; - /** * Reference time zone. --- 908,911 ---- *************** *** 914,918 **** public static final String TIME_ZONE = "GMT"; - /* * Default values for Directory Manager --- 913,916 ---- *************** *** 920,925 **** /** Default parent path to save ebXML messages */ ! public static final String DEF_MESSAGE_REPOSITORY = ! "/tmp/ebxmlms"; /** Default path to save sending thread context */ --- 918,922 ---- /** Default parent path to save ebXML messages */ ! public static final String DEF_MESSAGE_REPOSITORY = "/tmp/ebxmlms"; /** Default path to save sending thread context */ *************** *** 931,935 **** public static final int DEF_MAX_NUM_IN_SUBDIR = 1000; - /* * Default values for Export --- 928,931 ---- *************** *** 942,946 **** public static final String SUFFIX_ALL_REPORT = ".xml"; - /* * Default values for Mail Poller --- 938,941 ---- *************** *** 957,960 **** --- 952,963 ---- public static final long MAIL_MIN_WAIT_INTERVAL = 5000; + /* + * Default values for Delivery Monitor + */ + + /** + * Smallest time interval allowed to delivery messages + */ + public static final long DELIVERY_MONITOR_MIN_WAIT_INTERVAL = 5000; /* *************** *** 1007,1012 **** "Received and Acknowledgment Sent"; ! public static final String MESSAGE_STATUS_RECEIVED = ! "Received"; public static final String MESSAGE_STATUS_DELETED = "Deleted"; --- 1010,1014 ---- "Received and Acknowledgment Sent"; ! public static final String MESSAGE_STATUS_RECEIVED = "Received"; public static final String MESSAGE_STATUS_DELETED = "Deleted"; *************** *** 1014,1018 **** public static final String MESSAGE_STATUS_UNKNOWN = "Unknown"; - // Message statuses in ebxml Status Response --- 1016,1019 ---- *************** *** 1027,1031 **** public static final String STATUS_FORWARDED = "Forwarded"; - // Message deletion statuses --- 1028,1031 ---- *************** *** 1036,1041 **** "Message deleted successfully"; ! public static final String DELETE_FAILED = ! "Message cannot be deleted"; // Package-level shared constants --- 1036,1040 ---- "Message deleted successfully"; ! public static final String DELETE_FAILED = "Message cannot be deleted"; // Package-level shared constants *************** *** 1063,1068 **** * object in <code>MessageServiceHandler</code>. */ ! public static final String SERIALIZABLE_OBJECT = ! "application/octet-stream"; /** --- 1062,1066 ---- * object in <code>MessageServiceHandler</code>. */ ! public static final String SERIALIZABLE_OBJECT = "application/octet-stream"; /** |